From 5b528af01f1a2b478454ff10c528c1aaecd54252 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 6 Mar 2022 14:38:42 +0900 Subject: [PATCH 0001/8282] fix: now initEnvValue() converts type when the default property value is int and float --- system/Config/BaseConfig.php | 22 ++++++++++++++----- tests/system/Config/BaseConfigTest.php | 19 ++++++++++++++++ tests/system/Config/fixtures/.env | 5 +++++ tests/system/Config/fixtures/SimpleConfig.php | 3 +++ 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php index 9b71a4963bab..359fcc1488ba 100644 --- a/system/Config/BaseConfig.php +++ b/system/Config/BaseConfig.php @@ -88,7 +88,7 @@ public function __construct() * * @param mixed $property * - * @return mixed + * @return void */ protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix) { @@ -102,16 +102,28 @@ protected function initEnvValue(&$property, string $name, string $prefix, string } elseif ($value === 'true') { $value = true; } - $property = is_bool($value) ? $value : trim($value, '\'"'); - } + if (is_bool($value)) { + $property = $value; + + return; + } + + $value = trim($value, '\'"'); - return $property; + if (is_int($property)) { + $value = (int) $value; + } elseif (is_float($property)) { + $value = (float) $value; + } + + $property = $value; + } } /** * Retrieve an environment-specific configuration setting * - * @return mixed + * @return string|null */ protected function getEnvValue(string $property, string $prefix, string $shortPrefix) { diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 4c2d4ba20ccb..667a877287fb 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -55,6 +55,25 @@ public function testBasicValues() $this->assertSame(18, $config->golf); } + public function testUseDefaultValueTypeIntAndFloatValues() + { + $dotenv = new DotEnv($this->fixturesFolder, '.env'); + $dotenv->load(); + $config = new SimpleConfig(); + + $this->assertSame(0.0, $config->float); + $this->assertSame(999, $config->int); + } + + public function testUseDefaultValueTypeStringValue() + { + $dotenv = new DotEnv($this->fixturesFolder, '.env'); + $dotenv->load(); + $config = new SimpleConfig(); + + $this->assertSame('123456', $config->password); + } + /** * @runInSeparateProcess * @preserveGlobalState disabled diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env index 2f859cc9faca..38ca0bed6f0b 100644 --- a/tests/system/Config/fixtures/.env +++ b/tests/system/Config/fixtures/.env @@ -32,3 +32,8 @@ SimpleConfig.crew.captain = Malcolm SimpleConfig.crew.pilot = Wash SimpleConfig.crew.comms = true SimpleConfig.crew.doctor = false + +SimpleConfig.float = '0.0' +SimpleConfig.int = '999' + +SimpleConfig.password = 123456 diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php index 69f5590e90f1..d64aa1a0d741 100644 --- a/tests/system/Config/fixtures/SimpleConfig.php +++ b/tests/system/Config/fixtures/SimpleConfig.php @@ -48,4 +48,7 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig public $one_deep = [ 'under_deep' => null, ]; + public $float = 12.34; + public $int = 1234; + public $password = 'secret'; } From 8524bb963bd79bd3be676fa21ab82b8c98b6a412 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 18 Mar 2022 16:08:22 +0900 Subject: [PATCH 0002/8282] test: add test for nullable int property --- tests/system/Config/BaseConfigTest.php | 3 +++ tests/system/Config/fixtures/.env | 2 ++ tests/system/Config/fixtures/SimpleConfig.php | 7 ++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 667a877287fb..20d2f77c8421 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -117,6 +117,9 @@ public function testEnvironmentOverrides() $this->assertSame('bar', $config->onedeep_value); // array property name with underscore and key with underscore $this->assertSame('foo', $config->one_deep['under_deep']); + + // The default property value is null but has type + $this->assertSame(20, $config->size); } public function testPrefixedValues() diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env index 38ca0bed6f0b..36f5651cf532 100644 --- a/tests/system/Config/fixtures/.env +++ b/tests/system/Config/fixtures/.env @@ -37,3 +37,5 @@ SimpleConfig.float = '0.0' SimpleConfig.int = '999' SimpleConfig.password = 123456 + +SimpleConfig.size=20 diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php index d64aa1a0d741..9870c72b0ac2 100644 --- a/tests/system/Config/fixtures/SimpleConfig.php +++ b/tests/system/Config/fixtures/SimpleConfig.php @@ -48,7 +48,8 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig public $one_deep = [ 'under_deep' => null, ]; - public $float = 12.34; - public $int = 1234; - public $password = 'secret'; + public $float = 12.34; + public $int = 1234; + public $password = 'secret'; + public ?int $size = null; } From d61b3c7487f2168f38b6f01ea2398b409d7c2523 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 19 Mar 2022 10:11:18 +0900 Subject: [PATCH 0003/8282] test: change .env entry Do not recommend to use `'` for int/float value. --- tests/system/Config/fixtures/.env | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env index 36f5651cf532..17d9e8e9116e 100644 --- a/tests/system/Config/fixtures/.env +++ b/tests/system/Config/fixtures/.env @@ -33,9 +33,12 @@ SimpleConfig.crew.pilot = Wash SimpleConfig.crew.comms = true SimpleConfig.crew.doctor = false -SimpleConfig.float = '0.0' -SimpleConfig.int = '999' +# The default value's type in the Config class is float, so it will be converted to float +SimpleConfig.float = 0.0 +# The default value's type in the Config class is int, so it will be converted to int +SimpleConfig.int = 999 SimpleConfig.password = 123456 +# The property type in the Config class is ?int, so it will be converted to int by PHP SimpleConfig.size=20 From e4fcba2749b3e7e5dd3af55b5cdd057820343fe0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 20 Mar 2022 16:14:40 +0900 Subject: [PATCH 0004/8282] fix: failover's DBPrefix not working Fixes #5812 --- system/Database/BaseConnection.php | 7 +++++++ tests/system/Database/Live/ConnectTest.php | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index 4f54c1980830..9c803d0c1372 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -342,6 +342,13 @@ public function __construct(array $params) if (class_exists($queryClass)) { $this->queryClass = $queryClass; } + + if ($this->failover !== []) { + // If there is a failover database, connect now to do failover. + // Otherwise, Query Builder creates SQL statement with the main database config + // (DBPrefix) even when the main database is down. + $this->initialize(); + } } /** diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php index 743b5450cca3..1757f91cb676 100644 --- a/tests/system/Database/Live/ConnectTest.php +++ b/tests/system/Database/Live/ConnectTest.php @@ -95,14 +95,22 @@ public function testConnectWorksWithGroupName() public function testConnectWithFailover() { $this->tests['failover'][] = $this->tests; - unset($this->tests['failover'][0]['failover']); + // Change main's DBPrefix + $this->tests['DBPrefix'] = 'main_'; + + if ($this->tests['DBDriver'] === 'SQLite3') { + // Change main's database path to fail to connect + $this->tests['database'] = '/does/not/exists/test.db'; + } + $this->tests['username'] = 'wrong'; $db1 = Database::connect($this->tests); - $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver')); + $this->assertSame($this->tests['failover'][0]['DBPrefix'], $this->getPrivateProperty($db1, 'DBPrefix')); + $this->assertGreaterThanOrEqual(0, count($db1->listTables())); } } From 5a456125d8a8503945568564b91a2ad256d2d184 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 20 Mar 2022 16:40:08 +0900 Subject: [PATCH 0005/8282] test: fix failed test --- tests/system/Database/BaseConnectionTest.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php index 9bb8ddee1499..781588dd78e8 100644 --- a/tests/system/Database/BaseConnectionTest.php +++ b/tests/system/Database/BaseConnectionTest.php @@ -105,8 +105,11 @@ public function testCanConnectToFailoverWhenNoConnectionAvailable() $options = $this->options; $options['failover'] = [$this->failoverOptions]; - $db = new MockConnection($options); - $db->shouldReturn('connect', [false, 345])->initialize(); + $db = new class ($options) extends MockConnection { + protected $returnValues = [ + 'connect' => [false, 345], + ]; + }; $this->assertSame(345, $db->getConnection()); $this->assertSame('failover', $db->username); From 57e0594a8d2a12b32de852ecd52a1ab679fa4705 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 23 Mar 2022 09:13:11 +0900 Subject: [PATCH 0006/8282] chore: remove App\ and Config\ in autoload.psr-4 in app starter composer.json Revert #3423 Problems: - Cannot change `app` folder name. Because the composer's path overwrite the config in Config\Autoload. - Causes error when defining new namespace under app/. See #5818 --- admin/starter/composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin/starter/composer.json b/admin/starter/composer.json index f2959dd49b51..026329ca9a24 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -17,10 +17,6 @@ "ext-fileinfo": "Improves mime type detection for files" }, "autoload": { - "psr-4": { - "App\\": "app", - "Config\\": "app/Config" - }, "exclude-from-classmap": [ "**/Database/Migrations/**" ] From 135222d40724d3b6bc470fd88bf9c85b1fff9b95 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 23 Mar 2022 09:23:43 +0900 Subject: [PATCH 0007/8282] docs: add @TODO --- system/CLI/Commands.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php index 3f84f33d918f..d153b3aa857a 100644 --- a/system/CLI/Commands.php +++ b/system/CLI/Commands.php @@ -76,6 +76,10 @@ public function getCommands() /** * Discovers all commands in the framework and within user code, * and collects instances of them to work with. + * + * @TODO this approach (find qualified classname from path) causes error, + * when using Composer autoloader. + * See https://github.com/codeigniter4/CodeIgniter4/issues/5818 */ public function discoverCommands() { From c5eb48011648c5f9dfa0f2390f69297a13d7e651 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sun, 27 Mar 2022 00:11:10 +0800 Subject: [PATCH 0008/8282] Rename `Abstact` to `Abstract` --- .../{AbstactHandlerTestCase.php => AbstractHandlerTestCase.php} | 2 +- tests/system/Session/Handlers/Database/MySQLiHandlerTest.php | 2 +- tests/system/Session/Handlers/Database/PostgreHandlerTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/system/Session/Handlers/Database/{AbstactHandlerTestCase.php => AbstractHandlerTestCase.php} (98%) diff --git a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php similarity index 98% rename from tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php rename to tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php index 7434301f40cc..f252fc24fb43 100644 --- a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php +++ b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php @@ -19,7 +19,7 @@ /** * @internal */ -abstract class AbstactHandlerTestCase extends CIUnitTestCase +abstract class AbstractHandlerTestCase extends CIUnitTestCase { use DatabaseTestTrait; use ReflectionHelper; diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php index 469b0c8e1f7e..5fba8bb779d0 100644 --- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php +++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php @@ -18,7 +18,7 @@ /** * @internal */ -final class MySQLiHandlerTest extends AbstactHandlerTestCase +final class MySQLiHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void { diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php index 9575b68e499f..d28d1fab7134 100644 --- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php +++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php @@ -18,7 +18,7 @@ /** * @internal */ -final class PostgreHandlerTest extends AbstactHandlerTestCase +final class PostgreHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void { From 7612cdb09129ab2ce3e736fa3c131f834b52caa9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 28 Mar 2022 12:46:08 +0900 Subject: [PATCH 0009/8282] docs: add index.php/spark changes in changelog --- user_guide_src/source/changelogs/v4.2.0.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 9751dd06fee0..f12a13bcb416 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -13,6 +13,9 @@ BREAKING ******** - The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP. +- The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed: + - ``public/index.php`` + - ``spark`` Enhancements ************ From 2f8157dc34d328ba450788ab473fcc076f3a3772 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 28 Mar 2022 13:02:28 +0900 Subject: [PATCH 0010/8282] chore: fix ImportError ImportError: cannot import name 'environmentfilter' from 'jinja2' (/usr/local/lib/python3.10/site-packages/jinja2/__init__.py) See https://github.com/sphinx-doc/sphinx/issues/10291 --- user_guide_src/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/requirements.txt b/user_guide_src/requirements.txt index 19f5064b9815..5d11554964d1 100644 --- a/user_guide_src/requirements.txt +++ b/user_guide_src/requirements.txt @@ -2,3 +2,4 @@ sphinx>=2.4.4,<3 sphinxcontrib-phpdomain>=0.7.1 docutils>=0.16 sphinx-rtd-theme>=0.5.0 +jinja2<3.1 From 4138c04808f95699699a9140671a9fe605e5c2eb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 29 Mar 2022 21:16:43 +0900 Subject: [PATCH 0011/8282] config: add mime type for webp --- app/Config/Mimes.php | 1 + user_guide_src/source/changelogs/v4.2.0.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php index 786bc6a1e5c7..a1bb458a2804 100644 --- a/app/Config/Mimes.php +++ b/app/Config/Mimes.php @@ -260,6 +260,7 @@ class Mimes 'image/png', 'image/x-png', ], + 'webp' => 'image/webp', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'css' => [ diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index f12a13bcb416..a0494ebd47c0 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -34,6 +34,7 @@ Enhancements - The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing `. - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore. - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> (): " +- Added support for webp files to **app/Config/Mimes.php**. Changes ******* From 250b0cadc1a453573a86d721ad9acbf31e8dfc0b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 30 Mar 2022 11:27:59 +0900 Subject: [PATCH 0012/8282] docs: fix comment --- system/View/Parser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/View/Parser.php b/system/View/Parser.php index 6834c003e500..dbb0395fbd0b 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -289,7 +289,7 @@ protected function parsePair(string $variable, array $data, string $template): a */ foreach ($matches as $match) { // Loop over each piece of $data, replacing - // it's contents so that we know what to replace in parse() + // its contents so that we know what to replace in parse() $str = ''; // holds the new contents for this tag pair. foreach ($data as $row) { From 9a85788f51b056c24c1d7c4477a4108e52bec9f1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 30 Mar 2022 11:28:59 +0900 Subject: [PATCH 0013/8282] fix: view parser fails with ({variable}) in loop --- system/View/Parser.php | 11 +---------- tests/system/View/ParserTest.php | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/system/View/Parser.php b/system/View/Parser.php index dbb0395fbd0b..6f62ca4fb333 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -338,8 +338,7 @@ protected function parsePair(string $variable, array $data, string $template): a $str .= $out; } - // Escape | character from filters as it's handled as OR in regex - $escapedMatch = preg_replace('/(?assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template)); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5825 + */ + public function testParseLoopVariableWithParentheses() + { + $data = [ + 'title' => 'Super Heroes', + 'powers' => [ + ['name' => 'Tom'], + ['name' => 'Dick'], + ['name' => 'Henry'], + ], + ]; + + $template = "{title}\n{powers}({name}) {/powers}"; + + $this->parser->setData($data); + $this->assertSame("Super Heroes\n(Tom) (Dick) (Henry) ", $this->parser->renderString($template)); + } + public function testParseLoopObjectProperties() { $obj1 = new stdClass(); From 78d42a58f57eb4cc6a8a6e9f74be876b93b4051c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 28 Mar 2022 11:40:45 +0900 Subject: [PATCH 0014/8282] fix: spark can't use options in PHP 7.4 Cannot unpack array with string keys at SYSTEMPATH/CodeIgniter.php:893 --- system/CLI/CommandRunner.php | 4 ++-- system/CodeIgniter.php | 10 +++++---- tests/system/CLI/CommandRunnerTest.php | 2 +- tests/system/SparkTest.php | 29 ++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 tests/system/SparkTest.php diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php index a6985d0db931..06d06863de2f 100644 --- a/system/CLI/CommandRunner.php +++ b/system/CLI/CommandRunner.php @@ -40,13 +40,13 @@ public function __construct() * so we have the chance to look for a Command first. * * @param string $method - * @param array ...$params + * @param array $params * * @throws ReflectionException * * @return mixed */ - public function _remap($method, ...$params) + public function _remap($method, $params) { // The first param is usually empty, so scrap it. if (empty($params[0])) { diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 86e70546dd41..093687254c77 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -884,14 +884,16 @@ protected function runController($class) /** @var CLIRequest $request */ $request = $this->request; $params = $request->getArgs(); + + $output = $class->_remap($this->method, $params); } else { // This is a Web request or PHP CLI request $params = $this->router->params(); - } - $output = method_exists($class, '_remap') - ? $class->_remap($this->method, ...$params) - : $class->{$this->method}(...$params); + $output = method_exists($class, '_remap') + ? $class->_remap($this->method, ...$params) + : $class->{$this->method}(...$params); + } $this->benchmark->stop('controller'); diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php index 32ca71357e75..c9e3245b932c 100644 --- a/tests/system/CLI/CommandRunnerTest.php +++ b/tests/system/CLI/CommandRunnerTest.php @@ -123,7 +123,7 @@ public function testBadCommand() */ public function testRemapEmptyFirstParams() { - self::$runner->_remap('anyvalue', null, 'list'); + self::$runner->_remap('anyvalue', [null, 'list']); $result = CITestStreamFilter::$buffer; // make sure the result looks like a command list diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php new file mode 100644 index 000000000000..0cd76453c02a --- /dev/null +++ b/tests/system/SparkTest.php @@ -0,0 +1,29 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter; + +use CodeIgniter\Test\CIUnitTestCase; + +/** + * @internal + */ +final class SparkTest extends CIUnitTestCase +{ + public function testCanUseOption() + { + ob_start(); + passthru('php spark list --simple'); + $output = ob_get_clean(); + + $this->assertStringContainsString('cache:clear', $output); + } +} From 9cade91cf68f5121428c507135aba69a7dc182c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 28 Mar 2022 11:44:41 +0900 Subject: [PATCH 0015/8282] refactor: remove unneeded logic It seems out of dated logic. --- system/CLI/CommandRunner.php | 5 ----- tests/system/CLI/CommandRunnerTest.php | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php index 06d06863de2f..ef4ed057b606 100644 --- a/system/CLI/CommandRunner.php +++ b/system/CLI/CommandRunner.php @@ -48,11 +48,6 @@ public function __construct() */ public function _remap($method, $params) { - // The first param is usually empty, so scrap it. - if (empty($params[0])) { - array_shift($params); - } - return $this->index($params); } diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php index c9e3245b932c..892b7b5ff516 100644 --- a/tests/system/CLI/CommandRunnerTest.php +++ b/tests/system/CLI/CommandRunnerTest.php @@ -117,16 +117,4 @@ public function testBadCommand() // make sure the result looks like a command list $this->assertStringContainsString('Command "bogus" not found', CITestStreamFilter::$buffer); } - - /** - * @TODO When the first param is empty? Use case? - */ - public function testRemapEmptyFirstParams() - { - self::$runner->_remap('anyvalue', [null, 'list']); - $result = CITestStreamFilter::$buffer; - - // make sure the result looks like a command list - $this->assertStringContainsString('Lists the available commands.', $result); - } } From d0b323d9fbf7a7227551b7190f80ba0dbbf265ef Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 30 Mar 2022 19:16:35 +0900 Subject: [PATCH 0016/8282] docs: add CommandRunner::_remap() change in changelogs --- user_guide_src/source/changelogs/v4.2.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index f12a13bcb416..34daeff2f474 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -16,6 +16,7 @@ BREAKING - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed: - ``public/index.php`` - ``spark`` +- The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug. Enhancements ************ From 60ee4f3b946b7984ce7465d4770b4cd97bd3d2fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 11:09:11 +0900 Subject: [PATCH 0017/8282] config: disable auto-routing by default --- app/Config/Routes.php | 2 +- system/Router/RouteCollection.php | 2 +- tests/system/CodeIgniterTest.php | 14 ++++++++++++++ tests/system/Commands/RoutesTest.php | 1 + .../Utilities/Routes/FilterCollectorTest.php | 2 ++ tests/system/Router/RouterTest.php | 4 ++++ user_guide_src/source/changelogs/v4.2.0.rst | 1 + 7 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0060a6f67dff..2b35d0dda6f8 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -21,7 +21,7 @@ $routes->setDefaultMethod('index'); $routes->setTranslateURIDashes(false); $routes->set404Override(); -$routes->setAutoRoute(true); +$routes->setAutoRoute(false); /* * -------------------------------------------------------------------- diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 65bf4f4985af..a1dd7b1a8fe7 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -76,7 +76,7 @@ class RouteCollection implements RouteCollectionInterface * * @var bool */ - protected $autoRoute = true; + protected $autoRoute = false; /** * A callable that will be shown diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 42706e39d110..a29879522e37 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -47,6 +47,8 @@ protected function tearDown(): void if (count(ob_list_handlers()) > 1) { ob_end_clean(); } + + $this->resetServices(); } public function testRunEmptyDefaultRoute() @@ -469,6 +471,12 @@ public function testSpoofRequestMethodCanUsePUT() $_POST['_method'] = 'PUT'; + $routes = \Config\Services::routes(); + $routes->setDefaultNamespace('App\Controllers'); + $routes->resetRoutes(); + $routes->post('/', 'Home::index'); + $routes->put('/', 'Home::index'); + ob_start(); $this->codeigniter->useSafeOutput(true)->run(); ob_get_clean(); @@ -487,6 +495,12 @@ public function testSpoofRequestMethodCannotUseGET() $_POST['_method'] = 'GET'; + $routes = \Config\Services::routes(); + $routes->setDefaultNamespace('App\Controllers'); + $routes->resetRoutes(); + $routes->post('/', 'Home::index'); + $routes->get('/', 'Home::index'); + ob_start(); $this->codeigniter->useSafeOutput(true)->run(); ob_get_clean(); diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index dd5e6b3280a8..1787e8bef3fa 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -67,6 +67,7 @@ public function testRoutesCommandRouteFilterAndAutoRoute() $routes->setDefaultNamespace('App\Controllers'); $routes->resetRoutes(); $routes->get('/', 'Home::index', ['filter' => 'csrf']); + $routes->setAutoRoute(true); command('routes'); diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php index 6002323d3393..5037c148b704 100644 --- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php @@ -23,6 +23,8 @@ public function testGet() { $routes = Services::routes(); $routes->resetRoutes(); + $routes->setDefaultNamespace('App\Controllers'); + $routes->get('/', 'Home::index'); $collector = new FilterCollector(); diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index b2c476f5add6..d3ca04422c41 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -728,7 +728,10 @@ public function testAutoRouteMatchesZeroParams() public function testAutoRouteMethodEmpty() { $router = new Router($this->collection, $this->request); + $this->collection->setAutoRoute(true); + $router->handle('Home/'); + $this->assertSame('Home', $router->controllerName()); $this->assertSame('index', $router->methodName()); } @@ -775,6 +778,7 @@ public function testRegularExpressionPlaceholderWithUnicode() public function testRouterPriorDirectory() { $router = new Router($this->collection, $this->request); + $this->collection->setAutoRoute(true); $router->setDirectory('foo/bar/baz', false, true); $router->handle('Some_controller/some_method/param1/param2/param3'); diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index f12a13bcb416..55f7986375aa 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -43,6 +43,7 @@ Changes - The process of sending cookies has been moved to the ``Response`` class. Now the ``Session`` class doesn't send cookies, set them to the Response. - Validation. Changed generation of errors when using fields with a wildcard (*). Now the error key contains the full path. See :ref:`validation-getting-all-errors`. - ``Validation::getError()`` when using a wildcard will return all found errors matching the mask as a string. +- To make the default configuration more secure, auto-routing has been changed to disabled by default. Deprecations ************ From d9a2389bf4437bf811368568cd536ba216bc5fc1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 11:33:42 +0900 Subject: [PATCH 0018/8282] docs: move "Default Controller" in the "Auto Routing" --- user_guide_src/source/incoming/routing.rst | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index eb7d57370015..3a761ed1d5a0 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -465,31 +465,6 @@ then you can change this value to save typing: .. literalinclude:: routing/046.php -Default Controller -================== - -When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by -the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home`` -which matches the controller at **app/Controllers/Home.php**: - -.. literalinclude:: routing/047.php - -The default controller is also used when no matching route has been found, and the URI would point to a directory -in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at -**app/Controllers/Admin/Home.php**, it would be used. - -Default Method -============== - -This works similar to the default controller setting, but is used to determine the default method that is used -when a controller is found that matches the URI, but no segment exists for the method. The default value is -``index``. - -In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the -``Products::listAll()`` method would be executed: - -.. literalinclude:: routing/048.php - Translate URI Dashes ==================== @@ -566,8 +541,33 @@ and executes the corresponding controller method. The auto-routing is enabled by .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. +Default Controller +================== + +When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by +the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home`` +which matches the controller at **app/Controllers/Home.php**: + +.. literalinclude:: routing/047.php + +The default controller is also used when no matching route has been found, and the URI would point to a directory +in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at +**app/Controllers/Admin/Home.php**, it would be used. + See :ref:`Auto Routing in Controllers ` for more info. +Default Method +============== + +This works similar to the default controller setting, but is used to determine the default method that is used +when a controller is found that matches the URI, but no segment exists for the method. The default value is +``index``. + +In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the +``Products::listAll()`` method would be executed: + +.. literalinclude:: routing/048.php + Confirming Routes ***************** From aa69f381eae378e867d940c38363efc548ec047f Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 11:40:19 +0900 Subject: [PATCH 0019/8282] docs: move "Default Method" in "Auto Routing" --- user_guide_src/source/incoming/routing.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 3a761ed1d5a0..d4b4c2f34cf1 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -539,10 +539,13 @@ and executes the corresponding controller method. The auto-routing is enabled by .. note:: To prevent misconfiguration and miscoding, we recommend that you disable the auto-routing feature. See :ref:`use-defined-routes-only`. +Configuration Options +===================== + .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. Default Controller -================== +------------------ When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home`` @@ -557,7 +560,7 @@ in the controllers directory. For example, if the user visits **example.com/admi See :ref:`Auto Routing in Controllers ` for more info. Default Method -============== +-------------- This works similar to the default controller setting, but is used to determine the default method that is used when a controller is found that matches the URI, but no segment exists for the method. The default value is From fabcf1c4ab76efdc41faf24553d094bde2cee385 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 11:53:07 +0900 Subject: [PATCH 0020/8282] docs: add "Enable Auto Routing" --- user_guide_src/source/incoming/routing.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index d4b4c2f34cf1..04beafd9f2dc 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -515,6 +515,15 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f However, CodeIgniter can also automatically route HTTP requests based on conventions and execute the corresponding controller methods. +Enable Auto Routing +=================== + +Since v4.2.0, the auto-routing is disabled by default. + +To use it, you need to change the setting ``setAutoRoute()`` option to true in **app/Config/Routes.php**:: + + $routes->setAutoRoute(true); + URI Segments ============ From a514043270fa56efe301f37e5a4955d140a72527 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 11:53:54 +0900 Subject: [PATCH 0021/8282] docs: update existing description for disabling auto-routing by default --- user_guide_src/source/incoming/controllers.rst | 6 +++--- user_guide_src/source/incoming/routing.rst | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 037710255100..287d6ae28153 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -114,10 +114,10 @@ Auto Routing This section describes the functionality of the auto-routing. It automatically routes an HTTP request, and executes the corresponding controller method -without route definitions. The auto-routing is enabled by default. +without route definitions. The auto-routing is disabled by default. .. note:: To prevent misconfiguration and miscoding, we recommend that you disable - the auto-routing feature. See :ref:`use-defined-routes-only`. + the auto-routing feature. .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. @@ -220,7 +220,7 @@ Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``): .. literalinclude:: controllers/014.php .. important:: If you are using the :doc:`URI Routing ` - feature, the segments passed to your method will be the re-routed + feature, the segments passed to your method will be the defined ones. Defining a Default Controller diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 04beafd9f2dc..77d68533fba2 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -312,7 +312,7 @@ available from the command line: .. literalinclude:: routing/032.php -.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**, +.. warning:: If you enable auto-routing and place the command file in **app/Controllers**, anyone could access the command with the help of auto-routing via HTTP. Global Options @@ -515,6 +515,11 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f However, CodeIgniter can also automatically route HTTP requests based on conventions and execute the corresponding controller methods. +.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable + the auto-routing feature. + +.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. + Enable Auto Routing =================== @@ -543,15 +548,14 @@ In the above example, CodeIgniter would attempt to find a controller named **Hel and executes ``index()`` method with passing ``'1'`` as the first argument. We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request, -and executes the corresponding controller method. The auto-routing is enabled by default. +and executes the corresponding controller method. The auto-routing is disabled by default. -.. note:: To prevent misconfiguration and miscoding, we recommend that you disable - the auto-routing feature. See :ref:`use-defined-routes-only`. +See :ref:`Auto Routing in Controllers ` for more info. Configuration Options ===================== -.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. +These options are available at the top of **app/Config/Routes.php**. Default Controller ------------------ From 1e6a48625fd77546390107b71823a095f9b13428 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 12:51:06 +0900 Subject: [PATCH 0022/8282] docs: replace remap with map --- user_guide_src/source/incoming/controllers.rst | 2 +- user_guide_src/source/incoming/routing.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 287d6ae28153..a4c635a6532c 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -279,7 +279,7 @@ called if the URL contains *only* the sub-directory. Simply put a controller in there that matches the name of your default controller as specified in your **app/Config/Routes.php** file. -CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing ` feature. +CodeIgniter also permits you to map your URIs using its :doc:`URI Routing ` feature. Remapping Method Calls ********************** diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 77d68533fba2..41741fb93ebf 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -76,22 +76,22 @@ Examples Here are a few basic routing examples. -A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class, +A URL containing the word **journals** in the first segment will be mapped to the ``\App\Controllers\Blogs`` class, and the default method, which is usually ``index()``: .. literalinclude:: routing/006.php -A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method. +A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users`` method. The ID will be set to ``34``: .. literalinclude:: routing/007.php -A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class +A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class and the ``productLookup`` method: .. literalinclude:: routing/008.php -A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class +A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class and the ``productLookupByID`` method passing in the match as a variable to the method: .. literalinclude:: routing/009.php From 08ecf84170635df1235ae757c6d9ff4b4ee1fe92 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 1 Mar 2022 12:55:26 +0900 Subject: [PATCH 0023/8282] docs: add `()` at the end of method names --- user_guide_src/source/incoming/routing.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 41741fb93ebf..4103abb6e428 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -81,18 +81,18 @@ and the default method, which is usually ``index()``: .. literalinclude:: routing/006.php -A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users`` method. +A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users()`` method. The ID will be set to ``34``: .. literalinclude:: routing/007.php A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class -and the ``productLookup`` method: +and the ``productLookup()`` method: .. literalinclude:: routing/008.php A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class -and the ``productLookupByID`` method passing in the match as a variable to the method: +and the ``productLookupByID()`` method passing in the match as a variable to the method: .. literalinclude:: routing/009.php From ab1d3d862c2774b51e432279412124daa5344e04 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 2 Mar 2022 09:32:49 +0900 Subject: [PATCH 0024/8282] docs: update Tutorial --- .../source/tutorial/create_news_items.rst | 2 +- .../source/tutorial/create_news_items/004.php | 5 + .../source/tutorial/news_section.rst | 3 +- .../source/tutorial/news_section/008.php | 5 + .../source/tutorial/static_pages.rst | 120 +++++++----------- .../source/tutorial/static_pages/003.php | 6 + .../source/tutorial/static_pages/004.php | 1 + 7 files changed, 68 insertions(+), 74 deletions(-) diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst index 32bc4b703e18..49ebc36c2bc3 100644 --- a/user_guide_src/source/tutorial/create_news_items.rst +++ b/user_guide_src/source/tutorial/create_news_items.rst @@ -119,7 +119,7 @@ Routing Before you can start adding news items into your CodeIgniter application you have to add an extra rule to **app/Config/Routes.php** file. Make sure your -file contains the following. This makes sure CodeIgniter sees ``create`` +file contains the following. This makes sure CodeIgniter sees ``create()`` as a method instead of a news item's slug. You can read more about different routing types :doc:`here `. diff --git a/user_guide_src/source/tutorial/create_news_items/004.php b/user_guide_src/source/tutorial/create_news_items/004.php index c8c66824fd82..8a0905770c82 100644 --- a/user_guide_src/source/tutorial/create_news_items/004.php +++ b/user_guide_src/source/tutorial/create_news_items/004.php @@ -1,6 +1,11 @@ match(['get', 'post'], 'news/create', 'News::create'); $routes->get('news/(:segment)', 'News::view/$1'); $routes->get('news', 'News::index'); +$routes->get('pages', 'Pages::index'); $routes->get('(:any)', 'Pages::view/$1'); + +// ... diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst index 2797c8a5cfaa..a27902819265 100644 --- a/user_guide_src/source/tutorial/news_section.rst +++ b/user_guide_src/source/tutorial/news_section.rst @@ -171,8 +171,7 @@ The only thing left to do is create the corresponding view at Routing ******* -Because of the wildcard routing rule created earlier, you need an extra -route to view the controller that you just made. Modify your routing file +Modify your routing file (**app/Config/Routes.php**) so it looks as follows. This makes sure the requests reach the ``News`` controller instead of going directly to the ``Pages`` controller. The first line routes URI's diff --git a/user_guide_src/source/tutorial/news_section/008.php b/user_guide_src/source/tutorial/news_section/008.php index 8943925258bd..4ba41638ef7f 100644 --- a/user_guide_src/source/tutorial/news_section/008.php +++ b/user_guide_src/source/tutorial/news_section/008.php @@ -1,5 +1,10 @@ get('news/(:segment)', 'News::view/$1'); $routes->get('news', 'News::index'); +$routes->get('pages', 'Pages::index'); $routes->get('(:any)', 'Pages::view/$1'); + +// ... diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 5128d6665e2c..6c39f82b5f80 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -9,20 +9,6 @@ The first thing you're going to do is set up a **controller** to handle static pages. A controller is simply a class that helps delegate work. It is the glue of your web application. -For example, when a call is made to:: - - http://example.com/news/latest/10 - -We might imagine that there is a controller named "news". The method -being called on news would be "latest". The news method's job could be to -grab 10 news items, and render them on the page. Very often in MVC, -you'll see URL patterns that match:: - - http://example.com/[controller-class]/[controller-method]/[arguments] - -As URL schemes become more complex, this may change. But for now, this -is all we will need to know. - Let's Make our First Controller ******************************* @@ -126,59 +112,11 @@ view. throw errors on case-sensitive platforms. You can read more about it :doc:`here `. -Running the App -*************** - -Ready to test? You cannot run the app using PHP's built-in server, -since it will not properly process the ``.htaccess`` rules that are provided in -``public``, and which eliminate the need to specify "index.php/" -as part of a URL. CodeIgniter has its own command that you can use though. - -From the command line, at the root of your project:: - - > php spark serve - -will start a web server, accessible on port 8080. If you set the location field -in your browser to ``localhost:8080``, you should see the CodeIgniter welcome page. - -You can now try several URLs in the browser location field, to see what the ``Pages`` -controller you made above produces... - -.. table:: - :widths: 20 80 - - +---------------------------------+-----------------------------------------------------------------+ - | URL | Will show | - +=================================+=================================================================+ - | localhost:8080/pages | the results from the `index` method inside our `Pages` | - | | controller, which is to display the CodeIgniter "welcome" page, | - | | because "index" is the default controller method | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/index | the CodeIgniter "welcome" page, because we explicitly asked for | - | | the "index" method | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view | the "home" page that you made above, because it is the default | - | | "page" parameter to the ``view()`` method. | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/home | show the "home" page that you made above, because we explicitly | - | | asked for it | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/about | the "about" page that you made above, because we explicitly | - | | asked for it | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/shop | a "404 - File Not Found" error page, because there is no | - | | `app/Views/pages/shop.php` | - +---------------------------------+-----------------------------------------------------------------+ - Routing ******* -The controller is now functioning! - -Using custom routing rules, you have the power to map any URI to any -controller and method, and break free from the normal convention:: - - http://example.com/[controller-class]/[controller-method]/[arguments] +We have made the controller. The next thing is to set routing rules. +Routing associates a URI with a controller's method. Let's do that. Open the routing file located at **app/Config/Routes.php** and look for the "Route Definitions" @@ -191,9 +129,10 @@ The only uncommented line there to start with should be: This directive says that any incoming request without any content specified should be handled by the ``index()`` method inside the ``Home`` controller. -Add the following line, **after** the route directive for '/'. +Add the following lines, **after** the route directive for '/'. .. literalinclude:: static_pages/004.php + :lines: 2- CodeIgniter reads its routing rules from top to bottom and routes the request to the first matching rule. Each rule is a regular expression @@ -205,18 +144,57 @@ arguments. More information about routing can be found in the URI Routing :doc:`documentation `. -Here, the second rule in the ``$routes`` object matches **any** request -using the wildcard string ``(:any)``. and passes the parameter to the +Here, the second rule in the ``$routes`` object matches GET request +to the URI path ``/pages`` maps the ``index()`` method of the ``Pages`` class. + +The third rule in the ``$routes`` object matches GET request to **any** URI path +using the wildcard string ``(:any)``, and passes the parameter to the ``view()`` method of the ``Pages`` class. +Running the App +*************** + +Ready to test? You cannot run the app using PHP's built-in server, +since it will not properly process the ``.htaccess`` rules that are provided in +``public``, and which eliminate the need to specify "index.php/" +as part of a URL. CodeIgniter has its own command that you can use though. + +From the command line, at the root of your project:: + + > php spark serve + +will start a web server, accessible on port 8080. If you set the location field +in your browser to ``localhost:8080``, you should see the CodeIgniter welcome page. + Now visit ``localhost:8080/home``. Did it get routed correctly to the ``view()`` -method in the pages controller? Awesome! +method in the ``Pages`` controller? Awesome! You should see something like the following: .. image:: ../images/tutorial1.png :align: center -.. note:: When manually specifying routes, it is recommended to disable - auto-routing by setting ``$routes->setAutoRoute(false);`` in the **Routes.php** file. - This ensures that only routes you define can be accessed. +You can now try several URLs in the browser location field, to see what the ``Pages`` +controller you made above produces... + +.. table:: + :widths: 20 80 + + +---------------------------------+-----------------------------------------------------------------+ + | URL | Will show | + +=================================+=================================================================+ + | localhost:8080/pages | the results from the ``index()`` method inside our ``Pages`` | + | | controller, which is to display the CodeIgniter "welcome" page. | + +---------------------------------+-----------------------------------------------------------------+ + | localhost:8080/pages/view | the "home" page that you made above, because it is the default | + | | "page" parameter to the ``view()`` method. | + +---------------------------------+-----------------------------------------------------------------+ + | localhost:8080/pages/view/home | show the "home" page that you made above, because we explicitly | + | | asked for it. | + +---------------------------------+-----------------------------------------------------------------+ + | localhost:8080/pages/view/about | the "about" page that you made above, because we explicitly | + | | asked for it. | + +---------------------------------+-----------------------------------------------------------------+ + | localhost:8080/pages/view/shop | a "404 - File Not Found" error page, because there is no | + | | **app/Views/pages/shop.php**. | + +---------------------------------+-----------------------------------------------------------------+ diff --git a/user_guide_src/source/tutorial/static_pages/003.php b/user_guide_src/source/tutorial/static_pages/003.php index d799d1cf0fb5..956c097d390f 100644 --- a/user_guide_src/source/tutorial/static_pages/003.php +++ b/user_guide_src/source/tutorial/static_pages/003.php @@ -1,3 +1,9 @@ get('/', 'Home::index'); + +// ... diff --git a/user_guide_src/source/tutorial/static_pages/004.php b/user_guide_src/source/tutorial/static_pages/004.php index f998b89762fd..a48a8caf18cb 100644 --- a/user_guide_src/source/tutorial/static_pages/004.php +++ b/user_guide_src/source/tutorial/static_pages/004.php @@ -1,3 +1,4 @@ get('pages', 'Pages::index'); $routes->get('(:any)', 'Pages::view/$1'); From 4027b1f9247ea3d6cf5b18c26a3d21179ccd7a67 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 2 Mar 2022 10:00:10 +0900 Subject: [PATCH 0025/8282] docs: change "note" to "warning" --- user_guide_src/source/incoming/controllers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index a4c635a6532c..928a16fff9b3 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -116,7 +116,7 @@ This section describes the functionality of the auto-routing. It automatically routes an HTTP request, and executes the corresponding controller method without route definitions. The auto-routing is disabled by default. -.. note:: To prevent misconfiguration and miscoding, we recommend that you disable +.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable the auto-routing feature. .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. From c7edb7c4c26ce82044b29607177de761e84b5311 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 2 Mar 2022 12:26:02 +0900 Subject: [PATCH 0026/8282] docs: make warning more detailed --- user_guide_src/source/incoming/controllers.rst | 5 +++-- user_guide_src/source/incoming/routing.rst | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 928a16fff9b3..99c22b5a356d 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -116,8 +116,9 @@ This section describes the functionality of the auto-routing. It automatically routes an HTTP request, and executes the corresponding controller method without route definitions. The auto-routing is disabled by default. -.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable - the auto-routing feature. +.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use + the auto-routing feature. It is easy to create vulnerable apps where controller filters + or CSRF protection are bypassed. .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 4103abb6e428..504e555dd76c 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -515,8 +515,9 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f However, CodeIgniter can also automatically route HTTP requests based on conventions and execute the corresponding controller methods. -.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable - the auto-routing feature. +.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use + the auto-routing feature. It is easy to create vulnerable apps where controller filters + or CSRF protection are bypassed. .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method. From d811d5b37ad4ede6d04afb4dd51ff510481e9205 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 2 Mar 2022 12:27:06 +0900 Subject: [PATCH 0027/8282] docs: update description --- user_guide_src/source/cli/cli.rst | 2 +- user_guide_src/source/incoming/routing.rst | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst index f3ffcc9285f6..bd57d4f608fd 100644 --- a/user_guide_src/source/cli/cli.rst +++ b/user_guide_src/source/cli/cli.rst @@ -88,7 +88,7 @@ works exactly like a normal route definition: For more information, see the :ref:`Routes ` page. -.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**, +.. warning:: If you enable auto-routing and place the command file in **app/Controllers**, anyone could access the command with the help of auto-routing via HTTP. The CLI Library diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 504e555dd76c..4989f0891e0b 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -479,8 +479,12 @@ dash isn't a valid class or method name character and would cause a fatal error Use Defined Routes Only ======================= +Since v4.2.0, the auto-routing is disabled by default. + When no defined route is found that matches the URI, the system will attempt to match that URI against the -controllers and methods as described in :ref:`auto-routing`. You can disable this automatic matching, and restrict routes +controllers and methods when :ref:`auto-routing` is enabled. + +You can disable this automatic matching, and restrict routes to only those defined by you, by setting the ``setAutoRoute()`` option to false: .. literalinclude:: routing/050.php From 1fe49bafc27d3483f9d0c863c4dbc4c29fb853fb Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 2 Mar 2022 12:33:35 +0900 Subject: [PATCH 0028/8282] docs: add warning as a comment --- app/Config/Routes.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 2b35d0dda6f8..15371af7de5e 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -21,7 +21,10 @@ $routes->setDefaultMethod('index'); $routes->setTranslateURIDashes(false); $routes->set404Override(); -$routes->setAutoRoute(false); +// The auto-routing is very dangerous. It is easy to create vulnerable apps +// where controller filters or CSRF protection are bypassed. +// It is recommended that you do not set it to `true`. +//$routes->setAutoRoute(false); /* * -------------------------------------------------------------------- From a65bc3ab2f5302c11bff26e545b12ec7b75e4e8f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 3 Mar 2022 09:21:21 +0900 Subject: [PATCH 0029/8282] docs: add about the config change of auto-routing in Upgrade Note --- user_guide_src/source/installation/upgrade_420.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst index a302f113ae61..daf89b39290f 100644 --- a/user_guide_src/source/installation/upgrade_420.rst +++ b/user_guide_src/source/installation/upgrade_420.rst @@ -49,7 +49,8 @@ Content Changes The following files received significant changes (including deprecations or visual adjustments) and it is recommended that you merge the updated versions with your application: -* +* ``app/Config/Routes.php`` + * To make the default configuration more secure, auto-routing has been changed to disabled by default. All Changes =========== From dafce4979cba1aed3b8a39705b919014fa6cd340 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 31 Mar 2022 10:34:00 +0900 Subject: [PATCH 0030/8282] feat: add options to change delimitors for conditionals To avoid accidentally changing JavaScript code. --- system/View/Parser.php | 45 +++++++++++++++++++++++++++-- tests/system/View/ParserTest.php | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/system/View/Parser.php b/system/View/Parser.php index 6834c003e500..665347d8f978 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -37,6 +37,16 @@ class Parser extends View */ public $rightDelimiter = '}'; + /** + * Left delimiter characters for conditionals + */ + protected string $leftConditionalDelimiter = '{'; + + /** + * Right delimiter characters for conditionals + */ + protected string $rightConditionalDelimiter = '}'; + /** * Stores extracted noparse blocks. * @@ -405,7 +415,14 @@ public function insertNoparse(string $template): string */ protected function parseConditionals(string $template): string { - $pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms'; + $leftDelimiter = preg_quote($this->leftConditionalDelimiter, '/'); + $rightDelimiter = preg_quote($this->rightConditionalDelimiter, '/'); + + $pattern = '/' + . $leftDelimiter + . '\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*' + . $rightDelimiter + . '/ms'; /* * For each match: @@ -424,8 +441,16 @@ protected function parseConditionals(string $template): string $template = str_replace($match[0], $statement, $template); } - $template = preg_replace('/\{\s*else\s*\}/ms', '', $template); - $template = preg_replace('/\{\s*endif\s*\}/ms', '', $template); + $template = preg_replace( + '/' . $leftDelimiter . '\s*else\s*' . $rightDelimiter . '/ms', + '', + $template + ); + $template = preg_replace( + '/' . $leftDelimiter . '\s*endif\s*' . $rightDelimiter . '/ms', + '', + $template + ); // Parse the PHP itself, or insert an error so they can debug ob_start(); @@ -461,6 +486,20 @@ public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): Rend return $this; } + /** + * Over-ride the substitution conditional delimiters. + * + * @param string $leftDelimiter + * @param string $rightDelimiter + */ + public function setConditionalDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface + { + $this->leftConditionalDelimiter = $leftDelimiter; + $this->rightConditionalDelimiter = $rightDelimiter; + + return $this; + } + /** * Handles replacing a pseudo-variable with the actual content. Will double-check * for escaping brackets. diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index 3462b0cc2a84..bf307a419f61 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -938,4 +938,53 @@ public function testRenderFindsOtherView() $expected = '

Hello World

'; $this->assertSame($expected, $this->parser->render('Simpler.html')); } + + public function testChangedConditionalDelimitersTrue() + { + $this->parser->setConditionalDelimiters('{%', '%}'); + + $data = [ + 'doit' => true, + 'dontdoit' => false, + ]; + $this->parser->setData($data); + + $template = '{% if $doit %}Howdy{% endif %}{% if $dontdoit === false %}Welcome{% endif %}'; + $output = $this->parser->renderString($template); + + $this->assertSame('HowdyWelcome', $output); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5831 + */ + public function testChangeConditionalDelimitersWorkWithJavaScriptCode() + { + $this->parser->setConditionalDelimiters('{%', '%}'); + + $data = [ + 'message' => 'Warning!', + ]; + $this->parser->setData($data); + + $template = <<<'EOL' + + EOL; + $expected = <<<'EOL' + + EOL; + $this->assertSame($expected, $this->parser->renderString($template)); + } } From 2d90f0cc6ca2bca0927bd73413d04f60d77fd9a2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 31 Mar 2022 10:55:53 +0900 Subject: [PATCH 0031/8282] docs: add setConditionalDelimiters() --- .../source/outgoing/view_parser.rst | 25 +++++++++++++++++++ .../source/outgoing/view_parser/027.php | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 user_guide_src/source/outgoing/view_parser/027.php diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 2e615e52bdb9..752dcc489590 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -290,6 +290,31 @@ of the comparison operators you would normally, like ``==``, ``===``, ``!==``, ` .. warning:: In the background, conditionals are parsed using an ``eval()``, so you must ensure that you take care with the user data that is used within conditionals, or you could open your application up to security risks. +Changing the Conditional Delimiters +----------------------------------- + +If you have JavaScript code like the following in your templates, the Parser raises a syntax error because there are strings that can be interpreted as a conditional:: + + + +In that case, you can change the delimiters for conditionals with the ``setConditionalDelimiters()`` method to avoid misinterpretations: + +.. literalinclude:: view_parser/027.php + +In this case, you will write code in your template:: + + {% if $role=='admin' %} +

Welcome, Admin

+ {% else %} +

Welcome, User

+ {% endif %} + Escaping Data ============= diff --git a/user_guide_src/source/outgoing/view_parser/027.php b/user_guide_src/source/outgoing/view_parser/027.php new file mode 100644 index 000000000000..84730679ced5 --- /dev/null +++ b/user_guide_src/source/outgoing/view_parser/027.php @@ -0,0 +1,3 @@ +setConditionalDelimiters('{%', '%}'); From e521f66fdabee7d0d109761caf084809132ccebc Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 31 Mar 2022 11:40:15 +0900 Subject: [PATCH 0032/8282] docs: replace variables with properties They are different. --- user_guide_src/source/tutorial/static_pages.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 6c39f82b5f80..668683995231 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -30,7 +30,7 @@ displays the CodeIgniter welcome page. The ``Pages`` class is extending the ``BaseController`` class that extends the ``CodeIgniter\Controller`` class. This means that the new Pages class can access the -methods and variables defined in the ``CodeIgniter\Controller`` class +methods and properties defined in the ``CodeIgniter\Controller`` class (**system/Controller.php**). The **controller is what will become the center of every request** to From 5dacb15c7ccd93ecb74b99d9788397941dd642cb Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 31 Mar 2022 11:59:08 +0900 Subject: [PATCH 0033/8282] fix: remove session _ci_validation_errors before running validation --- system/Validation/Validation.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 155efc223492..f330c91799f6 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -108,6 +108,12 @@ public function __construct($config, RendererInterface $view) */ public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool { + // If there are still validation errors for redirect_with_input request, remove them. + // See `getErrors()` method. + if (isset($_SESSION, $_SESSION['_ci_validation_errors'])) { + unset($_SESSION['_ci_validation_errors']); + } + $data ??= $this->data; // i.e. is_unique From 35c2947d1a1988f37a422275e5ba037f32f11aa3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 31 Mar 2022 11:40:53 +0900 Subject: [PATCH 0034/8282] docs: remove `echo` in the controller and use `return` echo() has side effects, so return is better. --- .../source/tutorial/create_news_items/002.php | 10 +++++----- user_guide_src/source/tutorial/news_section/004.php | 6 +++--- user_guide_src/source/tutorial/news_section/006.php | 6 +++--- user_guide_src/source/tutorial/static_pages/002.php | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/user_guide_src/source/tutorial/create_news_items/002.php b/user_guide_src/source/tutorial/create_news_items/002.php index cdebb0a71e6a..66ff5e26776b 100644 --- a/user_guide_src/source/tutorial/create_news_items/002.php +++ b/user_guide_src/source/tutorial/create_news_items/002.php @@ -18,11 +18,11 @@ public function create() 'body' => $this->request->getPost('body'), ]); - echo view('news/success'); - } else { - echo view('templates/header', ['title' => 'Create a news item']); - echo view('news/create'); - echo view('templates/footer'); + return view('news/success'); } + + return view('templates/header', ['title' => 'Create a news item']) + . view('news/create') + . view('templates/footer'); } } diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php index 475b86fa2f45..b62562bfe351 100644 --- a/user_guide_src/source/tutorial/news_section/004.php +++ b/user_guide_src/source/tutorial/news_section/004.php @@ -15,8 +15,8 @@ public function index() 'title' => 'News archive', ]; - echo view('templates/header', $data); - echo view('news/overview', $data); - echo view('templates/footer', $data); + return view('templates/header', $data) + . view('news/overview', $data) + . view('templates/footer', $data); } } diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php index 36faacb39a50..8bfc123e43f7 100644 --- a/user_guide_src/source/tutorial/news_section/006.php +++ b/user_guide_src/source/tutorial/news_section/006.php @@ -18,8 +18,8 @@ public function view($slug = null) $data['title'] = $data['news']['title']; - echo view('templates/header', $data); - echo view('news/view', $data); - echo view('templates/footer', $data); + return view('templates/header', $data) + . view('news/view', $data) + . view('templates/footer', $data); } } diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php index 970e663558d5..9f80c4556a58 100644 --- a/user_guide_src/source/tutorial/static_pages/002.php +++ b/user_guide_src/source/tutorial/static_pages/002.php @@ -13,8 +13,8 @@ public function view($page = 'home') $data['title'] = ucfirst($page); // Capitalize the first letter - echo view('templates/header', $data); - echo view('pages/' . $page, $data); - echo view('templates/footer', $data); + return view('templates/header', $data) + . view('pages/' . $page, $data) + . view('templates/footer', $data); } } From 59260c1cceda48673214e82b4607ba8567f135c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 1 Apr 2022 11:27:15 +0900 Subject: [PATCH 0035/8282] docs: remove unneeded & in sample code --- user_guide_src/source/models/model/055.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/models/model/055.php b/user_guide_src/source/models/model/055.php index 1d62c54ba058..537199753d49 100644 --- a/user_guide_src/source/models/model/055.php +++ b/user_guide_src/source/models/model/055.php @@ -8,8 +8,8 @@ class UserModel { protected $db; - public function __construct(ConnectionInterface &$db) + public function __construct(ConnectionInterface $db) { - $this->db = &$db; + $this->db = $db; } } From d84440415a86cfd5deb32a88d74bbf4236ef9e75 Mon Sep 17 00:00:00 2001 From: Toto Date: Fri, 1 Apr 2022 21:26:11 +0700 Subject: [PATCH 0036/8282] update link https://codeigniter.com/en/contribute not found --- app/Views/welcome_message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index 9ee2e427c308..b982f58aa158 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -279,7 +279,7 @@

CodeIgniter is a community driven project and accepts contributions of code and documentation from the community. Why not - + join us ?

From 88a7f8b88a9bbd29daaea1f94deeb95a618ccd76 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Fri, 1 Apr 2022 12:28:28 -0500 Subject: [PATCH 0037/8282] Added contributors to readme --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a8a3566e395d..d8525f299037 100644 --- a/README.md +++ b/README.md @@ -69,10 +69,19 @@ to optional packages, with their own repository. ## Contributing -We **are** accepting contributions from the community! +We **are** accepting contributions from the community! It doesn't matter whether you can code, write documentation, or help find bugs, +all contributions are welcome. Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/README.md). +CodeIgniter has had thousands on contributions from people since its creation. This project would not be what it is without them. + + + + + +Made with [contrib.rocks](https://contrib.rocks). + ## Server Requirements PHP version 7.4 or higher is required, with the following extensions installed: From 27a74023bb25aefd752beb8f473393e84ac4fbfd Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 12:50:56 +0900 Subject: [PATCH 0038/8282] fix: FileLocator::listFiles() returns directories We don't need directories. --- system/Autoloader/FileLocator.php | 3 +++ tests/system/Autoloader/FileLocatorTest.php | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php index f9734828b692..0b7b5d1d4345 100644 --- a/system/Autoloader/FileLocator.php +++ b/system/Autoloader/FileLocator.php @@ -309,6 +309,9 @@ public function listFiles(string $path): array $tempFiles = get_filenames($fullPath, true); + // Remove directories + $tempFiles = array_filter($tempFiles, static fn ($path) => strtolower(substr($path, -4)) === '.php'); + if (! empty($tempFiles)) { $files = array_merge($files, $tempFiles); } diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php index 54a471d74453..3b86cfb7e535 100644 --- a/tests/system/Autoloader/FileLocatorTest.php +++ b/tests/system/Autoloader/FileLocatorTest.php @@ -211,6 +211,18 @@ public function testListFilesSimple() $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true)); } + public function testListFilesDoesNotContainDirectories() + { + $files = $this->locator->listFiles('Config/'); + + $directory = str_replace( + '/', + DIRECTORY_SEPARATOR, + APPPATH . 'Config/Boot' + ); + $this->assertNotContains($directory, $files); + } + public function testListFilesWithFileAsInput() { $files = $this->locator->listFiles('Config/App.php'); From 37e99bf13f1db654c546c2187d30dc9ec3c8b6f1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 12:53:10 +0900 Subject: [PATCH 0039/8282] docs: add @return --- system/Autoloader/FileLocator.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php index 0b7b5d1d4345..cfe12b79c2fa 100644 --- a/system/Autoloader/FileLocator.php +++ b/system/Autoloader/FileLocator.php @@ -289,6 +289,8 @@ public function findQualifiedNameFromPath(string $path) /** * Scans the defined namespaces, returning a list of all files * that are contained within the subpath specified by $path. + * + * @return string[] List of file paths */ public function listFiles(string $path): array { @@ -323,6 +325,8 @@ public function listFiles(string $path): array /** * Scans the provided namespace, returning a list of all files * that are contained within the sub path specified by $path. + * + * @return string[] List of file paths */ public function listNamespaceFiles(string $prefix, string $path): array { From 7aba08ab2f93a2e42a452a6fd995ad9b5c308318 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 12:53:51 +0900 Subject: [PATCH 0040/8282] fix: discoverCommands() loads incorrect classname --- system/CLI/Commands.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php index d153b3aa857a..2714db30bcf9 100644 --- a/system/CLI/Commands.php +++ b/system/CLI/Commands.php @@ -76,10 +76,6 @@ public function getCommands() /** * Discovers all commands in the framework and within user code, * and collects instances of them to work with. - * - * @TODO this approach (find qualified classname from path) causes error, - * when using Composer autoloader. - * See https://github.com/codeigniter4/CodeIgniter4/issues/5818 */ public function discoverCommands() { @@ -100,9 +96,9 @@ public function discoverCommands() // Loop over each file checking to see if a command with that // alias exists in the class. foreach ($files as $file) { - $className = $locator->findQualifiedNameFromPath($file); + $className = $locator->getClassname($file); - if (empty($className) || ! class_exists($className)) { + if ($className === '' || ! class_exists($className)) { continue; } From 4c1dc38a75847a52e9efe2dab952cdcdbbc46ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tuna=20=C3=87a=C4=9Flar=20G=C3=BCm=C3=BC=C5=9F?= Date: Sat, 2 Apr 2022 13:58:12 +0300 Subject: [PATCH 0041/8282] wrong function name. Needs to be orWhere(). There is no or_where in CI 4. --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index d6e5b27aac36..5e05f0ce6b0b 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -804,7 +804,7 @@ Generates a **DELETE** SQL string and runs the query. .. literalinclude:: query_builder/093.php The first parameter is the where clause. -You can also use the ``where()`` or ``or_where()`` methods instead of passing +You can also use the ``where()`` or ``orWhere()`` methods instead of passing the data to the first parameter of the method: .. literalinclude:: query_builder/094.php From de7c19c456bf944e61c9e32835097727cd5d79ef Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 14:02:14 +0900 Subject: [PATCH 0042/8282] test: fix assertions If we use Compoesr autoloader, the path would be like `/vendor/composer/../../app/Controllers/Home.php`. --- tests/system/Autoloader/AutoloaderTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index f9a56cae82db..82e0307affad 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -88,7 +88,7 @@ public function testServiceAutoLoaderFromShareInstances() // look for Home controller, as that should be in base repo $actual = $autoloader->loadClass('App\Controllers\Home'); $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php'; - $this->assertSame($expected, $actual); + $this->assertSame($expected, realpath($actual) ?: $actual); } public function testServiceAutoLoader() @@ -99,7 +99,7 @@ public function testServiceAutoLoader() // look for Home controller, as that should be in base repo $actual = $autoloader->loadClass('App\Controllers\Home'); $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php'; - $this->assertSame($expected, $actual); + $this->assertSame($expected, realpath($actual) ?: $actual); } public function testExistingFile() From 46b3de8aef4d74600235693a09a9052c476df731 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 14:07:33 +0900 Subject: [PATCH 0043/8282] refactor: extract method --- system/Autoloader/Autoloader.php | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index bfd535f856ca..7423fc235586 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -106,7 +106,8 @@ public function initialize(Autoload $config, Modules $modules) // Should we load through Composer's namespaces, also? if ($modules->discoverInComposer) { - $this->discoverComposerNamespaces(); + $this->loadComposerClassmap(); + $this->loadComposerNamespaces(); } return $this; @@ -296,10 +297,7 @@ public function sanitizeFilename(string $filename): string return trim($filename, '.-_'); } - /** - * Locates autoload information from Composer, if available. - */ - protected function discoverComposerNamespaces() + protected function loadComposerNamespaces() { if (! is_file(COMPOSER_PATH)) { return; @@ -310,7 +308,6 @@ protected function discoverComposerNamespaces() */ $composer = include COMPOSER_PATH; $paths = $composer->getPrefixesPsr4(); - $classes = $composer->getClassMap(); unset($composer); @@ -327,6 +324,23 @@ protected function discoverComposerNamespaces() } $this->prefixes = array_merge($this->prefixes, $newPaths); + } + + protected function loadComposerClassmap(): void + { + if (! is_file(COMPOSER_PATH)) { + return; + } + + /** + * @var ClassLoader $composer + */ + $composer = include COMPOSER_PATH; + + $classes = $composer->getClassMap(); + + unset($composer); + $this->classmap = array_merge($this->classmap, $classes); } } From ceb9418bd5ea051fd0a71fb916cb90a399bb0bda Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 14:17:41 +0900 Subject: [PATCH 0044/8282] refactor: move duplicated logic up --- system/Autoloader/Autoloader.php | 44 ++++++++++++-------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 7423fc235586..88f3dd743470 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -104,10 +104,19 @@ public function initialize(Autoload $config, Modules $modules) $this->files = $config->files; } - // Should we load through Composer's namespaces, also? - if ($modules->discoverInComposer) { - $this->loadComposerClassmap(); - $this->loadComposerNamespaces(); + if (is_file(COMPOSER_PATH)) { + /** + * @var ClassLoader $composer + */ + $composer = include COMPOSER_PATH; + + // Should we load through Composer's namespaces, also? + if ($modules->discoverInComposer) { + $this->loadComposerClassmap($composer); + $this->loadComposerNamespaces($composer); + } + + unset($composer); } return $this; @@ -297,19 +306,9 @@ public function sanitizeFilename(string $filename): string return trim($filename, '.-_'); } - protected function loadComposerNamespaces() + protected function loadComposerNamespaces(ClassLoader $composer): void { - if (! is_file(COMPOSER_PATH)) { - return; - } - - /** - * @var ClassLoader $composer - */ - $composer = include COMPOSER_PATH; - $paths = $composer->getPrefixesPsr4(); - - unset($composer); + $paths = $composer->getPrefixesPsr4(); // Get rid of CodeIgniter so we don't have duplicates if (isset($paths['CodeIgniter\\'])) { @@ -326,21 +325,10 @@ protected function loadComposerNamespaces() $this->prefixes = array_merge($this->prefixes, $newPaths); } - protected function loadComposerClassmap(): void + protected function loadComposerClassmap(ClassLoader $composer): void { - if (! is_file(COMPOSER_PATH)) { - return; - } - - /** - * @var ClassLoader $composer - */ - $composer = include COMPOSER_PATH; - $classes = $composer->getClassMap(); - unset($composer); - $this->classmap = array_merge($this->classmap, $classes); } } From 954b647ddd7ac3df8f455a44b4cbfa13f6f68194 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 14:18:22 +0900 Subject: [PATCH 0045/8282] fix: don't load Composer classmap if $discoverInComposer is false Now it always loads and uses Composer classmap if it is available. --- system/Autoloader/Autoloader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 88f3dd743470..f4c37b4d250e 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -110,9 +110,10 @@ public function initialize(Autoload $config, Modules $modules) */ $composer = include COMPOSER_PATH; + $this->loadComposerClassmap($composer); + // Should we load through Composer's namespaces, also? if ($modules->discoverInComposer) { - $this->loadComposerClassmap($composer); $this->loadComposerNamespaces($composer); } From 783835efddd6c383de74c42402380c95903f88f5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 2 Apr 2022 14:20:09 +0900 Subject: [PATCH 0046/8282] refactor: extract method --- system/Autoloader/Autoloader.php | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index f4c37b4d250e..cca4a7d28f1e 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -105,22 +105,27 @@ public function initialize(Autoload $config, Modules $modules) } if (is_file(COMPOSER_PATH)) { - /** - * @var ClassLoader $composer - */ - $composer = include COMPOSER_PATH; + $this->loadComposerInfo($modules); + } - $this->loadComposerClassmap($composer); + return $this; + } - // Should we load through Composer's namespaces, also? - if ($modules->discoverInComposer) { - $this->loadComposerNamespaces($composer); - } + protected function loadComposerInfo(Modules $modules): void + { + /** + * @var ClassLoader $composer + */ + $composer = include COMPOSER_PATH; + + $this->loadComposerClassmap($composer); - unset($composer); + // Should we load through Composer's namespaces, also? + if ($modules->discoverInComposer) { + $this->loadComposerNamespaces($composer); } - return $this; + unset($composer); } /** From c179ed044558faa93d7ad05869b1e4c9b22069ca Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 08:01:39 +0900 Subject: [PATCH 0047/8282] refactor: restore discoverComposerNamespaces() and deprecate --- system/Autoloader/Autoloader.php | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index cca4a7d28f1e..7152f160c652 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -337,4 +337,40 @@ protected function loadComposerClassmap(ClassLoader $composer): void $this->classmap = array_merge($this->classmap, $classes); } + + /** + * Locates autoload information from Composer, if available. + * + * @deprecated No longer used. + */ + protected function discoverComposerNamespaces() + { + if (! is_file(COMPOSER_PATH)) { + return; + } + + /** + * @var ClassLoader $composer + */ + $composer = include COMPOSER_PATH; + $paths = $composer->getPrefixesPsr4(); + $classes = $composer->getClassMap(); + + unset($composer); + + // Get rid of CodeIgniter so we don't have duplicates + if (isset($paths['CodeIgniter\\'])) { + unset($paths['CodeIgniter\\']); + } + + $newPaths = []; + + foreach ($paths as $key => $value) { + // Composer stores namespaces with trailing slash. We don't. + $newPaths[rtrim($key, '\\ ')] = $value; + } + + $this->prefixes = array_merge($this->prefixes, $newPaths); + $this->classmap = array_merge($this->classmap, $classes); + } } From 577eefe25c4061e0a286b51969fc96ad177282b3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 08:03:15 +0900 Subject: [PATCH 0048/8282] refactor: make new methods private --- system/Autoloader/Autoloader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 7152f160c652..520e669be685 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -111,7 +111,7 @@ public function initialize(Autoload $config, Modules $modules) return $this; } - protected function loadComposerInfo(Modules $modules): void + private function loadComposerInfo(Modules $modules): void { /** * @var ClassLoader $composer @@ -312,7 +312,7 @@ public function sanitizeFilename(string $filename): string return trim($filename, '.-_'); } - protected function loadComposerNamespaces(ClassLoader $composer): void + private function loadComposerNamespaces(ClassLoader $composer): void { $paths = $composer->getPrefixesPsr4(); @@ -331,7 +331,7 @@ protected function loadComposerNamespaces(ClassLoader $composer): void $this->prefixes = array_merge($this->prefixes, $newPaths); } - protected function loadComposerClassmap(ClassLoader $composer): void + private function loadComposerClassmap(ClassLoader $composer): void { $classes = $composer->getClassMap(); From c7e659fc367eefd76cb0680214880fb14eaa4585 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 08:13:44 +0900 Subject: [PATCH 0049/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.2.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 465054262b41..99f980d6b35e 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -17,6 +17,7 @@ BREAKING - ``public/index.php`` - ``spark`` - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug. +- The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available. Enhancements ************ @@ -55,6 +56,7 @@ Deprecations - ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead. - ``CodeIgniter\Router\Router::setDefaultController()`` is deprecated. - The constant ``SPARKED`` in **spark** is deprecated. Use the ``$context`` property in ``CodeIgniter\CodeIgniter`` instead. +- ``CodeIgniter\Autoloader\Autoloader::discoverComposerNamespaces()`` is deprecated, and no longer used. Bugs Fixed ********** From c03df2ea180af20c82ad94a8a96e55b2bab35b15 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:10:11 +0900 Subject: [PATCH 0050/8282] docs: add missing `+` --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 752dcc489590..b431b9979602 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -458,7 +458,7 @@ While plugins will often consist of tag pairs, like shown above, they can also b Opening tags can also contain parameters that can customize how the plugin works. The parameters are represented as key/value pairs:: - {+ foo bar=2 baz="x y" } + {+ foo bar=2 baz="x y" +} Parameters can also be single values:: From 53fb7ac06fd959077323bec40d9c4d596d21d853 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:10:40 +0900 Subject: [PATCH 0051/8282] docs: remove unnecessary line breaks in sample code --- user_guide_src/source/installation/upgrade_view_parser/001.php | 3 +-- user_guide_src/source/outgoing/view_parser.rst | 3 +-- user_guide_src/source/outgoing/view_parser/003.php | 3 +-- user_guide_src/source/outgoing/view_parser/006.php | 3 +-- user_guide_src/source/outgoing/view_parser/007.php | 3 +-- user_guide_src/source/outgoing/view_parser/008.php | 3 +-- user_guide_src/source/outgoing/view_parser/018.php | 3 +-- user_guide_src/source/outgoing/view_parser/019.php | 3 +-- user_guide_src/source/outgoing/view_parser/020.php | 3 +-- user_guide_src/source/outgoing/view_parser/021.php | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/001.php index 6bef47ef69ec..27dc410b1708 100644 --- a/user_guide_src/source/installation/upgrade_view_parser/001.php +++ b/user_guide_src/source/installation/upgrade_view_parser/001.php @@ -7,5 +7,4 @@ 'blog_heading' => 'My Blog Heading', ]; -echo $parser->setData($data) - ->render('blog_template'); +echo $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index b431b9979602..6c6c2601b451 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -550,8 +550,7 @@ An example with the iteration controlled in the view:: ['title' => 'Second Link', 'link' => '/second'], ] ]; - echo $parser->setData($data) - ->renderString($template); + echo $parser->setData($data)->renderString($template); Result:: diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php index 1ee48b997ae6..da4ef088f6bd 100644 --- a/user_guide_src/source/outgoing/view_parser/003.php +++ b/user_guide_src/source/outgoing/view_parser/003.php @@ -5,5 +5,4 @@ 'blog_heading' => 'My Blog Heading', ]; -echo $parser->setData($data) - ->render('blog_template'); +echo $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php index 6b1409c46c1d..dfde61eec728 100644 --- a/user_guide_src/source/outgoing/view_parser/006.php +++ b/user_guide_src/source/outgoing/view_parser/006.php @@ -12,5 +12,4 @@ ], ]; -echo $parser->setData($data) - ->render('blog_template'); +echo $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php index 032f9d55f268..b3ca937f711f 100644 --- a/user_guide_src/source/outgoing/view_parser/007.php +++ b/user_guide_src/source/outgoing/view_parser/007.php @@ -8,5 +8,4 @@ 'blog_entries' => $query->getResultArray(), ]; -echo $parser->setData($data) - ->render('blog_template'); +echo $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php index 62be126a407d..4b0a6215830e 100644 --- a/user_guide_src/source/outgoing/view_parser/008.php +++ b/user_guide_src/source/outgoing/view_parser/008.php @@ -9,5 +9,4 @@ ], ]; -echo $parser->setData($data) - ->render('blog_template'); +echo $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php index 4e039f02a08c..0bb60828d691 100644 --- a/user_guide_src/source/outgoing/view_parser/018.php +++ b/user_guide_src/source/outgoing/view_parser/018.php @@ -6,6 +6,5 @@ 'firstname' => 'John', 'lastname' => 'Doe', ]; -echo $parser->setData($data) - ->renderString($template); +echo $parser->setData($data)->renderString($template); // Result: Hello, John Doe diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php index 16621ef2f190..a3cb80300299 100644 --- a/user_guide_src/source/outgoing/view_parser/019.php +++ b/user_guide_src/source/outgoing/view_parser/019.php @@ -6,6 +6,5 @@ 'firstname' => 'John', 'lastname' => 'Doe', ]; -echo $parser->setData($data) - ->renderString($template); +echo $parser->setData($data)->renderString($template); // Result: Hello, John {initials} Doe diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php index 9226793f280d..62256192019d 100644 --- a/user_guide_src/source/outgoing/view_parser/020.php +++ b/user_guide_src/source/outgoing/view_parser/020.php @@ -10,6 +10,5 @@ ['degree' => 'PhD'], ], ]; -echo $parser->setData($data) - ->renderString($template); +echo $parser->setData($data)->renderString($template); // Result: Hello, John Doe (Mr{degree} {/degrees}) diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php index 3c9982437a19..977b8b958140 100644 --- a/user_guide_src/source/outgoing/view_parser/021.php +++ b/user_guide_src/source/outgoing/view_parser/021.php @@ -15,5 +15,4 @@ $data = [ 'menuitems' => $temp, ]; -echo $parser->setData($data) - ->renderString($template2); +echo $parser->setData($data)->renderString($template2); From 71a7682d1eba5bad20109362e292479cf952f5b4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:13:15 +0900 Subject: [PATCH 0052/8282] docs: fix text decoration for variable --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 6c6c2601b451..e3908ec0a391 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -491,7 +491,7 @@ Registering a Plugin -------------------- At its simplest, all you need to do to register a new plugin and make it ready for use is to add it to the -**app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is +**app/Config/View.php**, under the ``$plugins`` array. The key is the name of the plugin that is used within the template file. The value is any valid PHP callable, including static class methods: .. literalinclude:: view_parser/014.php From 931c6f43a7724446b9fcf8dbd13b782e0dd352c6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:20:31 +0900 Subject: [PATCH 0053/8282] docs: remove unsupported options `leftDelimiter` and `rightDelimiter` --- user_guide_src/source/outgoing/view_parser.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index e3908ec0a391..67ee0b7680eb 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -595,8 +595,6 @@ Class Reference - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated - ``saveData`` - true if the view data parameter should be retained for subsequent calls - - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax - - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax Any conditional substitutions are performed first, then remaining substitutions are performed for each data pair. From 20194690313be9d7e7f60165808376baf49a12f9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:24:59 +0900 Subject: [PATCH 0054/8282] docs: rename variable name in sample code Make the same name as other sample code. --- user_guide_src/source/outgoing/view_parser/024.php | 2 +- user_guide_src/source/outgoing/view_parser/025.php | 2 +- user_guide_src/source/outgoing/view_parser/026.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser/024.php b/user_guide_src/source/outgoing/view_parser/024.php index 42ddfa949331..17a0a477e756 100644 --- a/user_guide_src/source/outgoing/view_parser/024.php +++ b/user_guide_src/source/outgoing/view_parser/024.php @@ -1,3 +1,3 @@ setData(['name' => 'George', 'position' => 'Boss']); +$parser->setData(['name' => 'George', 'position' => 'Boss']); diff --git a/user_guide_src/source/outgoing/view_parser/025.php b/user_guide_src/source/outgoing/view_parser/025.php index 8fa85f4faa98..fe67fe17aeb4 100644 --- a/user_guide_src/source/outgoing/view_parser/025.php +++ b/user_guide_src/source/outgoing/view_parser/025.php @@ -1,3 +1,3 @@ setVar('name', 'Joe', 'html'); +$parser->setVar('name', 'Joe', 'html'); diff --git a/user_guide_src/source/outgoing/view_parser/026.php b/user_guide_src/source/outgoing/view_parser/026.php index 46cfd9afd818..a7efd14837f2 100644 --- a/user_guide_src/source/outgoing/view_parser/026.php +++ b/user_guide_src/source/outgoing/view_parser/026.php @@ -1,3 +1,3 @@ setDelimiters('[', ']'); +$parser->setDelimiters('[', ']'); From 08d4dbecccf14847f098804edfa2987120668efe Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:29:10 +0900 Subject: [PATCH 0055/8282] docs: add setConditionalDelimiters() in Class Reference --- user_guide_src/source/outgoing/view_parser.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 67ee0b7680eb..c369e7a5a78b 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -652,3 +652,14 @@ Class Reference Override the substitution field delimiters: .. literalinclude:: view_parser/026.php + + .. php:method:: setConditionalDelimiters($leftDelimiter = '{', $rightDelimiter = '}') + + :param string $leftDelimiter: Left delimiter for conditionals + :param string $rightDelimiter: right delimiter for conditionals + :returns: The Renderer, for method chaining + :rtype: CodeIgniter\\View\\RendererInterface. + + Override the conditional delimiters: + + .. literalinclude:: view_parser/027.php From bbea1665c368b235086a7b3cbbc5f462431e26f3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:32:27 +0900 Subject: [PATCH 0056/8282] docs: remove parameters of methods in text No parameters make them easier to read. --- user_guide_src/source/outgoing/view_parser.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index c369e7a5a78b..f4239b320207 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -53,9 +53,9 @@ can instantiate it directly: .. literalinclude:: view_parser/002.php Then you can use any of the three standard rendering methods that it provides: -``render(viewpath, options, save)``, ``setVar(name, value, context)`` and -``setData(data, context)``. You will also be able to specify delimiters directly, -through the ``setDelimiters(left, right)`` method. +``render()``, ``setVar()`` and +``setData()``. You will also be able to specify delimiters directly, +through the ``setDelimiters()`` method. Using the ``Parser``, your view templates are processed only by the Parser itself, and not like a conventional view PHP script. PHP code in such a script From faf39c2003bbb17c04957facf03d9300b0969424 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:36:29 +0900 Subject: [PATCH 0057/8282] docs: make text as a important note --- user_guide_src/source/outgoing/view_parser.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index f4239b320207..b72388486eb6 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -57,11 +57,11 @@ Then you can use any of the three standard rendering methods that it provides: ``setData()``. You will also be able to specify delimiters directly, through the ``setDelimiters()`` method. -Using the ``Parser``, your view templates are processed only by the Parser -itself, and not like a conventional view PHP script. PHP code in such a script -is ignored by the parser, and only substitutions are performed. +.. important:: Using the ``Parser``, your view templates are processed only by the Parser + itself, and not like a conventional view PHP script. PHP code in such a script + is ignored by the parser, and only substitutions are performed. -This is purposeful: view files with no PHP. + This is purposeful: view files with no PHP. What It Does ============ From d368c511299d7ca063e9cfa70f56761924129b7c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:44:45 +0900 Subject: [PATCH 0058/8282] docs: fix text decoration for filter --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index b72388486eb6..50b4b4376707 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -336,7 +336,7 @@ Filters Any single variable substitution can have one or more filters applied to it to modify the way it is presented. These are not intended to drastically change the output, but provide ways to reuse the same variable data but with different -presentations. The **esc** filter discussed above is one example. Dates are another common use case, where you might +presentations. The ``esc`` filter discussed above is one example. Dates are another common use case, where you might need to format the same data differently in several sections on the same page. Filters are commands that come after the pseudo-variable name, and are separated by the pipe symbol, ``|``:: From b5423cc15a7f8471cc14d32ea7da22bc3ca821d9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 09:45:05 +0900 Subject: [PATCH 0059/8282] docs: add space between tags --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 50b4b4376707..961d8ea96c31 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -250,7 +250,7 @@ This example gives different results, depending on cascading: Preventing Parsing ================== -You can specify portions of the page to not be parsed with the ``{noparse}{/noparse}`` tag pair. Anything in this +You can specify portions of the page to not be parsed with the ``{noparse}`` ``{/noparse}`` tag pair. Anything in this section will stay exactly as it is, with no variable substitution, looping, etc, happening to the markup between the brackets. :: From cf4d83d1e5d7e144a44d49e19892ac819d908c6c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 10:25:57 +0900 Subject: [PATCH 0060/8282] docs: add links to reference --- user_guide_src/source/tutorial/conclusion.rst | 5 +++-- user_guide_src/source/tutorial/news_section.rst | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst index afb38465904b..2a4f66264784 100644 --- a/user_guide_src/source/tutorial/conclusion.rst +++ b/user_guide_src/source/tutorial/conclusion.rst @@ -10,8 +10,9 @@ design patterns, which you can expand upon. Now that you've completed this tutorial, we recommend you check out the rest of the documentation. CodeIgniter is often praised because of its comprehensive documentation. Use this to your advantage and read the -"Overview" and "General Topics" sections thoroughly. You should read -the class and helper references when needed. +:doc:`Overview ` and :doc:`/general/index` +sections thoroughly. You should read +the :doc:`Library ` and :doc:`/helpers/index` references when needed. Every intermediate PHP programmer should be able to get the hang of CodeIgniter within a few days. diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst index a27902819265..aca19a25cad3 100644 --- a/user_guide_src/source/tutorial/news_section.rst +++ b/user_guide_src/source/tutorial/news_section.rst @@ -80,7 +80,7 @@ library. This will make the database class available through the Now that the database and a model have been set up, you'll need a method to get all of our posts from our database. To do this, the database abstraction layer that is included with CodeIgniter - -:doc:`Query Builder <../database/query_builder>` - is used. This makes it +:doc:`Query Builder <../database/query_builder>` - is used in the ``CodeIgnite\Model``. This makes it possible to write your 'queries' once and make them work on :doc:`all supported database systems <../intro/requirements>`. The Model class also allows you to easily work with the Query Builder and provides From 3f480d453479b17a6d75cc0abadf3ded39c65e34 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 10:26:28 +0900 Subject: [PATCH 0061/8282] docs: update forum url and add slack url --- user_guide_src/source/tutorial/conclusion.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst index 2a4f66264784..94b8ba5e3f2d 100644 --- a/user_guide_src/source/tutorial/conclusion.rst +++ b/user_guide_src/source/tutorial/conclusion.rst @@ -20,4 +20,5 @@ CodeIgniter within a few days. If you still have questions about the framework or your own CodeIgniter code, you can: -- Check out our `forums `_ +- Check out our `Forum `_ +- Check out our `Slack `_ From f58bac1954d5c189bf635309eb2a1ec6e8d5ed84 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 10:26:58 +0900 Subject: [PATCH 0062/8282] docs: remove unneeded `` --- user_guide_src/source/tutorial/create_news_items.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst index 49ebc36c2bc3..a59124515a59 100644 --- a/user_guide_src/source/tutorial/create_news_items.rst +++ b/user_guide_src/source/tutorial/create_news_items.rst @@ -50,7 +50,7 @@ the slug from our title in the model. Create a new view at There are probably only three things here that look unfamiliar. -The ``getFlashdata('error') ?>`` function is used to report +The ``session()->getFlashdata('error')`` function is used to report errors related to CSRF protection. The ``service('validation')->listErrors()`` function is used to report From 54d80bcd0727c9f10c5f7ebf2f98548131732402 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 10:27:26 +0900 Subject: [PATCH 0063/8282] docs: fix link to validation page --- user_guide_src/source/incoming/controllers.rst | 2 ++ user_guide_src/source/tutorial/create_news_items.rst | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 99c22b5a356d..c5a963c81fdd 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -61,6 +61,8 @@ modify this by passing the duration (in seconds) as the first parameter: .. note:: A number of :doc:`time-based constants ` are always available for you to use, including ``YEAR``, ``MONTH``, and more. +.. _controller-validate: + Validating data *************** diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst index a59124515a59..99d28abf3cdb 100644 --- a/user_guide_src/source/tutorial/create_news_items.rst +++ b/user_guide_src/source/tutorial/create_news_items.rst @@ -60,8 +60,8 @@ The ``csrf_field()`` function creates a hidden input with a CSRF token that help Go back to your ``News`` controller. You're going to do two things here, check whether the form was submitted and whether the submitted data -passed the validation rules. You'll use the :doc:`form -validation <../libraries/validation>` library to do this. +passed the validation rules. +You'll use the :ref:`validation method in Controller ` to do this. .. literalinclude:: create_news_items/002.php From 149555ebd23d404ecf8684e52cb363365a7470ef Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 13:47:18 +0900 Subject: [PATCH 0064/8282] docs: replace echo with return --- user_guide_src/source/tutorial/static_pages.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 668683995231..6fde0a671da7 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -24,7 +24,7 @@ displays the CodeIgniter welcome page. .. note:: There are two ``view()`` functions referred to in this tutorial. One is the class method created with ``public function view($page = 'home')`` - and ``echo view('welcome_message')`` for displaying a view. + and ``return view('welcome_message')`` for displaying a view. Both are *technically* a function. But when you create a function in a class, it's called a method. From 977eb2561db4108b6ed3dfe97541de150e9b6429 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 08:35:49 +0900 Subject: [PATCH 0065/8282] docs: remove unneeded $data for view() $saveData is true by default, so we don't need to pass $data more than once. --- user_guide_src/source/tutorial/news_section/004.php | 4 ++-- user_guide_src/source/tutorial/news_section/006.php | 4 ++-- user_guide_src/source/tutorial/static_pages/002.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php index b62562bfe351..9e823b6f7589 100644 --- a/user_guide_src/source/tutorial/news_section/004.php +++ b/user_guide_src/source/tutorial/news_section/004.php @@ -16,7 +16,7 @@ public function index() ]; return view('templates/header', $data) - . view('news/overview', $data) - . view('templates/footer', $data); + . view('news/overview') + . view('templates/footer'); } } diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php index 8bfc123e43f7..94548ac9307f 100644 --- a/user_guide_src/source/tutorial/news_section/006.php +++ b/user_guide_src/source/tutorial/news_section/006.php @@ -19,7 +19,7 @@ public function view($slug = null) $data['title'] = $data['news']['title']; return view('templates/header', $data) - . view('news/view', $data) - . view('templates/footer', $data); + . view('news/view') + . view('templates/footer'); } } diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php index 9f80c4556a58..5c8ec102a5a1 100644 --- a/user_guide_src/source/tutorial/static_pages/002.php +++ b/user_guide_src/source/tutorial/static_pages/002.php @@ -14,7 +14,7 @@ public function view($page = 'home') $data['title'] = ucfirst($page); // Capitalize the first letter return view('templates/header', $data) - . view('pages/' . $page, $data) - . view('templates/footer', $data); + . view('pages/' . $page) + . view('templates/footer'); } } From e0569f673f0c119b620f37981bf90dd19d8390a1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 3 Apr 2022 14:19:58 +0900 Subject: [PATCH 0066/8282] docs: replace echo with return echo() has side effects, so return is better. --- user_guide_src/source/cli/cli/001.php | 2 +- user_guide_src/source/incoming/controllers/008.php | 2 +- user_guide_src/source/incoming/controllers/013.php | 4 ++-- user_guide_src/source/incoming/controllers/014.php | 4 ++-- .../source/installation/upgrade_controllers/001.php | 2 +- .../source/installation/upgrade_file_upload/001.php | 11 +++++------ .../source/installation/upgrade_pagination/001.php | 2 +- .../source/installation/upgrade_view_parser.rst | 2 +- .../source/installation/upgrade_view_parser/001.php | 2 +- user_guide_src/source/installation/upgrade_views.rst | 4 ++-- user_guide_src/source/libraries/pagination/002.php | 2 +- user_guide_src/source/libraries/validation/001.php | 6 +++--- user_guide_src/source/outgoing/view_layouts/001.php | 2 +- user_guide_src/source/outgoing/view_parser.rst | 3 ++- user_guide_src/source/outgoing/view_parser/003.php | 2 +- user_guide_src/source/outgoing/view_parser/004.php | 2 +- user_guide_src/source/outgoing/view_parser/005.php | 2 +- user_guide_src/source/outgoing/view_parser/006.php | 2 +- user_guide_src/source/outgoing/view_parser/007.php | 2 +- user_guide_src/source/outgoing/view_parser/008.php | 2 +- user_guide_src/source/outgoing/view_parser/009.php | 2 +- user_guide_src/source/outgoing/view_parser/010.php | 6 ++++-- user_guide_src/source/outgoing/view_parser/018.php | 3 ++- user_guide_src/source/outgoing/view_parser/019.php | 3 ++- user_guide_src/source/outgoing/view_parser/020.php | 3 ++- user_guide_src/source/outgoing/view_parser/021.php | 3 ++- user_guide_src/source/outgoing/view_parser/022.php | 2 +- user_guide_src/source/outgoing/view_parser/023.php | 2 +- user_guide_src/source/outgoing/views.rst | 3 --- user_guide_src/source/outgoing/views/001.php | 2 +- user_guide_src/source/outgoing/views/002.php | 2 +- user_guide_src/source/outgoing/views/003.php | 8 ++++---- user_guide_src/source/outgoing/views/004.php | 2 +- user_guide_src/source/outgoing/views/005.php | 2 +- user_guide_src/source/outgoing/views/006.php | 2 +- user_guide_src/source/outgoing/views/007.php | 2 +- user_guide_src/source/outgoing/views/008.php | 2 +- user_guide_src/source/outgoing/views/009.php | 2 +- user_guide_src/source/outgoing/views/010.php | 2 +- user_guide_src/source/outgoing/views/011.php | 2 +- 40 files changed, 59 insertions(+), 56 deletions(-) diff --git a/user_guide_src/source/cli/cli/001.php b/user_guide_src/source/cli/cli/001.php index b407ee50b145..999a5482e4d6 100644 --- a/user_guide_src/source/cli/cli/001.php +++ b/user_guide_src/source/cli/cli/001.php @@ -8,6 +8,6 @@ class Tools extends Controller { public function message($to = 'World') { - echo "Hello {$to}!" . PHP_EOL; + return "Hello {$to}!" . PHP_EOL; } } diff --git a/user_guide_src/source/incoming/controllers/008.php b/user_guide_src/source/incoming/controllers/008.php index 926de1e9fbdf..3aa859567c44 100644 --- a/user_guide_src/source/incoming/controllers/008.php +++ b/user_guide_src/source/incoming/controllers/008.php @@ -6,6 +6,6 @@ class Helloworld extends BaseController { public function index() { - echo 'Hello World!'; + return 'Hello World!'; } } diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php index e43c3e4f2b34..68d4450d4e3a 100644 --- a/user_guide_src/source/incoming/controllers/013.php +++ b/user_guide_src/source/incoming/controllers/013.php @@ -6,11 +6,11 @@ class Helloworld extends BaseController { public function index() { - echo 'Hello World!'; + return 'Hello World!'; } public function comment() { - echo 'I am not flat!'; + return 'I am not flat!'; } } diff --git a/user_guide_src/source/incoming/controllers/014.php b/user_guide_src/source/incoming/controllers/014.php index 319fd8471a7b..da295eb61836 100644 --- a/user_guide_src/source/incoming/controllers/014.php +++ b/user_guide_src/source/incoming/controllers/014.php @@ -6,7 +6,7 @@ class Products extends BaseController { public function shoes($sandals, $id) { - echo $sandals; - echo $id; + return $sandals + . $id; } } diff --git a/user_guide_src/source/installation/upgrade_controllers/001.php b/user_guide_src/source/installation/upgrade_controllers/001.php index 5f292b54d1b8..b90fe63c538f 100644 --- a/user_guide_src/source/installation/upgrade_controllers/001.php +++ b/user_guide_src/source/installation/upgrade_controllers/001.php @@ -6,6 +6,6 @@ class Helloworld extends BaseController { public function index($name) { - echo 'Hello ' . esc($name) . '!'; + return 'Hello ' . esc($name) . '!'; } } diff --git a/user_guide_src/source/installation/upgrade_file_upload/001.php b/user_guide_src/source/installation/upgrade_file_upload/001.php index 6a4e6c88e250..a8b727c29745 100644 --- a/user_guide_src/source/installation/upgrade_file_upload/001.php +++ b/user_guide_src/source/installation/upgrade_file_upload/001.php @@ -6,7 +6,7 @@ class Upload extends BaseController { public function index() { - echo view('upload_form', ['error' => ' ']); + return view('upload_form', ['error' => ' ']); } public function do_upload() @@ -20,11 +20,10 @@ public function do_upload() $file = $this->request->getFile('userfile'); if (! $path = $file->store()) { - echo view('upload_form', ['error' => 'upload failed']); - } else { - $data = ['upload_file_path' => $path]; - - echo view('upload_success', $data); + return view('upload_form', ['error' => 'upload failed']); } + $data = ['upload_file_path' => $path]; + + return view('upload_success', $data); } } diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/001.php index fa1b373a5fc6..62710360fca9 100644 --- a/user_guide_src/source/installation/upgrade_pagination/001.php +++ b/user_guide_src/source/installation/upgrade_pagination/001.php @@ -7,4 +7,4 @@ 'pager' => $model->pager, ]; -echo view('users/index', $data); +return view('users/index', $data); diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst index 55e86fb357a4..c58aeb8dd491 100644 --- a/user_guide_src/source/installation/upgrade_view_parser.rst +++ b/user_guide_src/source/installation/upgrade_view_parser.rst @@ -19,7 +19,7 @@ What has been changed Upgrade Guide ============= 1. Wherever you use the View Parser Library replace ``$this->load->library('parser');`` with ``$parser = service('parser');``. -2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``echo $parser->setData($data)->render('blog_template');``. +2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``return $parser->setData($data)->render('blog_template');``. Code Example ============ diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/001.php index 27dc410b1708..9acf5e9449d8 100644 --- a/user_guide_src/source/installation/upgrade_view_parser/001.php +++ b/user_guide_src/source/installation/upgrade_view_parser/001.php @@ -7,4 +7,4 @@ 'blog_heading' => 'My Blog Heading', ]; -echo $parser->setData($data)->render('blog_template'); +return $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst index 8509705c76dc..29dcace6ee62 100644 --- a/user_guide_src/source/installation/upgrade_views.rst +++ b/user_guide_src/source/installation/upgrade_views.rst @@ -15,7 +15,7 @@ What has been changed ===================== - Your views look much like before, but they are invoked differently ... instead of CI3's - ``$this->load->view(x);``, you can use ``echo view(x);``. + ``$this->load->view(x);``, you can use ``return view(x);``. - CI4 supports *View Cells* to build your response in pieces, and *View Layouts* for page layout. - The template parser is still there, and substantially enhanced. @@ -24,7 +24,7 @@ Upgrade Guide 1. First, move all views to the folder **app/Views** 2. Change the loading syntax of views in every script where you load views: - - from ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');`` + - from ``$this->load->view('directory_name/file_name')`` to ``return view('directory_name/file_name');`` - from ``$content = $this->load->view('file', $data, TRUE);`` to ``$content = view('file', $data);`` 3. (optional) You can change the echo syntax in views from ```` to ```` diff --git a/user_guide_src/source/libraries/pagination/002.php b/user_guide_src/source/libraries/pagination/002.php index baaa8471111f..c8cd31ebec5c 100644 --- a/user_guide_src/source/libraries/pagination/002.php +++ b/user_guide_src/source/libraries/pagination/002.php @@ -15,6 +15,6 @@ public function index() 'pager' => $model->pager, ]; - echo view('users/index', $data); + return view('users/index', $data); } } diff --git a/user_guide_src/source/libraries/validation/001.php b/user_guide_src/source/libraries/validation/001.php index e52362c46cea..41d51f1b8a25 100644 --- a/user_guide_src/source/libraries/validation/001.php +++ b/user_guide_src/source/libraries/validation/001.php @@ -11,11 +11,11 @@ public function index() helper(['form', 'url']); if (! $this->validate([])) { - echo view('Signup', [ + return view('Signup', [ 'validation' => $this->validator, ]); - } else { - echo view('Success'); } + + return view('Success'); } } diff --git a/user_guide_src/source/outgoing/view_layouts/001.php b/user_guide_src/source/outgoing/view_layouts/001.php index 2eed4c4f53dc..f6105365fa47 100644 --- a/user_guide_src/source/outgoing/view_layouts/001.php +++ b/user_guide_src/source/outgoing/view_layouts/001.php @@ -6,6 +6,6 @@ class MyController extends BaseController { public function index() { - echo view('some_view'); + return view('some_view'); } } diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 961d8ea96c31..c0705e7fa257 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -550,7 +550,8 @@ An example with the iteration controlled in the view:: ['title' => 'Second Link', 'link' => '/second'], ] ]; - echo $parser->setData($data)->renderString($template); + + return $parser->setData($data)->renderString($template); Result:: diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php index da4ef088f6bd..90f3c88273fc 100644 --- a/user_guide_src/source/outgoing/view_parser/003.php +++ b/user_guide_src/source/outgoing/view_parser/003.php @@ -5,4 +5,4 @@ 'blog_heading' => 'My Blog Heading', ]; -echo $parser->setData($data)->render('blog_template'); +return $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/004.php b/user_guide_src/source/outgoing/view_parser/004.php index 70862b585adc..643f541a5b3e 100644 --- a/user_guide_src/source/outgoing/view_parser/004.php +++ b/user_guide_src/source/outgoing/view_parser/004.php @@ -1,6 +1,6 @@ render('blog_template', [ +return $parser->render('blog_template', [ 'cache' => HOUR, 'cache_name' => 'something_unique', ]); diff --git a/user_guide_src/source/outgoing/view_parser/005.php b/user_guide_src/source/outgoing/view_parser/005.php index e77c54268648..e85e49db45a2 100644 --- a/user_guide_src/source/outgoing/view_parser/005.php +++ b/user_guide_src/source/outgoing/view_parser/005.php @@ -3,5 +3,5 @@ $template = '{blog_title}'; $data = ['blog_title' => 'My ramblings']; -echo $parser->setData($data)->renderString($template); +return $parser->setData($data)->renderString($template); // Result: My ramblings diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php index dfde61eec728..40d379aec2ea 100644 --- a/user_guide_src/source/outgoing/view_parser/006.php +++ b/user_guide_src/source/outgoing/view_parser/006.php @@ -12,4 +12,4 @@ ], ]; -echo $parser->setData($data)->render('blog_template'); +return $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php index b3ca937f711f..5128ed3cbe4a 100644 --- a/user_guide_src/source/outgoing/view_parser/007.php +++ b/user_guide_src/source/outgoing/view_parser/007.php @@ -8,4 +8,4 @@ 'blog_entries' => $query->getResultArray(), ]; -echo $parser->setData($data)->render('blog_template'); +return $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php index 4b0a6215830e..8cac9bbbaa9d 100644 --- a/user_guide_src/source/outgoing/view_parser/008.php +++ b/user_guide_src/source/outgoing/view_parser/008.php @@ -9,4 +9,4 @@ ], ]; -echo $parser->setData($data)->render('blog_template'); +return $parser->setData($data)->render('blog_template'); diff --git a/user_guide_src/source/outgoing/view_parser/009.php b/user_guide_src/source/outgoing/view_parser/009.php index 6b112fdd6829..6f4b96e82274 100644 --- a/user_guide_src/source/outgoing/view_parser/009.php +++ b/user_guide_src/source/outgoing/view_parser/009.php @@ -7,5 +7,5 @@ 'location' => ['city' => 'Red City', 'planet' => 'Mars'], ]; -echo $parser->setData($data)->renderString($template); +return $parser->setData($data)->renderString($template); // Result: George lives in Red City on Mars. diff --git a/user_guide_src/source/outgoing/view_parser/010.php b/user_guide_src/source/outgoing/view_parser/010.php index 7fcd5bafbfec..4eb11fd6d908 100644 --- a/user_guide_src/source/outgoing/view_parser/010.php +++ b/user_guide_src/source/outgoing/view_parser/010.php @@ -7,8 +7,10 @@ 'location' => ['city' => 'Red City', 'planet' => 'Mars'], ]; -echo $parser->setData($data)->renderString($template, ['cascadeData' => false]); +return $parser->setData($data)->renderString($template, ['cascadeData' => false]); // Result: {name} lives in Red City on Mars. -echo $parser->setData($data)->renderString($template, ['cascadeData' => true]); +// or + +return $parser->setData($data)->renderString($template, ['cascadeData' => true]); // Result: George lives in Red City on Mars. diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php index 0bb60828d691..5a88dd651c25 100644 --- a/user_guide_src/source/outgoing/view_parser/018.php +++ b/user_guide_src/source/outgoing/view_parser/018.php @@ -6,5 +6,6 @@ 'firstname' => 'John', 'lastname' => 'Doe', ]; -echo $parser->setData($data)->renderString($template); + +return $parser->setData($data)->renderString($template); // Result: Hello, John Doe diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php index a3cb80300299..5f465be2296b 100644 --- a/user_guide_src/source/outgoing/view_parser/019.php +++ b/user_guide_src/source/outgoing/view_parser/019.php @@ -6,5 +6,6 @@ 'firstname' => 'John', 'lastname' => 'Doe', ]; -echo $parser->setData($data)->renderString($template); + +return $parser->setData($data)->renderString($template); // Result: Hello, John {initials} Doe diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php index 62256192019d..fd072cbc0e5c 100644 --- a/user_guide_src/source/outgoing/view_parser/020.php +++ b/user_guide_src/source/outgoing/view_parser/020.php @@ -10,5 +10,6 @@ ['degree' => 'PhD'], ], ]; -echo $parser->setData($data)->renderString($template); + +return $parser->setData($data)->renderString($template); // Result: Hello, John Doe (Mr{degree} {/degrees}) diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php index 977b8b958140..60fbb625da79 100644 --- a/user_guide_src/source/outgoing/view_parser/021.php +++ b/user_guide_src/source/outgoing/view_parser/021.php @@ -15,4 +15,5 @@ $data = [ 'menuitems' => $temp, ]; -echo $parser->setData($data)->renderString($template2); + +return $parser->setData($data)->renderString($template2); diff --git a/user_guide_src/source/outgoing/view_parser/022.php b/user_guide_src/source/outgoing/view_parser/022.php index 022450bb6fd6..1bdb256d92f1 100644 --- a/user_guide_src/source/outgoing/view_parser/022.php +++ b/user_guide_src/source/outgoing/view_parser/022.php @@ -1,3 +1,3 @@ render('myview'); +return $parser->render('myview'); diff --git a/user_guide_src/source/outgoing/view_parser/023.php b/user_guide_src/source/outgoing/view_parser/023.php index 022450bb6fd6..1bdb256d92f1 100644 --- a/user_guide_src/source/outgoing/view_parser/023.php +++ b/user_guide_src/source/outgoing/view_parser/023.php @@ -1,3 +1,3 @@ render('myview'); +return $parser->render('myview'); diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 55da9ed98a22..56f736f23545 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -51,9 +51,6 @@ If you visit your site using the URL you did earlier you should see your new vie example.com/index.php/blog/ -.. note:: While all of the examples show echo the view directly, you can also return the output from the view, instead, - and it will be appended to any captured output. - Loading Multiple Views ====================== diff --git a/user_guide_src/source/outgoing/views/001.php b/user_guide_src/source/outgoing/views/001.php index 90c817235bf5..c1b1ff23a6dd 100644 --- a/user_guide_src/source/outgoing/views/001.php +++ b/user_guide_src/source/outgoing/views/001.php @@ -1,3 +1,3 @@ 'Your title', ]; - echo view('header'); - echo view('menu'); - echo view('content', $data); - echo view('footer'); + return view('header') + . view('menu') + . view('content', $data) + . view('footer'); } } diff --git a/user_guide_src/source/outgoing/views/004.php b/user_guide_src/source/outgoing/views/004.php index d77e328657f3..7c665c263391 100644 --- a/user_guide_src/source/outgoing/views/004.php +++ b/user_guide_src/source/outgoing/views/004.php @@ -1,3 +1,3 @@ 60]); +return view('file_name', $data, ['cache' => 60]); diff --git a/user_guide_src/source/outgoing/views/007.php b/user_guide_src/source/outgoing/views/007.php index b1d22eb55260..1b020abbc5a5 100644 --- a/user_guide_src/source/outgoing/views/007.php +++ b/user_guide_src/source/outgoing/views/007.php @@ -1,4 +1,4 @@ 60, 'cache_name' => 'my_cached_view']); +return view('file_name', $data, ['cache' => 60, 'cache_name' => 'my_cached_view']); diff --git a/user_guide_src/source/outgoing/views/008.php b/user_guide_src/source/outgoing/views/008.php index c9b2ab2f5bbd..8f3218c7029b 100644 --- a/user_guide_src/source/outgoing/views/008.php +++ b/user_guide_src/source/outgoing/views/008.php @@ -6,4 +6,4 @@ 'message' => 'My Message', ]; -echo view('blog_view', $data); +return view('blog_view', $data); diff --git a/user_guide_src/source/outgoing/views/009.php b/user_guide_src/source/outgoing/views/009.php index 61963a40bbb2..008d1cf85d26 100644 --- a/user_guide_src/source/outgoing/views/009.php +++ b/user_guide_src/source/outgoing/views/009.php @@ -11,6 +11,6 @@ public function index() $data['title'] = 'My Real Title'; $data['heading'] = 'My Real Heading'; - echo view('blog_view', $data); + return view('blog_view', $data); } } diff --git a/user_guide_src/source/outgoing/views/010.php b/user_guide_src/source/outgoing/views/010.php index c7dda333df20..189b5dc9f190 100644 --- a/user_guide_src/source/outgoing/views/010.php +++ b/user_guide_src/source/outgoing/views/010.php @@ -6,4 +6,4 @@ 'message' => 'My Message', ]; -echo view('blog_view', $data, ['saveData' => true]); +return view('blog_view', $data, ['saveData' => true]); diff --git a/user_guide_src/source/outgoing/views/011.php b/user_guide_src/source/outgoing/views/011.php index e3ddaeba2075..bb1a5fc21725 100644 --- a/user_guide_src/source/outgoing/views/011.php +++ b/user_guide_src/source/outgoing/views/011.php @@ -14,6 +14,6 @@ public function index() 'heading' => 'My Real Heading', ]; - echo view('blog_view', $data); + return view('blog_view', $data); } } From 76beb9d37b5f78ebcdc000ba00c9444a09cea72b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 09:55:59 +0900 Subject: [PATCH 0067/8282] docs: fix header level --- user_guide_src/source/concepts/services.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index 84860e65f5c3..ea9b9712fd39 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -40,7 +40,7 @@ error-resistant. .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method. Convenience Functions ---------------------- +===================== Two functions have been provided for getting a service. These functions are always available. @@ -110,7 +110,7 @@ within the class, and, if not, creates a new one. All of the factory methods pro .. literalinclude:: services/010.php Service Discovery ------------------ +================= CodeIgniter can automatically discover any Config\\Services.php files you may have created within any defined namespaces. This allows simple use of any module Services files. In order for custom Services files to be discovered, they must From 1944a69dad76ca7bfc925640ae664fcef396834f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 09:56:57 +0900 Subject: [PATCH 0068/8282] docs: use full classname in sample code Relative classname might not work. --- user_guide_src/source/concepts/services/012.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/services/012.php b/user_guide_src/source/concepts/services/012.php index cc4b63b4e20c..bd3c89f971ec 100644 --- a/user_guide_src/source/concepts/services/012.php +++ b/user_guide_src/source/concepts/services/012.php @@ -1,3 +1,3 @@ Date: Mon, 4 Apr 2022 09:58:24 +0900 Subject: [PATCH 0069/8282] docs: add / at the end of the path The default value ends with /. --- user_guide_src/source/concepts/services/009.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/services/009.php b/user_guide_src/source/concepts/services/009.php index 1bdf73954e16..78e4d7c74caf 100644 --- a/user_guide_src/source/concepts/services/009.php +++ b/user_guide_src/source/concepts/services/009.php @@ -1,3 +1,3 @@ Date: Mon, 4 Apr 2022 10:00:13 +0900 Subject: [PATCH 0070/8282] docs: fix text decoration, etc. --- user_guide_src/source/concepts/services.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index ea9b9712fd39..b5678c024bc8 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -75,7 +75,7 @@ create a new class that implements the ``RouterCollectionInterface``: .. literalinclude:: services/006.php -Finally, modify **/app/Config/Services.php** to create a new instance of ``MyRouter`` +Finally, modify **app/Config/Services.php** to create a new instance of ``MyRouter`` instead of ``CodeIgniter\Router\RouterCollection``: .. literalinclude:: services/007.php @@ -87,7 +87,7 @@ In some instances, you will want the option to pass a setting to the class durin Since the services file is a very simple class, it is easy to make this work. A good example is the ``renderer`` service. By default, we want this class to be able -to find the views at ``APPPATH.views/``. We want the developer to have the option of +to find the views at ``APPPATH . views/``. We want the developer to have the option of changing that path, though, if their needs require it. So the class accepts the ``$viewPath`` as a constructor parameter. The service method looks like this: @@ -112,19 +112,19 @@ within the class, and, if not, creates a new one. All of the factory methods pro Service Discovery ================= -CodeIgniter can automatically discover any Config\\Services.php files you may have created within any defined namespaces. +CodeIgniter can automatically discover any **Config/Services.php** files you may have created within any defined namespaces. This allows simple use of any module Services files. In order for custom Services files to be discovered, they must meet these requirements: -- Its namespace must be defined in ``Config\Autoload.php`` -- Inside the namespace, the file must be found at ``Config\Services.php`` +- Its namespace must be defined in **app/Config/Autoload.php** +- Inside the namespace, the file must be found at **Config/Services.php** - It must extend ``CodeIgniter\Config\BaseService`` A small example should clarify this. -Imagine that you've created a new directory, ``Blog`` in your root directory. This will hold a **blog module** with controllers, +Imagine that you've created a new directory, **Blog** in your project root directory. This will hold a **Blog module** with controllers, models, etc, and you'd like to make some of the classes available as a service. The first step is to create a new file: -``Blog\Config\Services.php``. The skeleton of the file should be: +**Blog/Config/Services.php**. The skeleton of the file should be: .. literalinclude:: services/011.php From 31720766b8049ae7dee5471911334338fc81f7d5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 10:43:28 +0900 Subject: [PATCH 0071/8282] docs: add headings --- user_guide_src/source/concepts/services.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index b5678c024bc8..3539c16c7420 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -44,6 +44,9 @@ Convenience Functions Two functions have been provided for getting a service. These functions are always available. +service() +--------- + The first is ``service()`` which returns a new instance of the requested service. The only required parameter is the service name. This is the same as the method name within the Services file always returns a SHARED instance of the class, so calling the function multiple times should @@ -55,6 +58,9 @@ If the creation method requires additional parameters, they can be passed after .. literalinclude:: services/004.php +single_service() +---------------- + The second function, ``single_service()`` works just like ``service()`` but returns a new instance of the class: From f00e952e346b47d827ecab149b70daf4b3e03e45 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 10:52:07 +0900 Subject: [PATCH 0072/8282] docs: add sample code --- user_guide_src/source/concepts/services/003.php | 3 +++ user_guide_src/source/concepts/services/004.php | 3 +++ user_guide_src/source/concepts/services/005.php | 3 +++ 3 files changed, 9 insertions(+) diff --git a/user_guide_src/source/concepts/services/003.php b/user_guide_src/source/concepts/services/003.php index ebbd1d89c30d..a13e8ebf1696 100644 --- a/user_guide_src/source/concepts/services/003.php +++ b/user_guide_src/source/concepts/services/003.php @@ -1,3 +1,6 @@ Date: Mon, 4 Apr 2022 11:08:03 +0900 Subject: [PATCH 0073/8282] docs: add What is Services? and Why use Services? --- user_guide_src/source/concepts/services.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index 3539c16c7420..b5747e4a913a 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -9,10 +9,19 @@ Services Introduction ============ +What is Services? +----------------- + +The **Services** in CodeIgniter 4 provide the functionality to create and share new class instances. +It is implemented as the ``Config\Services`` class. + All of the core classes within CodeIgniter are provided as "services". This simply means that, instead of hard-coding a class name to load, the classes to call are defined within a very simple configuration file. This file acts as a type of factory to create new instances of the required class. +Why use Services? +----------------- + A quick example will probably make things clearer, so imagine that you need to pull in an instance of the Timer class. The simplest method would simply be to create a new instance of that class: From 11e97ad12b8cd3c0181c90d1d9682d8b35f87b25 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 11:10:44 +0900 Subject: [PATCH 0074/8282] docs: fix heading marks --- user_guide_src/source/concepts/services.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index b5747e4a913a..2ede82c668ac 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -7,10 +7,10 @@ Services :depth: 2 Introduction -============ +************ What is Services? ------------------ +================= The **Services** in CodeIgniter 4 provide the functionality to create and share new class instances. It is implemented as the ``Config\Services`` class. @@ -20,7 +20,7 @@ of hard-coding a class name to load, the classes to call are defined within a ve configuration file. This file acts as a type of factory to create new instances of the required class. Why use Services? ------------------ +================= A quick example will probably make things clearer, so imagine that you need to pull in an instance of the Timer class. The simplest method would simply be to create a new instance of that class: @@ -49,12 +49,12 @@ error-resistant. .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method. Convenience Functions -===================== +********************* Two functions have been provided for getting a service. These functions are always available. service() ---------- +========= The first is ``service()`` which returns a new instance of the requested service. The only required parameter is the service name. This is the same as the method name within the Services @@ -68,7 +68,7 @@ If the creation method requires additional parameters, they can be passed after .. literalinclude:: services/004.php single_service() ----------------- +================ The second function, ``single_service()`` works just like ``service()`` but returns a new instance of the class: @@ -76,7 +76,7 @@ the class: .. literalinclude:: services/005.php Defining Services -================= +***************** To make services work well, you have to be able to rely on each class having a constant API, or `interface `_, to use. Almost all of @@ -96,7 +96,7 @@ instead of ``CodeIgniter\Router\RouterCollection``: .. literalinclude:: services/007.php Allowing Parameters -------------------- +=================== In some instances, you will want the option to pass a setting to the class during instantiation. Since the services file is a very simple class, it is easy to make this work. @@ -114,7 +114,7 @@ the path it uses: .. literalinclude:: services/009.php Shared Classes ------------------ +============== There are occasions where you need to require that only a single instance of a service is created. This is easily handled with the ``getSharedInstance()`` method that is called from within the @@ -125,7 +125,7 @@ within the class, and, if not, creates a new one. All of the factory methods pro .. literalinclude:: services/010.php Service Discovery -================= +***************** CodeIgniter can automatically discover any **Config/Services.php** files you may have created within any defined namespaces. This allows simple use of any module Services files. In order for custom Services files to be discovered, they must From 5fef49fe2ed5cf444e8d2c9dcb6ee0b2391a1db4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 11:26:26 +0900 Subject: [PATCH 0075/8282] docs: add How to Get a Service --- user_guide_src/source/concepts/services.rst | 19 ++++++++++++++++--- .../source/concepts/services/013.php | 3 +++ .../source/concepts/services/014.php | 3 +++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 user_guide_src/source/concepts/services/013.php create mode 100644 user_guide_src/source/concepts/services/014.php diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index 2ede82c668ac..b69a4e4c4f85 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -48,13 +48,26 @@ error-resistant. .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method. +How to Get a Service +******************** + +As many CodeIgniter classes are provided as services, you can get them like the following: + +.. literalinclude:: services/013.php + +The ``$typography`` is an instance of the Typography class, and if you call ``\Config\Services::typography()`` again, you will get the exactly same instance. + +If you want to get a new instance of the Typography class, you need to pass ``false`` to the argument ``$getShared``: + +.. literalinclude:: services/014.php + Convenience Functions -********************* +===================== Two functions have been provided for getting a service. These functions are always available. service() -========= +--------- The first is ``service()`` which returns a new instance of the requested service. The only required parameter is the service name. This is the same as the method name within the Services @@ -68,7 +81,7 @@ If the creation method requires additional parameters, they can be passed after .. literalinclude:: services/004.php single_service() -================ +---------------- The second function, ``single_service()`` works just like ``service()`` but returns a new instance of the class: diff --git a/user_guide_src/source/concepts/services/013.php b/user_guide_src/source/concepts/services/013.php new file mode 100644 index 000000000000..0c82ed0e95fa --- /dev/null +++ b/user_guide_src/source/concepts/services/013.php @@ -0,0 +1,3 @@ + Date: Mon, 4 Apr 2022 12:36:06 +0900 Subject: [PATCH 0076/8282] docs: add Convenience Functions --- user_guide_src/source/concepts/factories.rst | 19 +++++++++++++++++++ .../source/concepts/factories/008.php | 6 ++++++ .../source/concepts/factories/009.php | 6 ++++++ 3 files changed, 31 insertions(+) create mode 100644 user_guide_src/source/concepts/factories/008.php create mode 100644 user_guide_src/source/concepts/factories/009.php diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 2ddab73f2216..05dd7559da03 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -35,6 +35,25 @@ you get back the instance as before: .. literalinclude:: factories/003.php +Convenience Functions +===================== + +Two functions for short cut of the Factories have been provided. These functions are always available. + +config() +-------- + +The first is ``config()`` which returns a new instance of a Config class. The only required parameter is the class name: + +.. literalinclude:: factories/008.php + +model() +-------- + +The second function, ``model()`` returns a new instance of a Model class. The only required parameter is the class name: + +.. literalinclude:: factories/009.php + Factory Parameters ================== diff --git a/user_guide_src/source/concepts/factories/008.php b/user_guide_src/source/concepts/factories/008.php new file mode 100644 index 000000000000..866daa36acb2 --- /dev/null +++ b/user_guide_src/source/concepts/factories/008.php @@ -0,0 +1,6 @@ + Date: Mon, 4 Apr 2022 12:37:48 +0900 Subject: [PATCH 0077/8282] docs: add What is Factories? --- user_guide_src/source/concepts/factories.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 05dd7559da03..f04317174273 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -9,8 +9,13 @@ Factories Introduction ============ -Like ``Services``, ``Factories`` are an extension of autoloading that helps keep your code -concise yet optimal, without having to pass around object instances between classes. At its +What is Factories? +------------------ + +Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code +concise yet optimal, without having to pass around object instances between classes. + +At its simplest, Factories provide a common way to create a class instance and access it from anywhere. This is a great way to reuse object states and reduce memory load from keeping multiple instances loaded across your app. From c0884be3ff9b983318a2f9262cc3828f860f69b4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 13:44:20 +0900 Subject: [PATCH 0078/8282] docs: add explanation about Differences from Services and preferApp behavior --- user_guide_src/source/concepts/factories.rst | 46 +++++++++++++++---- .../source/concepts/factories/002.php | 2 +- .../source/concepts/factories/003.php | 2 +- .../source/concepts/factories/010.php | 3 ++ 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 user_guide_src/source/concepts/factories/010.php diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index f04317174273..2e23e448a8f9 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -20,14 +20,32 @@ simplest, Factories provide a common way to create a class instance and access i anywhere. This is a great way to reuse object states and reduce memory load from keeping multiple instances loaded across your app. -Anything can be loaded by Factories, but the best examples are those classes that are used +Any class can be loaded by Factories, but the best examples are those classes that are used to work on or transmit common data. The framework itself uses Factories internally, e.g., to make sure the correct configuration is loaded when using the ``Config`` class. -Take a look at ``Models`` as an example. You can access the Factory specific to ``Models`` -by using the magic static method of the Factories class, ``Factories::models()``. Because of -the common path structure for namespaces and folders, Factories know that the model files -and classes are found within **Models**, so you can request a model by its shorthand base name: +Differences from Services +------------------------- + +Factories require a concrete class name to instantiate, and do not have code to create instances. + +So Factories are not good for creating complex instance that needs many dependencies, +and cannot change the class of the instance to be returned. + +On the other hand, Services have code to create instances, so it can create a complex instance +that needs other services or class instances. When you get a service, Services require a service name, +not a class name, so the returned instance can be changed without changing the client code. + +Example +------- + +Take a look at **Models** as an example. You can access the Factory specific to Models +by using the magic static method of the Factories class, ``Factories::models()``. + +By default, Factories first searches in the ``App`` namespace for the path corresponding to the magic static method name. +``Factories::models()`` searches the path **Models/**. + +In the following code, if you have ``App\Models\UserModel``, the instance will be returned: .. literalinclude:: factories/001.php @@ -35,7 +53,17 @@ Or you could also request a specific class: .. literalinclude:: factories/002.php -Next time you ask for the same class anywhere in your code, ``Factories`` will be sure +If you have only ``Blog\Models\UserModel``, the instance will be returned. +But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, +The instance of ``App\Models\UserModel`` will be returned. + +If you want to get ``Blog\Models\UserModel``, you need the option ``preferApp``: + +.. literalinclude:: factories/010.php + +See :ref:`factories-options` for the details. + +Next time you ask for the same class anywhere in your code, Factories will be sure you get back the instance as before: .. literalinclude:: factories/003.php @@ -112,13 +140,13 @@ Configurations To set default component options, create a new Config files at **app/Config/Factory.php** that supplies options as an array property that matches the name of the component. For example, -if you wanted to ensure that all Filters used by your app were valid framework instances, -your **Factory.php** file might look like this: +if you wanted to ensure that all **Filters** used by your app were valid framework instances, +your **app/Config/Factory.php** file might look like this: .. literalinclude:: factories/005.php This would prevent conflict of an unrelated third-party module which happened to have an -unrelated "Filters" path in its namespace. +unrelated ``Filters`` path in its namespace. setOptions Method ----------------- diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php index cbc19d8b2730..6a56bbe7a374 100644 --- a/user_guide_src/source/concepts/factories/002.php +++ b/user_guide_src/source/concepts/factories/002.php @@ -1,3 +1,3 @@ false]); From 221d484dd012db99371b0d7819bded4dc043bccc Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 09:23:08 +0900 Subject: [PATCH 0079/8282] docs: fix Parser saveData description The default value for $saveData is null, and Config\View::$saveData (true by default) will be set. --- user_guide_src/source/outgoing/view_parser.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index c0705e7fa257..3cefd845de95 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -106,7 +106,7 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods. - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath; ignored for renderString() - ``saveData`` - true if the view data parameters should be retained for subsequent calls; - default is **false** + default is **true** - ``cascadeData`` - true if pseudo-variable settings should be passed on to nested substitutions; default is **true** @@ -578,7 +578,7 @@ Class Reference .. php:class:: CodeIgniter\\View\\Parser - .. php:method:: render($view[, $options[, $saveData = false]]) + .. php:method:: render($view[, $options[, $saveData]]) :param string $view: File name of the view source :param array $options: Array of options, as key/value pairs @@ -600,7 +600,7 @@ Class Reference Any conditional substitutions are performed first, then remaining substitutions are performed for each data pair. - .. php:method:: renderString($template[, $options[, $saveData = false]]) + .. php:method:: renderString($template[, $options[, $saveData]]) :param string $template: View source provided as a string :param array $options: Array of options, as key/value pairs From b95708ed0600e4eddff4dd849869594931930479 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 09:28:30 +0900 Subject: [PATCH 0080/8282] docs: fix View saveData description The default is true. --- user_guide_src/source/outgoing/views.rst | 17 +++++++++++------ user_guide_src/source/outgoing/views/010.php | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 56f736f23545..903f1fef4727 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -123,15 +123,20 @@ Now open your view file and change the text to variables that correspond to the Then load the page at the URL you've been using and you should see the variables replaced. -The data passed in is only available during one call to `view`. If you call the function multiple times -in a single request, you will have to pass the desired data to each view. This keeps any data from "bleeding" into -other views, potentially causing issues. If you would prefer the data to persist, you can pass the `saveData` option -into the `$option` array in the third parameter. +The saveData Option +------------------- + +The data passed in is retained for subsequent calls to ``view()``. If you call the function multiple times +in a single request, you will not have to pass the desired data to each ``view()``. + +But this might not keep any data from "bleeding" into +other views, potentially causing issues. If you would prefer to clean the data after one call, you can pass the ``saveData`` option +into the ``$option`` array in the third parameter. .. literalinclude:: views/010.php -Additionally, if you would like the default functionality of the view function to be that it does save the data -between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**. +Additionally, if you would like the default functionality of the view function to be that it does clear the data +between calls, you can set ``$saveData`` to **false** in **app/Config/Views.php**. Creating Loops ============== diff --git a/user_guide_src/source/outgoing/views/010.php b/user_guide_src/source/outgoing/views/010.php index 189b5dc9f190..8411aa134e7b 100644 --- a/user_guide_src/source/outgoing/views/010.php +++ b/user_guide_src/source/outgoing/views/010.php @@ -6,4 +6,4 @@ 'message' => 'My Message', ]; -return view('blog_view', $data, ['saveData' => true]); +return view('blog_view', $data, ['saveData' => false]); From 510810c2b27a1a2adcb9f21d05fbdf057dce4a86 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 09:31:00 +0900 Subject: [PATCH 0081/8282] docs: decorate view() function --- user_guide_src/source/outgoing/views.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 903f1fef4727..3eb80427fc2a 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -101,7 +101,7 @@ along ``cache_name`` and the cache ID you wish to use: Adding Dynamic Data to the View =============================== -Data is passed from the controller to the view by way of an array in the second parameter of the view function. +Data is passed from the controller to the view by way of an array in the second parameter of the ``view()`` function. Here's an example: .. literalinclude:: views/008.php @@ -135,7 +135,7 @@ into the ``$option`` array in the third parameter. .. literalinclude:: views/010.php -Additionally, if you would like the default functionality of the view function to be that it does clear the data +Additionally, if you would like the default functionality of the ``view()`` function to be that it does clear the data between calls, you can set ``$saveData`` to **false** in **app/Config/Views.php**. Creating Loops From 926fc6eeabdbc9553869b7b7fba466a1c15b41b7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Apr 2022 20:25:14 +0900 Subject: [PATCH 0082/8282] fix: Publisher::discover() may loads incorrect classname --- system/Publisher/Publisher.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 5cd392d921a8..01a3c62db657 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -111,9 +111,9 @@ final public static function discover(string $directory = 'Publishers'): array // Loop over each file checking to see if it is a Publisher foreach (array_unique($files) as $file) { - $className = $locator->findQualifiedNameFromPath($file); + $className = $locator->getClassname($file); - if (is_string($className) && class_exists($className) && is_a($className, self::class, true)) { + if ($className !== '' && class_exists($className) && is_a($className, self::class, true)) { self::$discovered[$directory][] = new $className(); } } From 74fb4fb8788bd419016e8bccc53f1825814a721e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 10:41:27 +0900 Subject: [PATCH 0083/8282] refactor: extract withErrors() method --- system/HTTP/RedirectResponse.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php index 54e1ae12f36d..b9cabbba6793 100644 --- a/system/HTTP/RedirectResponse.php +++ b/system/HTTP/RedirectResponse.php @@ -85,18 +85,35 @@ public function back(?int $code = null, string $method = 'auto') public function withInput() { $session = Services::session(); - $session->setFlashdata('_ci_old_input', [ 'get' => $_GET ?? [], 'post' => $_POST ?? [], ]); - // If the validation has any errors, transmit those back - // so they can be displayed when the validation is handled - // within a method different than displaying the form. + // @TODO Remove this in the future. + // See https://github.com/codeigniter4/CodeIgniter4/issues/5839#issuecomment-1086624600 + $this->withErrors(); + + return $this; + } + + /** + * Set validation errors in the session. + * + * If the validation has any errors, transmit those back + * so they can be displayed when the validation is handled + * within a method different than displaying the form. + * + * @TODO Make this method public when removing $this->withErrors() in withInput(). + * + * @return $this + */ + private function withErrors(): self + { $validation = Services::validation(); if ($validation->getErrors()) { + $session = Services::session(); $session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors())); } From e4f1d8817af17b3106e6ea3fbe3a1e57870813c6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 11:10:01 +0900 Subject: [PATCH 0084/8282] fix: validation errors in model are not cleared when running validation again --- phpstan-baseline.neon.dist | 5 ----- system/BaseModel.php | 4 +++- tests/system/Models/ValidationModelTest.php | 23 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 1021eb445899..53d3710b7ea7 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -25,11 +25,6 @@ parameters: count: 1 path: system/Autoloader/Autoloader.php - - - message: "#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:run\\(\\) invoked with 3 parameters, 0\\-2 required\\.$#" - count: 1 - path: system/BaseModel.php - - message: "#^Property Config\\\\Cache\\:\\:\\$backupHandler \\(string\\) in isset\\(\\) is not nullable\\.$#" count: 1 diff --git a/system/BaseModel.php b/system/BaseModel.php index 64753be5b3e3..39bd9ce2cb4c 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -1344,7 +1344,9 @@ public function validate($data): bool return true; } - return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup); + $this->validation->reset()->setRules($rules, $this->validationMessages); + + return $this->validation->run($data, null, $this->DBGroup); } /** diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php index 0d60d36524ac..e7cc4a8d11e5 100644 --- a/tests/system/Models/ValidationModelTest.php +++ b/tests/system/Models/ValidationModelTest.php @@ -55,6 +55,29 @@ public function testValidationBasics(): void $this->assertSame('You forgot to name the baby.', $errors['name']); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5859 + */ + public function testValidationTwice(): void + { + $data = [ + 'name' => null, + 'description' => 'some great marketing stuff', + ]; + + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('You forgot to name the baby.', $errors['name']); + + $data = [ + 'name' => 'some name', + 'description' => 'some great marketing stuff', + ]; + + $this->assertIsInt($this->model->insert($data)); + } + public function testValidationWithSetValidationRule(): void { $data = [ From 8f1ed45f1bb3d2df34665e80767d171bd4cef167 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 11:42:31 +0900 Subject: [PATCH 0085/8282] feat: add $includeDir option to get_filenames() --- system/Helpers/filesystem_helper.php | 23 ++++++++++++------- tests/system/Helpers/FilesystemHelperTest.php | 16 +++++++++++++ .../source/helpers/filesystem_helper.rst | 7 +++--- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php index 89d4d507f961..4918e87e7bf2 100644 --- a/system/Helpers/filesystem_helper.php +++ b/system/Helpers/filesystem_helper.php @@ -194,9 +194,14 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false, * @param string $sourceDir Path to source * @param bool|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path * @param bool $hidden Whether to include hidden files (files beginning with a period) + * @param bool $includeDir Whether to include directories */ - function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array - { + function get_filenames( + string $sourceDir, + ?bool $includePath = false, + bool $hidden = false, + bool $includeDir = true + ): array { $files = []; $sourceDir = realpath($sourceDir) ?: $sourceDir; @@ -212,12 +217,14 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd continue; } - if ($includePath === false) { - $files[] = $basename; - } elseif ($includePath === null) { - $files[] = str_replace($sourceDir, '', $name); - } else { - $files[] = $name; + if ($includeDir || ! $object->isDir()) { + if ($includePath === false) { + $files[] = $basename; + } elseif ($includePath === null) { + $files[] = str_replace($sourceDir, '', $name); + } else { + $files[] = $name; + } } } } catch (Throwable $e) { diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index d20d93481e39..c9f5789a9d4c 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -305,6 +305,22 @@ public function testGetFilenames() $this->assertSame($expected, get_filenames($vfs->url(), false)); } + public function testGetFilenamesWithoutDirectories() + { + $vfs = vfsStream::setup('root', null, $this->structure); + + $filenames = get_filenames($vfs->url(), true, false, false); + + $expected = [ + 'vfs://root/boo/far', + 'vfs://root/boo/faz', + 'vfs://root/foo/bar', + 'vfs://root/foo/baz', + 'vfs://root/simpleFile', + ]; + $this->assertSame($expected, $filenames); + } + public function testGetFilenamesWithHidden() { $this->assertTrue(function_exists('get_filenames')); diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst index 4cb00fb23188..017ee9a82149 100644 --- a/user_guide_src/source/helpers/filesystem_helper.rst +++ b/user_guide_src/source/helpers/filesystem_helper.rst @@ -150,11 +150,12 @@ The following functions are available: .. note:: The files must be writable or owned by the system in order to be deleted. -.. php:function:: get_filenames($source_dir[, $include_path = false]) +.. php:function:: get_filenames($sourceDir[, $includePath = false[, $hidden = false[, $includeDir = true]]]) - :param string $source_dir: Directory path - :param bool|null $include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path + :param string $sourceDir: Directory path + :param bool|null $includePath: Whether to include the path as part of the filename; false for no path, null for the path relative to ``$sourceDir``, true for the full path :param bool $hidden: Whether to include hidden files (files beginning with a period) + :param bool $includeDir: Whether to include directories :returns: An array of file names :rtype: array From 7b442c6a49fb469de6998531433be82cb1ce3345 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 13:00:45 +0900 Subject: [PATCH 0086/8282] docs: fix function reference --- .../source/helpers/filesystem_helper.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst index 4cb00fb23188..e45c7ce31565 100644 --- a/user_guide_src/source/helpers/filesystem_helper.rst +++ b/user_guide_src/source/helpers/filesystem_helper.rst @@ -21,10 +21,10 @@ Available Functions The following functions are available: -.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = false]]) +.. php:function:: directory_map($sourceDir[, $directoryDepth = 0[, $hidden = false]]) - :param string $source_dir: Path to the source directory - :param int $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc) + :param string $sourceDir: Path to the source directory + :param int $directoryDepth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc) :param bool $hidden: Whether to include hidden paths :returns: An array of files :rtype: array @@ -167,10 +167,10 @@ The following functions are available: .. literalinclude:: filesystem_helper/010.php -.. php:function:: get_dir_file_info($source_dir, $top_level_only) +.. php:function:: get_dir_file_info($sourceDir[, $topLevelOnly = true]) - :param string $source_dir: Directory path - :param bool $top_level_only: Whether to look only at the specified directory (excluding sub-directories) + :param string $sourceDir: Directory path + :param bool $topLevelOnly: Whether to look only at the specified directory (excluding sub-directories) :returns: An array containing info on the supplied directory's contents :rtype: array @@ -183,10 +183,10 @@ The following functions are available: .. literalinclude:: filesystem_helper/011.php -.. php:function:: get_file_info($file[, $returned_values = ['name', 'server_path', 'size', 'date']]) +.. php:function:: get_file_info($file[, $returnedValues = ['name', 'server_path', 'size', 'date']]) :param string $file: File path - :param array|string $returned_values: What type of info to return to be passed as array or comma separated string + :param array|string $returnedValues: What type of info to return to be passed as array or comma separated string :returns: An array containing info on the specified file or false on failure :rtype: array @@ -194,8 +194,8 @@ The following functions are available: information attributes for a file. Second parameter allows you to explicitly declare what information you want returned. - Valid ``$returned_values`` options are: `name`, `size`, `date`, `readable`, `writeable`, - `executable` and `fileperms`. + Valid ``$returnedValues`` options are: ``name``, ``size``, ``date``, ``readable``, ``writeable``, + ``executable`` and ``fileperms``. .. php:function:: symbolic_permissions($perms) @@ -230,10 +230,10 @@ The following functions are available: .. literalinclude:: filesystem_helper/014.php -.. php:function:: set_realpath($path[, $check_existence = false]) +.. php:function:: set_realpath($path[, $checkExistence = false]) :param string $path: Path - :param bool $check_existence: Whether to check if the path actually exists + :param bool $checkExistence: Whether to check if the path actually exists :returns: An absolute path :rtype: string From e19872ad2cc39b6f7142c1f024a7e2cd8f4020f6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 16:52:30 +0900 Subject: [PATCH 0087/8282] docs: remove HackerOne link CI4 does not use HackerOne. --- contributing/bug_report.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/contributing/bug_report.md b/contributing/bug_report.md index c564a9a734f4..43767cdd1766 100644 --- a/contributing/bug_report.md +++ b/contributing/bug_report.md @@ -27,15 +27,7 @@ have found a bug, again - please ask on the forums first. ## Security -Did you find a security issue in CodeIgniter? - -Please *don't* disclose it publicly, but e-mail us at -, or report it via our page on -[HackerOne](https://hackerone.com/codeigniter). - -If you've found a critical vulnerability, we'd be happy to credit you in -our -[ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html). +See [SECURITY.md](../SECURITY.md). ## Tips for a Good Issue Report From 70af24e461382a2c895a139f87e3c4960a111ba6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 17:21:12 +0900 Subject: [PATCH 0088/8282] chore: rename php-cs-fixer config files The php-cs-fixer configuration files are all in one place and easy to find. --- .github/workflows/test-coding-standards.yml | 4 ++-- .php-cs-fixer.dist.php | 4 ++-- ...r.php-cs-fixer.dist.php => .php-cs-fixer.no-header.php | 2 +- ....php-cs-fixer.dist.php => .php-cs-fixer.user-guide.php | 2 +- admin/pre-commit | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) rename .no-header.php-cs-fixer.dist.php => .php-cs-fixer.no-header.php (95%) rename .user-guide.php-cs-fixer.dist.php => .php-cs-fixer.user-guide.php (95%) diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index e5b4a2043342..5fa13728b37d 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -52,10 +52,10 @@ jobs: run: composer update --ansi --no-interaction - name: Run lint on `app/`, `admin/`, `public/` - run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.no-header.php-cs-fixer.dist.php --using-cache=no --diff + run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff - name: Run lint on `user_guide_src/source/` - run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.user-guide.php-cs-fixer.dist.php --using-cache=no --diff + run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 7caeaec1035c..02c6549b2c03 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -29,8 +29,8 @@ ->notName('#Foobar.php$#') ->append([ __FILE__, - __DIR__ . '/.no-header.php-cs-fixer.dist.php', - __DIR__ . '/.user-guide.php-cs-fixer.dist.php', + __DIR__ . '/.php-cs-fixer.no-header.php', + __DIR__ . '/.php-cs-fixer.user-guide.php', __DIR__ . '/rector.php', __DIR__ . '/spark', __DIR__ . '/user_guide_src/renumerate.php', diff --git a/.no-header.php-cs-fixer.dist.php b/.php-cs-fixer.no-header.php similarity index 95% rename from .no-header.php-cs-fixer.dist.php rename to .php-cs-fixer.no-header.php index 153ac5bd1328..6c136cd4b164 100644 --- a/.no-header.php-cs-fixer.dist.php +++ b/.php-cs-fixer.no-header.php @@ -33,7 +33,7 @@ $overrides = []; $options = [ - 'cacheFile' => 'build/.no-header.php-cs-fixer.cache', + 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', 'finder' => $finder, 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), 'customRules' => [ diff --git a/.user-guide.php-cs-fixer.dist.php b/.php-cs-fixer.user-guide.php similarity index 95% rename from .user-guide.php-cs-fixer.dist.php rename to .php-cs-fixer.user-guide.php index 900c26ec81e1..8081d73698ca 100644 --- a/.user-guide.php-cs-fixer.dist.php +++ b/.php-cs-fixer.user-guide.php @@ -37,7 +37,7 @@ ]; $options = [ - 'cacheFile' => 'build/.user-guide.php-cs-fixer.cache', + 'cacheFile' => 'build/.php-cs-fixer.user-guide.cache', 'finder' => $finder, 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), 'customRules' => [ diff --git a/admin/pre-commit b/admin/pre-commit index e8fdcff64499..1fa6b15e5984 100644 --- a/admin/pre-commit +++ b/admin/pre-commit @@ -42,9 +42,9 @@ if [ "$FILES" != "" ]; then # Run on whole codebase to skip on unnecessary filtering # Run first on app, admin, public if [ -d /proc/cygdrive ]; then - ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php + ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php else - php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php + php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php fi if [ $? != 0 ]; then @@ -66,9 +66,9 @@ if [ "$FILES" != "" ]; then # Next, run on user_guide_src/source PHP files if [ -d /proc/cygdrive ]; then - ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php + ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php else - php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php + php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php fi if [ $? != 0 ]; then From b71ed71595ff7e0828a6ad97a9e6e0e1082f5df1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 08:50:23 +0900 Subject: [PATCH 0089/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 2e23e448a8f9..ac9f562732b0 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -57,7 +57,7 @@ If you have only ``Blog\Models\UserModel``, the instance will be returned. But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, The instance of ``App\Models\UserModel`` will be returned. -If you want to get ``Blog\Models\UserModel``, you need the option ``preferApp``: +If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``: .. literalinclude:: factories/010.php From b1a77e71cff780d9079beaf3d291bdd715d4e2a9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 08:50:40 +0900 Subject: [PATCH 0090/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index ac9f562732b0..ca1025168367 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -71,7 +71,7 @@ you get back the instance as before: Convenience Functions ===================== -Two functions for short cut of the Factories have been provided. These functions are always available. +Two shortcut functions for Factories have been provided. These functions are always available. config() -------- From 12aa1aaf21e651d93f6c102445e866c7fe849585 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 08:51:14 +0900 Subject: [PATCH 0091/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index ca1025168367..5f34b4a1bb5a 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -140,7 +140,7 @@ Configurations To set default component options, create a new Config files at **app/Config/Factory.php** that supplies options as an array property that matches the name of the component. For example, -if you wanted to ensure that all **Filters** used by your app were valid framework instances, +if you want to ensure that each ``Filter`` used by your app is an actual framework, your **app/Config/Factory.php** file might look like this: .. literalinclude:: factories/005.php From d41fbe26f89ef1d9df9158aaf305ba9b32fca3d1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 08:53:26 +0900 Subject: [PATCH 0092/8282] docs: remove duplicated "unrelated" --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 5f34b4a1bb5a..600a153d1a8c 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -145,7 +145,7 @@ your **app/Config/Factory.php** file might look like this: .. literalinclude:: factories/005.php -This would prevent conflict of an unrelated third-party module which happened to have an +This would prevent conflict of an third-party module which happened to have an unrelated ``Filters`` path in its namespace. setOptions Method From ac6a97d04c7345223427a7243dd11735672d3dba Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 09:05:57 +0900 Subject: [PATCH 0093/8282] docs: add more explanation for filters component --- user_guide_src/source/concepts/factories.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 600a153d1a8c..ff5ea4faf140 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -139,12 +139,17 @@ Configurations -------------- To set default component options, create a new Config files at **app/Config/Factory.php** -that supplies options as an array property that matches the name of the component. For example, -if you want to ensure that each ``Filter`` used by your app is an actual framework, +that supplies options as an array property that matches the name of the component. + +For example, if you want to create **Filters** by Factories, the component name wll be ``filters``. +And if you want to ensure that each filter is an instance of a class which implements CodeIgniter's ``FilterInterface``, your **app/Config/Factory.php** file might look like this: .. literalinclude:: factories/005.php +Now you can create a filter with code like ``Factories::filters('SomeFilter')``, +and the returned instance will surely be a CodeIgniter's filter. + This would prevent conflict of an third-party module which happened to have an unrelated ``Filters`` path in its namespace. From 6214ece43aaf6207bd3007822cf7ac0c3f6cefe8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 09:45:36 +0900 Subject: [PATCH 0094/8282] docs: revise the description to be more accurate The property $component does not exist. --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index ff5ea4faf140..569fbaa7db1e 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -131,7 +131,7 @@ Factories Behavior Options can be applied in one of three ways (listed in ascending priority): -* A configuration class ``Config\Factory`` with a ``$component`` property. +* A configuration class ``Config\Factory`` with a property that matches the name of a component. * The static method ``Factories::setOptions()``. * Passing options directly at call time with a parameter. From ea781ab2351e1b74bfae71884f90cbf58e3eaa72 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 5 Apr 2022 17:58:37 +0900 Subject: [PATCH 0095/8282] chore: update composer scripts --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 8d77bc48cde8..2a0329252a46 100644 --- a/composer.json +++ b/composer.json @@ -62,14 +62,14 @@ "analyze": "phpstan analyse", "test": "phpunit", "cs": [ - "php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php", - "php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php", - "php-cs-fixer fix --verbose --dry-run --diff" + "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php", + "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php", + "php-cs-fixer fix --ansi --verbose --dry-run --diff" ], "cs-fix": [ - "php-cs-fixer fix --verbose --diff --config=.user-guide.php-cs-fixer.dist.php", - "php-cs-fixer fix --verbose --diff --config=.no-header.php-cs-fixer.dist.php", - "php-cs-fixer fix --verbose --diff" + "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.user-guide.php", + "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php", + "php-cs-fixer fix --ansi --verbose --diff" ] }, "scripts-descriptions": { From c01667dbe1eff42313cdf115003cd4a65eef2e5b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:28:08 +0900 Subject: [PATCH 0096/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com> --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 569fbaa7db1e..62d40b3352c9 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -9,7 +9,7 @@ Factories Introduction ============ -What is Factories? +What are Factories? ------------------ Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code From cd2abe85e60626a26cfc5cbcbfc6517ef15515f7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:29:04 +0900 Subject: [PATCH 0097/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com> --- user_guide_src/source/concepts/factories.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 62d40b3352c9..d33c49e2398b 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -27,10 +27,10 @@ make sure the correct configuration is loaded when using the ``Config`` class. Differences from Services ------------------------- -Factories require a concrete class name to instantiate, and do not have code to create instances. +Factories require a concrete class name to instantiate and do not have code to create instances. -So Factories are not good for creating complex instance that needs many dependencies, -and cannot change the class of the instance to be returned. +So, Factories are not good for creating a complex instance that needs many dependencies, +and you cannot change the class of the instance to be returned. On the other hand, Services have code to create instances, so it can create a complex instance that needs other services or class instances. When you get a service, Services require a service name, From 9dd0e02d0feda051865e99383ab775da6937b762 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:29:23 +0900 Subject: [PATCH 0098/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com> --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index d33c49e2398b..138b73c1342e 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -55,7 +55,7 @@ Or you could also request a specific class: If you have only ``Blog\Models\UserModel``, the instance will be returned. But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, -The instance of ``App\Models\UserModel`` will be returned. +the instance of ``App\Models\UserModel`` will be returned. If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``: From 1b1d03c6363bb0db9b0a935440d791fce2f54859 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:31:59 +0900 Subject: [PATCH 0099/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com> --- user_guide_src/source/concepts/services.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index b69a4e4c4f85..632ad10cedf0 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -115,7 +115,7 @@ In some instances, you will want the option to pass a setting to the class durin Since the services file is a very simple class, it is easy to make this work. A good example is the ``renderer`` service. By default, we want this class to be able -to find the views at ``APPPATH . views/``. We want the developer to have the option of +to find the views at ``APPPATH . 'views/'``. We want the developer to have the option of changing that path, though, if their needs require it. So the class accepts the ``$viewPath`` as a constructor parameter. The service method looks like this: From 606518ac686abfe275a40727f747199c8d921e60 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:33:37 +0900 Subject: [PATCH 0100/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com> --- user_guide_src/source/helpers/filesystem_helper.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst index 017ee9a82149..6d7618b9d783 100644 --- a/user_guide_src/source/helpers/filesystem_helper.rst +++ b/user_guide_src/source/helpers/filesystem_helper.rst @@ -155,7 +155,7 @@ The following functions are available: :param string $sourceDir: Directory path :param bool|null $includePath: Whether to include the path as part of the filename; false for no path, null for the path relative to ``$sourceDir``, true for the full path :param bool $hidden: Whether to include hidden files (files beginning with a period) - :param bool $includeDir: Whether to include directories + :param bool $includeDir: Whether to include directories in the array output :returns: An array of file names :rtype: array From 3fe7b8a45a2455a4cb3b2e7a1e2aa47072f883ba Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 17:44:29 +0900 Subject: [PATCH 0101/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.2.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 99f980d6b35e..0ed69ab0760a 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -37,6 +37,7 @@ Enhancements - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore. - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> (): " - Added support for webp files to **app/Config/Mimes.php**. +- Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`. Changes ******* From 9f2d3ced709e1774128b03a9831424d90b26e29f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 6 Apr 2022 20:23:33 +0900 Subject: [PATCH 0102/8282] docs: fix title underline factories.rst:13: WARNING: Title underline too short. --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 138b73c1342e..754f831257e3 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -10,7 +10,7 @@ Introduction ============ What are Factories? ------------------- +------------------- Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code concise yet optimal, without having to pass around object instances between classes. From df954fae54dc76873b6a16e883aac791f9f0a48f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:05:18 +0000 Subject: [PATCH 0103/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.12.19...0.12.20) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8d77bc48cde8..e21ae85ecff3 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpstan/phpstan": "^1.0", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1", - "rector/rector": "0.12.19" + "rector/rector": "0.12.20" }, "suggest": { "ext-fileinfo": "Improves mime type detection for files" From 5ee5304c24cc96df3a2d6c3dcf0ca069454da40c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 7 Apr 2022 08:47:57 +0900 Subject: [PATCH 0104/8282] docs: update `spark migrate:status` output --- user_guide_src/source/dbmgmt/migration.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index cd5787328a96..ff81f4ff0708 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -162,8 +162,13 @@ You can use (refresh) with the following options: Displays a list of all migrations and the date and time they ran, or '--' if they have not been run:: > php spark migrate:status - Filename Migrated On - First_migration.php 2016-04-25 04:44:22 + +----------------------+-------------------+-----------------------+---------+---------------------+-------+ + | Namespace | Version | Filename | Group | Migrated On | Batch | + +----------------------+-------------------+-----------------------+---------+---------------------+-------+ + | App | 2022-04-06-234508 | CreateCiSessionsTable | default | 2022-04-06 18:45:14 | 2 | + | CodeIgniter\Settings | 2021-07-04-041948 | CreateSettingsTable | default | 2022-04-06 01:23:08 | 1 | + | CodeIgniter\Settings | 2021-11-14-143905 | AddContextColumn | default | 2022-04-06 01:23:08 | 1 | + +----------------------+-------------------+-----------------------+---------+---------------------+-------+ You can use (status) with the following options: From 180dca40ece4a328892bbdbf050f5d7394cec947 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 7 Apr 2022 08:48:31 +0900 Subject: [PATCH 0105/8282] docs: update deprecated command --- user_guide_src/source/libraries/sessions.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 59557db92cf8..11ac22f12add 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -569,10 +569,10 @@ You can choose the Database group to use by adding a new line to the .. literalinclude:: sessions/040.php -If you'd rather not do all of this by hand, you can use the ``session:migration`` command +If you'd rather not do all of this by hand, you can use the ``make:migration --session`` command from the cli to generate a migration file for you:: - > php spark session:migration + > php spark make:migration --session > php spark migrate This command will take the **sessionSavePath** and **sessionMatchIP** settings into account From 7b58b7217eb556d2e91edae5f8b5813abfb16f59 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 7 Apr 2022 13:27:54 +0900 Subject: [PATCH 0106/8282] chore: update gitattributes --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitattributes b/.gitattributes index 79c65323dade..de04ad191549 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,17 +14,23 @@ contributing/ export-ignore .editorconfig export-ignore .nojekyll export-ignore export-ignore CODE_OF_CONDUCT.md export-ignore +CONTRIBUTING.md export-ignore PULL_REQUEST_TEMPLATE.md export-ignore stale.yml export-ignore Vagrantfile.dist export-ignore # They don't want our test files +tests/AutoReview/ export-ignore tests/system/ export-ignore utils/ export-ignore +depfile.yaml export-ignore rector.php export-ignore phpunit.xml.dist export-ignore +phpstan-baseline.neon.dist export-ignore phpstan.neon.dist export-ignore .php-cs-fixer.dist.php export-ignore +.php-cs-fixer.no-header.php export-ignore +.php-cs-fixer.user-guide.php export-ignore # The source user guide, either user_guide_src/ export-ignore From 53cdb671b8b4e04b7d4a0752dd3b6046819abb52 Mon Sep 17 00:00:00 2001 From: "Michael R. Krisnadhi" Date: Fri, 8 Apr 2022 16:08:14 +0700 Subject: [PATCH 0107/8282] clarify Models user guide Inform the $useAutoIncrement default value (which is 'true'), so developers would be aware of that option if they don't use auto-incremented INT's on primary keys, especially when triggering an 'afterInsert' event which will eventually cause the $data['id'] value to be 0 instead of the actual primary key (see 'system/Model.php' line 254 : https://github.com/codeigniter4/CodeIgniter4/blob/622d50aa2976b85f7cb1479faec7558cd9ec2341/system/Model.php#L254) --- user_guide_src/source/models/model.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index f55e60656c03..fa354d7c3aff 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -99,7 +99,8 @@ is used with methods like ``find()`` to know what column to match the specified Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false`` then you are responsible for providing primary key value for every record in the table. This -feature may be handy when we want to implement 1:1 relation or use UUIDs for our model. +feature may be handy when we want to implement 1:1 relation or use UUIDs for our model. The +default value is ``true``. .. note:: If you set ``$useAutoIncrement`` to ``false``, then make sure to set your primary key in the database to ``unique``. This way you will make sure that all of Model's features From 3fc0c6b61bd318f73090cf1cc672ba303c7b09b2 Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Fri, 8 Apr 2022 20:34:42 +0700 Subject: [PATCH 0108/8282] add `literalinclude` for curlrequest -> debug --- user_guide_src/source/libraries/curlrequest.rst | 2 +- user_guide_src/source/libraries/curlrequest/034.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 user_guide_src/source/libraries/curlrequest/034.php diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst index 3d0b91b511fb..b77d41e6b088 100644 --- a/user_guide_src/source/libraries/curlrequest.rst +++ b/user_guide_src/source/libraries/curlrequest.rst @@ -219,7 +219,7 @@ script execution. This is done by passing CURLOPT_VERBOSE and echoing the output server via ``spark serve`` you will see the output in the console. Otherwise, the output will be written to the server's error log. - $response->request('GET', 'http://example.com', ['debug' => true]); +.. literalinclude:: curlrequest/034.php You can pass a filename as the value for debug to have the output written to a file: diff --git a/user_guide_src/source/libraries/curlrequest/034.php b/user_guide_src/source/libraries/curlrequest/034.php new file mode 100644 index 000000000000..1560cd589fec --- /dev/null +++ b/user_guide_src/source/libraries/curlrequest/034.php @@ -0,0 +1,3 @@ +request('GET', 'http://example.com', ['debug' => true]); From fc8946faf361a6571beccba1b054fd33ecae581a Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Fri, 8 Apr 2022 20:44:35 +0700 Subject: [PATCH 0109/8282] fix parameters display for API response > `setResponseFormat($format)` method --- user_guide_src/source/outgoing/api_responses.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst index 6d657e6bc765..bdb853563e2b 100644 --- a/user_guide_src/source/outgoing/api_responses.rst +++ b/user_guide_src/source/outgoing/api_responses.rst @@ -60,7 +60,7 @@ Class Reference *************** .. php:method:: setResponseFormat($format) - :param string $format The type of response to return, either ``json`` or ``xml`` + :param string $format: The type of response to return, either ``json`` or ``xml`` This defines the format to be used when formatting arrays in responses. If you provide a ``null`` value for ``$format``, it will be automatically determined through content negotiation. From 5161942e2c0211698ff7242f5df9d8e8aef1e757 Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Fri, 8 Apr 2022 21:07:41 +0700 Subject: [PATCH 0110/8282] fix paths --- user_guide_src/source/general/managing_apps.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst index 0681b1b534e6..fc00dcd06985 100644 --- a/user_guide_src/source/general/managing_apps.rst +++ b/user_guide_src/source/general/managing_apps.rst @@ -25,7 +25,7 @@ your main **app/Config/Paths.php** and set a *full server path* in the You will need to modify two additional files in your project root, so that they can find the **Paths** configuration file: -- **/spark** runs command line apps; the path is specified on or about line 35: +- **/spark** runs command line apps; the path is specified on or about line 49: .. literalinclude:: managing_apps/002.php From 571923915b7b431d055407f51c1201a1979f2da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Apr 2022 15:03:24 +0000 Subject: [PATCH 0111/8282] chore(deps): bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-userguide-latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml index fb453f0c9694..8fc77b9f7698 100644 --- a/.github/workflows/deploy-userguide-latest.yml +++ b/.github/workflows/deploy-userguide-latest.yml @@ -29,7 +29,7 @@ jobs: # Create an artifact of the html output - name: Upload artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: HTML Documentation path: user_guide_src/build/html/ From 022563377e7e995fc7b6845e4a8e026d545ee876 Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Sat, 9 Apr 2022 03:44:19 +0700 Subject: [PATCH 0112/8282] change `$request->` to `$client->` --- user_guide_src/source/libraries/curlrequest/020.php | 2 +- user_guide_src/source/libraries/curlrequest/021.php | 2 +- user_guide_src/source/libraries/curlrequest/022.php | 2 +- user_guide_src/source/libraries/curlrequest/023.php | 2 +- user_guide_src/source/libraries/curlrequest/030.php | 2 +- user_guide_src/source/libraries/curlrequest/031.php | 2 +- user_guide_src/source/libraries/curlrequest/034.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/curlrequest/020.php b/user_guide_src/source/libraries/curlrequest/020.php index 6e0b1e3726a7..14fad31cdea4 100644 --- a/user_guide_src/source/libraries/curlrequest/020.php +++ b/user_guide_src/source/libraries/curlrequest/020.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['connect_timeout' => 0]); +$client->request('GET', 'http://example.com', ['connect_timeout' => 0]); diff --git a/user_guide_src/source/libraries/curlrequest/021.php b/user_guide_src/source/libraries/curlrequest/021.php index 4acf82aa9e0b..051df32e1a37 100644 --- a/user_guide_src/source/libraries/curlrequest/021.php +++ b/user_guide_src/source/libraries/curlrequest/021.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']); +$client->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']); diff --git a/user_guide_src/source/libraries/curlrequest/022.php b/user_guide_src/source/libraries/curlrequest/022.php index 6acbcf0a7784..69b0e4ed8bec 100644 --- a/user_guide_src/source/libraries/curlrequest/022.php +++ b/user_guide_src/source/libraries/curlrequest/022.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']); +$client->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']); diff --git a/user_guide_src/source/libraries/curlrequest/023.php b/user_guide_src/source/libraries/curlrequest/023.php index b6846257ad83..61e6f6df5214 100644 --- a/user_guide_src/source/libraries/curlrequest/023.php +++ b/user_guide_src/source/libraries/curlrequest/023.php @@ -1,4 +1,4 @@ request('GET', 'http://example.com', ['delay' => 2000]); +$client->request('GET', 'http://example.com', ['delay' => 2000]); diff --git a/user_guide_src/source/libraries/curlrequest/030.php b/user_guide_src/source/libraries/curlrequest/030.php index 83bf718e33e4..16c0c6fd6c49 100644 --- a/user_guide_src/source/libraries/curlrequest/030.php +++ b/user_guide_src/source/libraries/curlrequest/030.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['timeout' => 5]); +$client->request('GET', 'http://example.com', ['timeout' => 5]); diff --git a/user_guide_src/source/libraries/curlrequest/031.php b/user_guide_src/source/libraries/curlrequest/031.php index 1709d6d90b9c..8023c84faa39 100644 --- a/user_guide_src/source/libraries/curlrequest/031.php +++ b/user_guide_src/source/libraries/curlrequest/031.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']); +$client->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']); diff --git a/user_guide_src/source/libraries/curlrequest/034.php b/user_guide_src/source/libraries/curlrequest/034.php index 1560cd589fec..9e343aa9d9da 100644 --- a/user_guide_src/source/libraries/curlrequest/034.php +++ b/user_guide_src/source/libraries/curlrequest/034.php @@ -1,3 +1,3 @@ request('GET', 'http://example.com', ['debug' => true]); +$client->request('GET', 'http://example.com', ['debug' => true]); From 830750edd49d9fe5219ff2f581afdfec63e93c56 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 9 Apr 2022 09:04:37 +0900 Subject: [PATCH 0113/8282] feat: throws exception when controller name in routes contains `/` --- system/Language/en/Router.php | 1 + system/Router/Exceptions/RouterException.php | 10 ++++++++++ system/Router/Router.php | 5 +++++ tests/system/Router/RouterTest.php | 12 ++++++++++++ 4 files changed, 28 insertions(+) diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php index 90aaa132b489..7d0b5cc99e25 100644 --- a/system/Language/en/Router.php +++ b/system/Language/en/Router.php @@ -14,4 +14,5 @@ 'invalidParameter' => 'A parameter does not match the expected type.', 'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.', 'invalidDynamicController' => 'A dynamic controller is not allowed for security reasons. Route handler: {0}', + 'invalidControllerName' => 'The namespace delimiter is a backslash (\), not a slash (/). Route handler: {0}', ]; diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php index b50042b3421b..5a510e4716fe 100644 --- a/system/Router/Exceptions/RouterException.php +++ b/system/Router/Exceptions/RouterException.php @@ -68,4 +68,14 @@ public static function forDynamicController(string $handler) { return new static(lang('Router.invalidDynamicController', [$handler])); } + + /** + * Throw when controller name has `/`. + * + * @return RouterException + */ + public static function forInvalidControllerName(string $handler) + { + return new static(lang('Router.invalidControllerName', [$handler])); + } } diff --git a/system/Router/Router.php b/system/Router/Router.php index 42f2eb0c7a42..37c88114172e 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -426,6 +426,11 @@ protected function checkRoutes(string $uri): bool throw RouterException::forDynamicController($handler); } + // Checks `/` in controller name + if (strpos($controller, '/') !== false) { + throw RouterException::forInvalidControllerName($handler); + } + if (strpos($routeKey, '/') !== false) { $replacekey = str_replace('/(.*)', '', $routeKey); $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri); diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index d3ca04422c41..38eb9b7ba48c 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -61,6 +61,7 @@ protected function setUp(): void 'closure/(:num)/(:alpha)' => static fn ($num, $str) => $num . '-' . $str, '{locale}/pages' => 'App\Pages::list_all', 'admin/admins' => 'App\Admin\Admins::list_all', + 'admin/admins/edit/(:any)' => 'App/Admin/Admins::edit_show/$1', '/some/slash' => 'App\Slash::index', 'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3', '(:segment)/(:segment)/(:segment)' => '$2::$3/$1', @@ -402,6 +403,17 @@ public function testRouteResource() $this->assertSame('list_all', $router->methodName()); } + public function testRouteWithSlashInControllerName() + { + $this->expectExceptionMessage( + 'The namespace delimiter is a backslash (\), not a slash (/). Route handler: \App/Admin/Admins::edit_show/$1' + ); + + $router = new Router($this->collection, $this->request); + + $router->handle('admin/admins/edit/1'); + } + public function testRouteWithLeadingSlash() { $router = new Router($this->collection, $this->request); From 1640b8f89b069d66d1318768371ab0ed9cb554bf Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 9 Apr 2022 09:29:24 +0900 Subject: [PATCH 0114/8282] docs: fix heading level --- user_guide_src/source/outgoing/api_responses.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst index bdb853563e2b..0500a8ee92dd 100644 --- a/user_guide_src/source/outgoing/api_responses.rst +++ b/user_guide_src/source/outgoing/api_responses.rst @@ -56,8 +56,10 @@ So, if your request asks for JSON formatted data in an **Accept** header, the da ``respond*`` or ``fail*`` methods will be formatted by the ``CodeIgniter\Format\JSONFormatter`` class. The resulting JSON data will be sent back to the client. +*************** Class Reference *************** + .. php:method:: setResponseFormat($format) :param string $format: The type of response to return, either ``json`` or ``xml`` From 7c137dc250553cb118435d50a52b03e48beeab65 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 9 Apr 2022 09:46:23 +0900 Subject: [PATCH 0115/8282] docs: add TOC --- user_guide_src/source/installation/upgrade_4xx.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 03d72ac160eb..2166dda681a4 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -25,6 +25,10 @@ them one by one. **Do read the user guide** before embarking on a project conversion! +.. contents:: + :local: + :depth: 2 + General Adjustments =================== From fd6c6e5378c9358bd92713ee0d0f9d043e0fffcc Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 9 Apr 2022 09:46:45 +0900 Subject: [PATCH 0116/8282] docs: fix heading underlines --- .../source/installation/upgrade_4xx.rst | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 2166dda681a4..a97a2e339a29 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -30,18 +30,21 @@ them one by one. :depth: 2 General Adjustments -=================== +******************* -**Downloads** +Downloads +========= - CI4 is still available as a ready-to-run zip or tarball. - It can also be installed using Composer. -**Namespaces** +Namespaces +========== - CI4 is built for PHP 7.4+, and everything in the framework is namespaced, except for the helpers. -**Application Structure** +Application Structure +===================== - The **application** folder is renamed as **app** and the framework still has **system** folders, with the same interpretation as before. @@ -52,7 +55,8 @@ General Adjustments - There is no longer a nested **application/core** folder, as we have a different mechanism for extending framework components (see below). -**Model, View and Controller** +Model, View and Controller +========================== - CodeIgniter is based on the MVC concept. Thus, the changes on the Model, View and Controller are one of the most important things you have to handle. @@ -75,7 +79,8 @@ General Adjustments upgrade_views upgrade_controllers -**Class loading** +Class Loading +============= - There is no longer a CodeIgniter "superobject", with framework component references magically injected as properties of your controller. @@ -87,27 +92,31 @@ General Adjustments - You can configure the class loading to support whatever application structure you are most comfortable with, including the "HMVC" style. -**Libraries** +Libraries +========= - Your app classes can still go inside **app/Libraries**, but they don't have to. - Instead of CI3's ``$this->load->library(x);`` you can now use ``$this->x = new X();``, following namespaced conventions for your component. -**Helpers** +Helpers +======= - Helpers are pretty much the same as before, though some have been simplified. - In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it. - `redirect() Documentation CodeIgniter 3.X `_ - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_ -**Events** +Events +====== - Hooks have been replaced by Events. - Instead of CI3's ``$hook['post_controller_constructor']`` you now use ``Events::on('post_controller_constructor', ['MyClass', 'MyFunction']);``, with the namespace ``CodeIgniter\Events\Events;``. - Events are always enabled, and are available globally. -**Extending the framework** +Extending the Framework +======================= - You don't need a **core** folder to hold ``MY_...`` framework component extensions or replacements. @@ -118,7 +127,7 @@ General Adjustments your components instead of the default ones. Upgrading Libraries -=================== +******************* - Your app classes can still go inside **app/Libraries**, but they don't have to. - Instead of CI3's ``$this->load->library(x);`` you can now use ``$this->x = new X();``, From ab0d86b96726e89ce3a27b87d45190c7ea8b7968 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 9 Apr 2022 10:43:07 +0900 Subject: [PATCH 0117/8282] docs: add link to the detailed page --- user_guide_src/source/changelogs/v4.2.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 0ed69ab0760a..c0081761ffd4 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -27,7 +27,7 @@ Enhancements - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes - See :ref:`content-security-policy` for details. -- New View Decorators allow modifying the generated HTML prior to caching. +- New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching. - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`. - Added Subqueries in the SELECT section. See :ref:`query-builder-select`. - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`. From 7f595062e2111b39a10a5300eca45cf8076908e8 Mon Sep 17 00:00:00 2001 From: Chl Date: Fri, 8 Apr 2022 23:31:04 +0200 Subject: [PATCH 0118/8282] script_tag: cosmetic for value-less attributes Some attributes are usually written without values, for example : `'; + return $script . 'type="text/javascript">'; } } diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php index b3ed47d0c3e6..74b087228fdd 100755 --- a/tests/system/Helpers/HTMLHelperTest.php +++ b/tests/system/Helpers/HTMLHelperTest.php @@ -248,6 +248,27 @@ public function testScriptTagWithIndexpage() $this->assertSame($expected, script_tag($target, true)); } + public function testScriptTagWithSrc() + { + $target = ['src' => 'http://site.com/js/mystyles.js']; + $expected = ''; + $this->assertSame($expected, script_tag($target)); + } + + public function testScriptTagWithSrcWithoutProtocol() + { + $target = ['src' => 'js/mystyles.js']; + $expected = ''; + $this->assertSame($expected, script_tag($target)); + } + + public function testScriptTagWithSrcAndAttributes() + { + $target = ['src' => 'js/mystyles.js', 'charset' => 'UTF-8', 'defer' => '', 'async' => null]; + $expected = ''; + $this->assertSame($expected, script_tag($target)); + } + public function testLinkTag() { $target = 'css/mystyles.css'; diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php index 126fd86c4952..f47bb7053770 100644 --- a/user_guide_src/source/helpers/html_helper/011.php +++ b/user_guide_src/source/helpers/html_helper/011.php @@ -1,6 +1,6 @@ 'js/printer.js']; +$script = ['src' => 'js/printer.js', 'defer' => null]; echo script_tag($script); -// +// From a8d5b894c9ae17f1a8c8721eae44c0da22bec87c Mon Sep 17 00:00:00 2001 From: Chl Date: Sun, 10 Apr 2022 03:10:15 +0200 Subject: [PATCH 0119/8282] coding style: cs-fixer is_null() rule --- system/Helpers/html_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php index 0fc2f110399f..a15b18ff47e8 100755 --- a/system/Helpers/html_helper.php +++ b/system/Helpers/html_helper.php @@ -208,7 +208,7 @@ function script_tag($src = '', bool $indexPage = false): string } } else { // for attributes without values, like async or defer, use NULL. - $script .= $k . (is_null($v) ? ' ' : '="' . $v . '" '); + $script .= $k . (null === $v ? ' ' : '="' . $v . '" '); } } From 16dde2391c09e725ea852685f41488d83d26f0d4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Apr 2022 18:16:27 +0900 Subject: [PATCH 0120/8282] fix: add Escaper Exception classes in $coreClassmap --- system/Config/AutoloadConfig.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php index 13a6721fd2e6..79cad2ab8d25 100644 --- a/system/Config/AutoloadConfig.php +++ b/system/Config/AutoloadConfig.php @@ -12,6 +12,9 @@ namespace CodeIgniter\Config; use Laminas\Escaper\Escaper; +use Laminas\Escaper\Exception\ExceptionInterface; +use Laminas\Escaper\Exception\InvalidArgumentException as EscaperInvalidArgumentException; +use Laminas\Escaper\Exception\RuntimeException; use Psr\Log\AbstractLogger; use Psr\Log\InvalidArgumentException; use Psr\Log\LoggerAwareInterface; @@ -103,15 +106,18 @@ class AutoloadConfig * @var array */ protected $coreClassmap = [ - AbstractLogger::class => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php', - InvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php', - LoggerAwareInterface::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php', - LoggerAwareTrait::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php', - LoggerInterface::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php', - LoggerTrait::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php', - LogLevel::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php', - NullLogger::class => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php', - Escaper::class => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php', + AbstractLogger::class => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php', + InvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php', + LoggerAwareInterface::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php', + LoggerAwareTrait::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php', + LoggerInterface::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php', + LoggerTrait::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php', + LogLevel::class => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php', + NullLogger::class => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php', + ExceptionInterface::class => SYSTEMPATH . 'ThirdParty/Escaper/Exception/ExceptionInterface.php', + EscaperInvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/Escaper/Exception/InvalidArgumentException.php', + RuntimeException::class => SYSTEMPATH . 'ThirdParty/Escaper/Exception/RuntimeException.php', + Escaper::class => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php', ]; /** From 61999b0205bb76825027d394ce54e00bf72eac16 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Apr 2022 11:57:03 +0900 Subject: [PATCH 0121/8282] fix: multiple CLI::color() inside CLI::write() change color of strings that shouldn't be affected --- system/CLI/CLI.php | 75 ++++++++++++++++++++++++------------ tests/system/CLI/CLITest.php | 22 ++++++++++- 2 files changed, 71 insertions(+), 26 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 347a894f7578..4a55d2f7ef00 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -473,6 +473,10 @@ public static function color(string $text, string $foreground, ?string $backgrou return $text; } + if ($text === '') { + return $text; + } + if (! array_key_exists($foreground, static::$foreground_colors)) { throw CLIException::forInvalidColor('foreground', $foreground); } @@ -481,6 +485,51 @@ public static function color(string $text, string $foreground, ?string $backgrou throw CLIException::forInvalidColor('background', $background); } + // Reset text + $newText = ''; + + // Detect if color method was already in use with this text + if (strpos($text, "\033[0m") !== false) { + $pattern = '/\\033\\[0;.+?\\033\\[0m/u'; + + preg_match_all($pattern, $text, $matches); + $coloredStrings = $matches[0]; + + // No colored string found. Invalid strings with no `\033[0;??`. + if ($coloredStrings === []) { + $newText .= self::getColoredText($text, $foreground, $background, $format); + + return $newText; + } + + $nonColoredText = preg_replace( + $pattern, + '<<__colored_string__>>', + $text + ); + $nonColoredChunks = preg_split( + '/<<__colored_string__>>/u', + $nonColoredText + ); + + foreach ($nonColoredChunks as $i => $chunk) { + if ($chunk !== '') { + $newText .= self::getColoredText($chunk, $foreground, $background, $format); + } + + if (isset($coloredStrings[$i])) { + $newText .= $coloredStrings[$i]; + } + } + } else { + $newText .= self::getColoredText($text, $foreground, $background, $format); + } + + return $newText; + } + + private static function getColoredText(string $text, string $foreground, ?string $background, ?string $format): string + { $string = "\033[" . static::$foreground_colors[$foreground] . 'm'; if ($background !== null) { @@ -491,31 +540,9 @@ public static function color(string $text, string $foreground, ?string $backgrou $string .= "\033[4m"; } - // Detect if color method was already in use with this text - if (strpos($text, "\033[0m") !== false) { - // Split the text into parts so that we can see - // if any part missing the color definition - $chunks = mb_split('\\033\\[0m', $text); - // Reset text - $text = ''; - - foreach ($chunks as $chunk) { - if ($chunk === '') { - continue; - } - - // If chunk doesn't have colors defined we need to add them - if (strpos($chunk, "\033[") === false) { - $chunk = static::color($chunk, $foreground, $background, $format); - // Add color reset before chunk and clear end of the string - $text .= rtrim("\033[0m" . $chunk, "\033[0m"); - } else { - $text .= $chunk; - } - } - } + $string .= $text . "\033[0m"; - return $string . $text . "\033[0m"; + return $string; } /** diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 107ac1463e67..0c2b81c0b3e4 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -122,6 +122,7 @@ public function testColorSupportOnNoColor() CLI::init(); // force re-check on env $this->assertSame('test', CLI::color('test', 'white', 'green')); + putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR'); } @@ -132,6 +133,7 @@ public function testColorSupportOnHyperTerminals() CLI::init(); // force re-check on env $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline')); + putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM'); } @@ -190,14 +192,30 @@ public function testWriteForeground() public function testWriteForegroundWithColorBefore() { CLI::write(CLI::color('green', 'green') . ' red', 'red'); - $expected = "\033[0;31m\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL; + + $expected = "\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } public function testWriteForegroundWithColorAfter() { CLI::write('red ' . CLI::color('green', 'green'), 'red'); - $expected = "\033[0;31mred \033[0;32mgreen\033[0m" . PHP_EOL; + + $expected = "\033[0;31mred \033[0m\033[0;32mgreen\033[0m" . PHP_EOL; + $this->assertSame($expected, CITestStreamFilter::$buffer); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5892 + */ + public function testWriteForegroundWithColorTwice() + { + CLI::write( + CLI::color('green', 'green') . ' red ' . CLI::color('green', 'green'), + 'red' + ); + + $expected = "\033[0;32mgreen\033[0m\033[0;31m red \033[0m\033[0;32mgreen\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } From f406f4aee220b3b85474219b3a4bf0397e914f48 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Apr 2022 12:47:57 +0900 Subject: [PATCH 0122/8282] refactor: vendor/bin/rector process --- system/CLI/CLI.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 4a55d2f7ef00..b43d0005ff77 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -497,9 +497,7 @@ public static function color(string $text, string $foreground, ?string $backgrou // No colored string found. Invalid strings with no `\033[0;??`. if ($coloredStrings === []) { - $newText .= self::getColoredText($text, $foreground, $background, $format); - - return $newText; + return $newText . self::getColoredText($text, $foreground, $background, $format); } $nonColoredText = preg_replace( @@ -540,9 +538,7 @@ private static function getColoredText(string $text, string $foreground, ?string $string .= "\033[4m"; } - $string .= $text . "\033[0m"; - - return $string; + return $string . ($text . "\033[0m"); } /** From 7688add69c8b1e5e87daf04e173d937bd09e4f7f Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Wed, 13 Apr 2022 09:02:52 +0430 Subject: [PATCH 0123/8282] mailPath Alright! --- user_guide_src/source/libraries/email.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index b610e69a20df..1287f961713a 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -108,7 +108,7 @@ Preference Default Value Options Descript =================== ====================== ============================ ======================================================================= **userAgent** CodeIgniter None The "user agent". **protocol** mail mail, sendmail, or smtp The mail sending protocol. -**mailpath** /usr/sbin/sendmail None The server path to Sendmail. +**mailPath** /usr/sbin/sendmail None The server path to Sendmail. **SMTPHost** No Default None SMTP Server Address. **SMTPUser** No Default None SMTP Username. **SMTPPass** No Default None SMTP Password. From 8995da98a74748cbca558f13addcc422b743cc05 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Apr 2022 21:24:16 +0900 Subject: [PATCH 0124/8282] test: add line breaks --- tests/system/CLI/CLITest.php | 51 +++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 0c2b81c0b3e4..2f569e5c81c5 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -39,18 +39,21 @@ protected function tearDown(): void public function testNew() { $actual = new CLI(); + $this->assertInstanceOf(CLI::class, $actual); } public function testBeep() { $this->expectOutputString("\x07"); + CLI::beep(); } public function testBeep4() { $this->expectOutputString("\x07\x07\x07\x07"); + CLI::beep(4); } @@ -96,6 +99,7 @@ public function testIsWindows() public function testNewLine() { $this->expectOutputString(''); + CLI::newLine(); } @@ -119,8 +123,8 @@ public function testColorSupportOnNoColor() { $nocolor = getenv('NO_COLOR'); putenv('NO_COLOR=1'); - CLI::init(); // force re-check on env + $this->assertSame('test', CLI::color('test', 'white', 'green')); putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR'); @@ -130,8 +134,8 @@ public function testColorSupportOnHyperTerminals() { $termProgram = getenv('TERM_PROGRAM'); putenv('TERM_PROGRAM=Hyper'); - CLI::init(); // force re-check on env + $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline')); putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM'); @@ -148,36 +152,41 @@ public function testColor() // After the tests on NO_COLOR and TERM_PROGRAM above, // the $isColored variable is rigged. So we reset this. CLI::init(); - $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline')); + + $this->assertSame( + "\033[1;37m\033[42m\033[4mtest\033[0m", + CLI::color('test', 'white', 'green', 'underline') + ); } public function testPrint() { CLI::print('test'); - $expected = 'test'; + $expected = 'test'; $this->assertSame($expected, CITestStreamFilter::$buffer); } public function testPrintForeground() { CLI::print('test', 'red'); - $expected = "\033[0;31mtest\033[0m"; + $expected = "\033[0;31mtest\033[0m"; $this->assertSame($expected, CITestStreamFilter::$buffer); } public function testPrintBackground() { CLI::print('test', 'red', 'green'); - $expected = "\033[0;31m\033[42mtest\033[0m"; + $expected = "\033[0;31m\033[42mtest\033[0m"; $this->assertSame($expected, CITestStreamFilter::$buffer); } public function testWrite() { CLI::write('test'); + $expected = PHP_EOL . 'test' . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } @@ -185,6 +194,7 @@ public function testWrite() public function testWriteForeground() { CLI::write('test', 'red'); + $expected = "\033[0;31mtest\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } @@ -222,6 +232,7 @@ public function testWriteForegroundWithColorTwice() public function testWriteBackground() { CLI::write('test', 'red', 'green'); + $expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } @@ -229,7 +240,9 @@ public function testWriteBackground() public function testError() { $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter'); + CLI::error('test'); + // red expected cuz stderr $expected = "\033[1;31mtest\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); @@ -238,7 +251,9 @@ public function testError() public function testErrorForeground() { $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter'); + CLI::error('test', 'purple'); + $expected = "\033[0;35mtest\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } @@ -246,7 +261,9 @@ public function testErrorForeground() public function testErrorBackground() { $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter'); + CLI::error('test', 'purple', 'green'); + $expected = "\033[0;35m\033[42mtest\033[0m" . PHP_EOL; $this->assertSame($expected, CITestStreamFilter::$buffer); } @@ -291,9 +308,18 @@ public function testShowProgressWithoutBar() public function testWrap() { $this->assertSame('', CLI::wrap('')); - $this->assertSame('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1)); - $this->assertSame('1234 5678 90' . PHP_EOL . ' abc de fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2)); - $this->assertSame('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321')); + $this->assertSame( + '1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', + CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1) + ); + $this->assertSame( + '1234 5678 90' . PHP_EOL . ' abc de fghij' . PHP_EOL . ' 0987654321', + CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2) + ); + $this->assertSame( + '1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', + CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321') + ); } public function testParseCommand() @@ -305,6 +331,7 @@ public function testParseCommand() ]; $_SERVER['argc'] = 3; CLI::init(); + $this->assertNull(CLI::getSegment(3)); $this->assertSame('b', CLI::getSegment(1)); $this->assertSame('c', CLI::getSegment(2)); @@ -330,6 +357,7 @@ public function testParseCommandMixed() 'sure', ]; CLI::init(); + $this->assertNull(CLI::getSegment(7)); $this->assertSame('b', CLI::getSegment(1)); $this->assertSame('c', CLI::getSegment(2)); @@ -353,6 +381,7 @@ public function testParseCommandOption() 'd', ]; CLI::init(); + $this->assertSame(['parm' => 'pvalue'], CLI::getOptions()); $this->assertSame('pvalue', CLI::getOption('parm')); $this->assertSame('-parm pvalue ', CLI::getOptionString()); @@ -377,6 +406,7 @@ public function testParseCommandMultipleOptions() 'value 3', ]; CLI::init(); + $this->assertSame(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions()); $this->assertSame('pvalue', CLI::getOption('parm')); $this->assertSame('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString()); @@ -391,11 +421,13 @@ public function testWindow() $height = new ReflectionProperty(CLI::class, 'height'); $height->setAccessible(true); $height->setValue(null); + $this->assertIsInt(CLI::getHeight()); $width = new ReflectionProperty(CLI::class, 'width'); $width->setAccessible(true); $width->setValue(null); + $this->assertIsInt(CLI::getWidth()); } @@ -409,6 +441,7 @@ public function testWindow() public function testTable($tbody, $thead, $expected) { CLI::table($tbody, $thead); + $this->assertSame(CITestStreamFilter::$buffer, $expected); } From 1b26129b2443f7a083968b9bcf8f111e093878a5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Apr 2022 21:28:55 +0900 Subject: [PATCH 0125/8282] test: add test --- tests/system/CLI/CLITest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 2f569e5c81c5..a8452cdfa7a6 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -159,6 +159,14 @@ public function testColor() ); } + public function testColorEmtpyString() + { + $this->assertSame( + '', + CLI::color('', 'white', 'green', 'underline') + ); + } + public function testPrint() { CLI::print('test'); From 768dd238f5eb85a516668f89bde8fc620e0a8022 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Apr 2022 17:05:07 +0900 Subject: [PATCH 0126/8282] docs: improve Managing your Applications - add note for composer.json autoload.psr-4 - change example from Zip install to Composer install --- .../source/general/managing_apps.rst | 72 ++++++++++++++----- .../source/general/managing_apps/001.php | 2 + .../source/general/managing_apps/005.php | 12 ++++ 3 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 user_guide_src/source/general/managing_apps/005.php diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst index fc00dcd06985..ddba276825d2 100644 --- a/user_guide_src/source/general/managing_apps.rst +++ b/user_guide_src/source/general/managing_apps.rst @@ -8,10 +8,27 @@ directory. It is possible, however, to have multiple sets of applications that share a single CodeIgniter installation, or even to rename or relocate your application directory. +.. important:: When you installed CodeIgniter v4.1.9 or before, and if there are ``App\\`` and ``Config\\`` namespaces in your ``/composer.json``'s ``autoload.psr-4`` like the following, you need to remove these lines, and run ``composer dump-autolod``. + + .. code-block:: text + + { + ... + "autoload": { + "psr-4": { + "App\\": "app", <-- Remove this line + "Config\\": "app/Config" <-- Remove this line + } + }, + ... + } + .. contents:: :local: :depth: 2 +.. _renaming-app-directory: + Renaming or Relocating the Application Directory ================================================ @@ -46,32 +63,49 @@ and **bar**. You could structure your application project directories like this: .. code-block:: text - /foo - /app - /public - /tests - /writable + foo/ + app/ + public/ + tests/ + writable/ + env + phpunit.xml.dist spark - /bar - /app - /public - /tests - /writable + bar/ + app/ + public/ + tests/ + writable/ + env + phpunit.xml.dist spark - /codeigniter - /system + vendor/ + autoload.php + codeigniter4/framework/ + composer.json + composer.lock + +.. note:: If you install CodeIgniter from the Zip file, the directory structure would be following: + + .. code-block:: text + + foo/ + bar/ + codeigniter4/system/ This would have two apps, **foo** and **bar**, both having standard application directories -and a **public** folder, and sharing a common **codeigniter** framework. +and a **public** folder, and sharing a common **codeigniter4/framework**. -The **index.php** inside each application would refer to its own configuration, -``../app/Config/Paths.php``, and the ``$systemDirectory`` variable in **app/Config/Paths.php** inside each -of those would be set to refer to the shared common **system** folder. +The ``$systemDirectory`` variable in **app/Config/Paths.php** inside each +of those would be set to refer to the shared common **codeigniter4/framework** folder: -If either of the applications had a command-line component, then you would also -modify **spark** inside each application's project folder, as directed above. +.. literalinclude:: managing_apps/005.php -When you use Composer autoloader, fix the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each +.. note:: If you install CodeIgniter from the Zip file, the ``$systemDirectory`` would be ``__DIR__ . '/../../../codeigniter4/system'``. + +And modify the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each of those: .. literalinclude:: managing_apps/004.php + +Only when you change the Application Directory, see :ref:`renaming-app-directory` and modify the paths in the **index.php** and **spark**. diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php index c116317678be..da4991fd738d 100644 --- a/user_guide_src/source/general/managing_apps/001.php +++ b/user_guide_src/source/general/managing_apps/001.php @@ -4,6 +4,8 @@ class Paths { + // ... + public $appDirectory = '/path/to/your/app'; // ... diff --git a/user_guide_src/source/general/managing_apps/005.php b/user_guide_src/source/general/managing_apps/005.php new file mode 100644 index 000000000000..4f5cbf47244c --- /dev/null +++ b/user_guide_src/source/general/managing_apps/005.php @@ -0,0 +1,12 @@ + Date: Fri, 15 Apr 2022 11:16:07 +0900 Subject: [PATCH 0127/8282] docs: replace /app/ with app/ Because there are more places listed as app/. --- user_guide_src/source/cli/cli_commands.rst | 4 ++-- user_guide_src/source/concepts/autoloader.rst | 4 ++-- user_guide_src/source/concepts/mvc.rst | 8 ++++---- user_guide_src/source/general/configuration.rst | 6 +++--- user_guide_src/source/incoming/controllers.rst | 2 +- user_guide_src/source/libraries/throttler.rst | 2 +- user_guide_src/source/libraries/validation.rst | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst index 30d92a195390..524ab80f3644 100644 --- a/user_guide_src/source/cli/cli_commands.rst +++ b/user_guide_src/source/cli/cli_commands.rst @@ -88,7 +88,7 @@ File Location ============= Commands must be stored within a directory named **Commands**. However, that directory can be located anywhere -that the :doc:`Autoloader ` can locate it. This could be in **/app/Commands**, or +that the :doc:`Autoloader ` can locate it. This could be in **app/Commands**, or a directory that you keep commands in to use in all of your project development, like **Acme/Commands**. .. note:: When the commands are executed, the full CodeIgniter CLI environment has been loaded, making it @@ -98,7 +98,7 @@ An Example Command ================== Let's step through an example command whose only function is to report basic information about the application -itself, for demonstration purposes. Start by creating a new file at **/app/Commands/AppInfo.php**. It +itself, for demonstration purposes. Start by creating a new file at **app/Commands/AppInfo.php**. It should contain the following code: .. literalinclude:: cli_commands/002.php diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index b748e520fd98..06f6fa45025c 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -28,7 +28,7 @@ beginning of the framework's execution. Configuration ============= -Initial configuration is done in **/app/Config/Autoload.php**. This file contains two primary +Initial configuration is done in **app/Config/Autoload.php**. This file contains two primary arrays: one for the classmap, and one for PSR-4 compatible namespaces. Namespaces @@ -48,7 +48,7 @@ have a trailing slash. By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers, libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace. -You may change this namespace by editing the **/app/Config/Constants.php** file and setting the +You may change this namespace by editing the **app/Config/Constants.php** file and setting the new namespace value under the ``APP_NAMESPACE`` setting: .. literalinclude:: autoloader/002.php diff --git a/user_guide_src/source/concepts/mvc.rst b/user_guide_src/source/concepts/mvc.rst index 11aa8efcd0af..1338290cc8b0 100644 --- a/user_guide_src/source/concepts/mvc.rst +++ b/user_guide_src/source/concepts/mvc.rst @@ -37,11 +37,11 @@ Views get the data to display from the controllers, who pass it to the views as with simple ``echo`` calls. You can also display other views within a view, making it pretty simple to display a common header or footer on every page. -Views are generally stored in **/app/Views**, but can quickly become unwieldy if not organized in some fashion. +Views are generally stored in **app/Views**, but can quickly become unwieldy if not organized in some fashion. CodeIgniter does not enforce any type of organization, but a good rule of thumb would be to create a new directory in the **Views** directory for each controller. Then, name views by the method name. This makes them very easy to find later on. For example, a user's profile might be displayed in a controller named ``User``, and a method named ``profile``. -You might store the view file for this method in **/app/Views/User/Profile.php**. +You might store the view file for this method in **app/Views/User/Profile.php**. That type of organization works great as a base habit to get into. At times you might need to organize it differently. That's not a problem. As long as CodeIgniter can find the file, it can display it. @@ -61,7 +61,7 @@ it's saved to meet company standards, or formatting a column in a certain way be By keeping these business requirements in the model, you won't repeat code throughout several controllers and accidentally miss updating an area. -Models are typically stored in **/app/Models**, though they can use a namespace to be grouped however you need. +Models are typically stored in **app/Models**, though they can use a namespace to be grouped however you need. :doc:`Find out more about models ` @@ -77,7 +77,7 @@ The other responsibility of the controller is to handle everything that pertains authentication, web safety, encoding, etc. In short, the controller is where you make sure that people are allowed to be there, and they get the data they need in a format they can use. -Controllers are typically stored in **/app/Controllers**, though they can use a namespace to be grouped however +Controllers are typically stored in **app/Controllers**, though they can use a namespace to be grouped however you need. :doc:`Find out more about controllers ` diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 85bdc91fe62c..88d389c456a2 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -9,7 +9,7 @@ the required settings are public properties. Unlike many other frameworks, CodeIgniter configurable items aren't contained in a single file. Instead, each class that needs configurable items will have a configuration file with the same name as the class that uses it. You will find -the application configuration files in the **/app/Config** folder. +the application configuration files in the **app/Config** folder. .. contents:: :local: @@ -33,7 +33,7 @@ All configuration object properties are public, so you access the settings like .. literalinclude:: configuration/003.php If no namespace is provided, it will look for the file in all defined namespaces -as well as **/app/Config/**. +as well as **app/Config/**. All of the configuration files that ship with CodeIgniter are namespaced with ``Config``. Using this namespace in your application will provide the best @@ -48,7 +48,7 @@ Creating Configuration Files ============================ When you need a new configuration, first you create a new file at your desired location. -The default file location (recommended for most cases) is **/app/Config**. +The default file location (recommended for most cases) is **app/Config**. The class should use the appropriate namespace, and it should extend ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings. diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index c5a963c81fdd..9074bf18046f 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -146,7 +146,7 @@ For security reasons be sure to declare any new utility methods as ``protected`` .. literalinclude:: controllers/008.php -Then save the file to your **/app/Controllers/** directory. +Then save the file to your **app/Controllers/** directory. .. important:: The file must be called **Helloworld.php**, with a capital ``H``. diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst index df0dfeb29d37..27a3283dae6e 100644 --- a/user_guide_src/source/libraries/throttler.rst +++ b/user_guide_src/source/libraries/throttler.rst @@ -64,7 +64,7 @@ Applying the Filter We don't necessarily need to throttle every page on the site. For many web applications, this makes the most sense to apply only to POST requests, though API's might want to limit every request made by a user. In order to apply -this to incoming requests, you need to edit **/app/Config/Filters.php** and first add an alias to the +this to incoming requests, you need to edit **app/Config/Filters.php** and first add an alias to the filter: .. literalinclude:: throttler/003.php diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 8d3204804e92..641058b29a87 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -498,7 +498,7 @@ Creating the Views The first step is to create custom views. These can be placed anywhere that the ``view()`` method can locate them, which means the standard View directory, or any namespaced View folder will work. For example, you could create -a new view at **/app/Views/_errors_list.php**: +a new view at **app/Views/_errors_list.php**: .. literalinclude:: validation/030.php From 33ef2742a96880e7eb1819305c7737f2ec59e94f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 11:29:10 +0900 Subject: [PATCH 0128/8282] docs: small improvement --- user_guide_src/source/intro/requirements.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst index a55b8c46d0d9..974cf108c406 100644 --- a/user_guide_src/source/intro/requirements.rst +++ b/user_guide_src/source/intro/requirements.rst @@ -7,7 +7,10 @@ Server Requirements installed. The following PHP extensions should be enabled on your server: -``php-json``, ``php-mysqlnd``, ``php-xml`` + + - ``php-json`` + - ``php-mysqlnd`` (if you use MySQL) + - ``php-xml`` In order to use the :doc:`CURLRequest `, you will need `libcurl `_ installed. @@ -15,7 +18,7 @@ In order to use the :doc:`CURLRequest `, you will need A database is required for most web application programming. Currently supported databases are: - - MySQL (5.1+) via the *MySQLi* driver + - MySQL via the *MySQLi* driver (version 5.1 and above only) - PostgreSQL via the *Postgre* driver - SQLite3 via the *SQLite3* driver - MSSQL via the *SQLSRV* driver (version 2005 and above only) From 6c01476b8323b18c8838d3371cddaf643e44b4b8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 11:56:03 +0900 Subject: [PATCH 0129/8282] docs: add TOC --- user_guide_src/source/concepts/autoloader.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index b748e520fd98..ecd4428a0cfa 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -2,6 +2,10 @@ Autoloading Files ################# +.. contents:: + :local: + :depth: 2 + Every application consists of a large number of classes in many different locations. The framework provides classes for core functionality. Your application will have a number of libraries, models, and other entities to make it work. You might have third-party From a5c8c50cae82cb1acefcc83447eefc89c363eb68 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 11:56:18 +0900 Subject: [PATCH 0130/8282] docs: remove out of dated description The core classes are not added to the classmap. --- user_guide_src/source/concepts/autoloader.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index ecd4428a0cfa..577a70bf2430 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -18,8 +18,6 @@ It can locate individual namespaced classes that adhere to `PSR-4 `_ autoloading directory structures. -For performance improvement, the core CodeIgniter components have been added to the classmap. - The autoloader works great by itself, but can also work with other autoloaders, like `Composer `_, or even your own custom autoloaders, if needed. Because they're all registered through From 5d737089b8e90fb6665404a1881fdf83cb944956 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 11:58:10 +0900 Subject: [PATCH 0131/8282] docs: remove unneeded description We don't need a trailing back slash, so escaping back slashes is not needed. Double-quotes have nothing to do with escaping. --- user_guide_src/source/concepts/autoloader.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 577a70bf2430..7e931c677995 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -43,9 +43,8 @@ those classes can be found in: .. literalinclude:: autoloader/001.php -The key of each row is the namespace itself. This does not need a trailing slash. If you use double-quotes -to define the array, be sure to escape the backward slash. That means that it would be ``My\\App``, -not ``My\App``. The value is the location to the directory the classes can be found in. They should +The key of each row is the namespace itself. This does not need a trailing slash. +The value is the location to the directory the classes can be found in. They should have a trailing slash. By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers, From 43fb2fc9b94ca90f8b7a52f8b48582cb20992273 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 12:04:00 +0900 Subject: [PATCH 0132/8282] docs: add `back` --- user_guide_src/source/concepts/autoloader.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 7e931c677995..5dd349065860 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -43,7 +43,7 @@ those classes can be found in: .. literalinclude:: autoloader/001.php -The key of each row is the namespace itself. This does not need a trailing slash. +The key of each row is the namespace itself. This does not need a trailing back slash. The value is the location to the directory the classes can be found in. They should have a trailing slash. From c2bb64594ada1e76b3ad862f3d0f1909a0e24f5e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 12:04:26 +0900 Subject: [PATCH 0133/8282] docs: fix the file path text decration --- user_guide_src/source/concepts/autoloader.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 5dd349065860..3c68567486da 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -76,7 +76,7 @@ Composer Support Composer support is automatically initialized by default. By default, it looks for Composer's autoload file at ``ROOTPATH . 'vendor/autoload.php'``. If you need to change the location of that file for any reason, you can modify -the value defined in ``Config\Constants.php``. +the value defined in **app/Config/Constants.php**. .. note:: If the same namespace is defined in both CodeIgniter and Composer, CodeIgniter's autoloader will be the first one to get a chance to locate the file. From 0208c720f256ee0b3257f1b9c6efd9fdb65548fd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Apr 2022 14:00:25 +0900 Subject: [PATCH 0134/8282] fix: Composer PSR-4 overwrites Config\Autoload::$psr4 --- system/Autoloader/Autoloader.php | 2 +- tests/system/Autoloader/AutoloaderTest.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 520e669be685..311428fe4165 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -328,7 +328,7 @@ private function loadComposerNamespaces(ClassLoader $composer): void $newPaths[rtrim($key, '\\ ')] = $value; } - $this->prefixes = array_merge($this->prefixes, $newPaths); + $this->addNamespace($newPaths); } private function loadComposerClassmap(ClassLoader $composer): void diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 82e0307affad..1279910d2289 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -233,6 +233,23 @@ public function testFindsComposerRoutes() $this->assertArrayHasKey('Laminas\\Escaper', $namespaces); } + public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4() + { + $config = new Autoload(); + $config->psr4 = [ + 'Psr\Log' => '/Config/Autoload/Psr/Log/', + ]; + $modules = new Modules(); + $modules->discoverInComposer = true; + + $this->loader = new Autoloader(); + $this->loader->initialize($config, $modules); + + $namespaces = $this->loader->getNamespace(); + $this->assertSame('/Config/Autoload/Psr/Log/', $namespaces['Psr\Log'][0]); + $this->assertStringContainsString(VENDORPATH, $namespaces['Psr\Log'][1]); + } + public function testFindsComposerRoutesWithComposerPathNotFound() { $composerPath = COMPOSER_PATH; From c3ecc1971d1b6b1bbacfe67372c48b6eb07f15d7 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 8 Apr 2022 01:12:00 +0700 Subject: [PATCH 0135/8282] [PHPStan] Prepare for PHPStan 1.6.x-dev --- composer.json | 2 +- phpstan.neon.dist | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 578156bd017c..e6935404bae9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.3", "nexusphp/tachycardia": "^1.0", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan": "1.6.x-dev", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1", "rector/rector": "0.12.20" diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8aa28016ca33..cbacdfb82745 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,6 +7,10 @@ services: class: Utils\PHPStan\CheckFrameworkExceptionInstantiationViaNamedConstructorRule tags: - phpstan.rules.rule + - + class: PhpParser\NodeVisitor\NodeConnectingVisitor + tags: + - phpstan.parser.richParserNodeVisitor includes: - phpstan-baseline.neon.dist From fc9a7b8fbd6274768069fa2da42d2ffd316fd213 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 15 Apr 2022 20:36:37 +0700 Subject: [PATCH 0136/8282] set conditional tag --- composer.json | 2 +- phpstan.neon.dist | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e6935404bae9..d3e0b85bdee8 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.3", "nexusphp/tachycardia": "^1.0", - "phpstan/phpstan": "1.6.x-dev", + "phpstan/phpstan": "^1.5.6", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1", "rector/rector": "0.12.20" diff --git a/phpstan.neon.dist b/phpstan.neon.dist index cbacdfb82745..e4832b125ae2 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,3 +1,7 @@ +conditionalTags: + PhpParser\NodeVisitor\NodeConnectingVisitor: + phpstan.parser.richParserNodeVisitor: true + services: - class: Utils\PHPStan\CheckUseStatementsAfterLicenseRule @@ -7,10 +11,6 @@ services: class: Utils\PHPStan\CheckFrameworkExceptionInstantiationViaNamedConstructorRule tags: - phpstan.rules.rule - - - class: PhpParser\NodeVisitor\NodeConnectingVisitor - tags: - - phpstan.parser.richParserNodeVisitor includes: - phpstan-baseline.neon.dist From 9a60eb3d57671ffe2d69413136c8bcd2aba4c775 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Sun, 17 Apr 2022 01:18:58 +0330 Subject: [PATCH 0137/8282] docs:Correction due to 404 Not Found --- tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/README.md b/tests/README.md index 0df329864c6b..80f9439d1e6d 100644 --- a/tests/README.md +++ b/tests/README.md @@ -18,7 +18,7 @@ If running under OS X or Linux, you can create a symbolic link to make running t > ln -s ./vendor/bin/phpunit ./phpunit -You also need to install [XDebug](https://xdebug.org/index.php) in order +You also need to install [XDebug](https://xdebug.org/docs/install) in order for code coverage to be calculated successfully. ## Setting Up From ae56d6c66260064b4d1c71629c3fb12d81d79d77 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:15:27 +0900 Subject: [PATCH 0138/8282] docs: remove out of dated comment --- system/CLI/CLI.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index b43d0005ff77..f017346604a7 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -485,7 +485,6 @@ public static function color(string $text, string $foreground, ?string $backgrou throw CLIException::forInvalidColor('background', $background); } - // Reset text $newText = ''; // Detect if color method was already in use with this text From 63207331448887c8ff81e675b7ac80b34cac15ed Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:17:48 +0900 Subject: [PATCH 0139/8282] refactor: combine if statements --- system/CLI/CLI.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index f017346604a7..ae61d50e41d4 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -469,11 +469,7 @@ public static function clearScreen() */ public static function color(string $text, string $foreground, ?string $background = null, ?string $format = null): string { - if (! static::$isColored) { - return $text; - } - - if ($text === '') { + if (! static::$isColored || $text === '') { return $text; } From 9dcb39cb1e2d87bffb0cdc8c85be55253af2041d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:18:18 +0900 Subject: [PATCH 0140/8282] refacter: remove unneeded parentheses --- system/CLI/CLI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index ae61d50e41d4..d88374e80944 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -533,7 +533,7 @@ private static function getColoredText(string $text, string $foreground, ?string $string .= "\033[4m"; } - return $string . ($text . "\033[0m"); + return $string . $text . "\033[0m"; } /** From 2aa93487f2d22365eb18237b48e2fdbea3ddce44 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:27:32 +0900 Subject: [PATCH 0141/8282] docs: fix heading underlines --- user_guide_src/source/cli/cli_library.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index 4ea8e71e4996..8d269aeead09 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -15,7 +15,7 @@ CodeIgniter's CLI library makes creating interactive command-line scripts simple :depth: 2 Initializing the Class -====================== +********************** You do not need to create an instance of the CLI library, since all of it's methods are static. Instead, you simply need to ensure your controller can locate it via a ``use`` statement above your class: @@ -25,7 +25,7 @@ need to ensure your controller can locate it via a ``use`` statement above your The class is automatically initialized when the file is loaded the first time. Getting Input from the User -=========================== +*************************** Sometimes you need to ask the user for more information. They might not have provided optional command-line arguments, or the script may have encountered an existing file and needs confirmation before overwriting. This is @@ -66,7 +66,7 @@ Named keys are also possible: Finally, you can pass :ref:`validation ` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options. Providing Feedback -================== +****************** **write()** From 85670436edbc7a605f85d8898d61dec374455481 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:31:59 +0900 Subject: [PATCH 0142/8282] docs: change method names to headings Otherwise, I can't link to it. --- user_guide_src/source/cli/cli_library.rst | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index 8d269aeead09..bfb3a2479903 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -52,7 +52,8 @@ Validation rules can also be written in the array syntax: .. literalinclude:: cli_library/006.php -**promptByKey()** +promptByKey() +============= Predefined answers (options) for prompt sometimes need to be described or are too complex to select via their value. ``promptByKey()`` allows the user to select an option by its key instead of its value: @@ -68,7 +69,8 @@ Finally, you can pass :ref:`validation ` rules to the answer input a Providing Feedback ****************** -**write()** +write() +======= Several methods are provided for you to provide feedback to your users. This can be as simple as a single status update or a complex table of information that wraps to the user's terminal window. At the core of this is the ``write()`` @@ -116,7 +118,8 @@ And a smaller number are available as background colors: * light_gray * magenta -**print()** +print() +======= Print functions identically to the ``write()`` method, except that it does not force a newline either before or after. Instead it prints it to the screen wherever the cursor is currently. This allows you to print multiple items all on @@ -125,7 +128,8 @@ print "Done" on the same line: .. literalinclude:: cli_library/012.php -**color()** +color() +======= While the ``write()`` command will write a single line to the terminal, ending it with a EOL character, you can use the ``color()`` method to make a string fragment that can be used in the same way, except that it will not force @@ -137,7 +141,8 @@ it inside of a ``write()`` method to create a string of a different color inside This example would write a single line to the window, with ``fileA`` in yellow, followed by a tab, and then ``/path/to/file`` in white text. -**error()** +error() +======= If you need to output errors, you should use the appropriately named ``error()`` method. This writes light-red text to STDERR, instead of STDOUT, like ``write()`` and ``color()`` do. This can be useful if you have scripts watching @@ -146,7 +151,8 @@ exactly as you would the ``write()`` method: .. literalinclude:: cli_library/014.php -**wrap()** +wrap() +====== This command will take a string, start printing it on the current line, and wrap it to a set length on new lines. This might be useful when displaying a list of options with descriptions that you want to wrap in the current @@ -179,13 +185,15 @@ Would create something like this: industry's standard dummy text ever since the -**newLine()** +newLine() +========= The ``newLine()`` method displays a blank line to the user. It does not take any parameters: .. literalinclude:: cli_library/018.php -**clearScreen()** +clearScreen() +============= You can clear the current terminal window with the ``clearScreen()`` method. In most versions of Windows, this will simply insert 40 blank lines since Windows doesn't support this feature. Windows 10 bash integration should change @@ -193,7 +201,8 @@ this: .. literalinclude:: cli_library/019.php -**showProgress()** +showProgress() +============== If you have a long-running task that you would like to keep the user updated with the progress, you can use the ``showProgress()`` method which displays something like the following: @@ -210,7 +219,8 @@ pass ``false`` as the first parameter and the progress bar will be removed. .. literalinclude:: cli_library/020.php -**table()** +table() +======= .. literalinclude:: cli_library/021.php @@ -223,7 +233,8 @@ pass ``false`` as the first parameter and the progress bar will be removed. | 8 | Another great item title | 2017-11-16 13:46:54 | 0 | +----+--------------------------+---------------------+--------+ -**wait()** +wait() +====== Waits a certain number of seconds, optionally showing a wait message and waiting for a key press. From c0ca99f51475e25d3fb87d9a7ed02dd74baf4725 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 08:38:10 +0900 Subject: [PATCH 0143/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.2.0.rst | 1 + user_guide_src/source/cli/cli_library.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index c0081761ffd4..449ad50f970d 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -18,6 +18,7 @@ BREAKING - ``spark`` - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug. - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available. +- The color code output by :ref:`CLI::color() ` has been changed to fix a bug. Enhancements ************ diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index bfb3a2479903..29bc6b252f88 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -128,6 +128,8 @@ print "Done" on the same line: .. literalinclude:: cli_library/012.php +.. _cli-library-color: + color() ======= From 4ad1edfdbb16ec7fc7dc903f832dd975e2063b4b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 13:07:27 +0900 Subject: [PATCH 0144/8282] docs: fix heading underline level --- user_guide_src/source/models/model.rst | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index fa354d7c3aff..e626662bef2d 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -7,7 +7,7 @@ Using CodeIgniter's Model :depth: 2 Models -====== +****** The CodeIgniter's Model provides convenience features and additional functionality that people commonly use to make working with a **single table** in your database more convenient. @@ -17,7 +17,7 @@ methods for much of the standard ways you would need to interact with a database updating records, deleting records, and more. Accessing Models -================ +**************** Models are typically stored in the ``app/Models`` directory. They should have a namespace that matches their location within the directory, like ``namespace App\Models``. @@ -27,7 +27,7 @@ You can access models within your classes by creating a new instance or using th .. literalinclude:: model/001.php CodeIgniter's Model -=================== +******************* CodeIgniter does provide a model class that provides a few nice features, including: @@ -41,7 +41,7 @@ This class provides a solid base from which to build your own models, allowing y rapidly build out your application's model layer. Creating Your Model -=================== +******************* To take advantage of CodeIgniter's model, you would simply create a new model class that extends ``CodeIgniter\Model``: @@ -58,7 +58,7 @@ extra steps without repeating the constructor parameters, for example extending .. literalinclude:: model/003.php Connecting to the Database --------------------------- +========================== When the class is first instantiated, if no database connection instance is passed to the constructor, it will automatically connect to the default database group, as set in the configuration. You can @@ -72,7 +72,7 @@ You would replace "group_name" with the name of a defined database group from th configuration file. Configuring Your Model ----------------------- +====================== The model class has a few configuration options that can be set to allow the class' methods to work seamlessly for you. The first two are used by all of the CRUD methods to determine @@ -190,10 +190,10 @@ time specified in the property name. Whether the callbacks defined above should be used. Working With Data -================= +***************** Finding Data ------------- +============ Several functions are provided for doing basic CRUD work on your tables, including ``find()``, ``insert()``, ``update()``, ``delete()`` and more. @@ -258,7 +258,7 @@ the next **find*()** methods to return only soft deleted rows: .. literalinclude:: model/014.php Saving Data ------------ +=========== **insert()** @@ -316,7 +316,7 @@ model's ``save()`` method to inspect the class, grab any public and private prop that provides several handy features that make developing Entities simpler. Deleting Data -------------- +============= **delete()** @@ -343,7 +343,7 @@ Cleans out the database table by permanently removing all rows that have 'delete .. literalinclude:: model/026.php Validating Data ---------------- +=============== For many people, validating data in the model is the preferred way to ensure the data is kept to a single standard, without duplicating code. The Model class provides a way to automatically have all data validated @@ -416,7 +416,7 @@ and simply set ``$validationRules`` to the name of the validation rule group you .. literalinclude:: model/034.php Retrieving Validation Rules ---------------------------- +=========================== You can retrieve a model's validation rules by accessing its ``validationRules`` property: @@ -435,7 +435,7 @@ value an array of fieldnames of interest: .. literalinclude:: model/037.php Validation Placeholders ------------------------ +======================= The model provides a simple method to replace parts of your rules based on data that's being passed into it. This sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply @@ -459,7 +459,7 @@ This can also be used to create more dynamic rules at runtime, as long as you ta keys passed in don't conflict with your form data. Protecting Fields ------------------ +================= To help protect against Mass Assignment Attacks, the Model class **requires** that you list all of the field names that can be changed during inserts and updates in the ``$allowedFields`` class property. Any data provided @@ -474,7 +474,7 @@ testing, migrations, or seeds. In these cases, you can turn the protection on or .. literalinclude:: model/042.php Working With Query Builder --------------------------- +========================== You can get access to a shared instance of the Query Builder for that model's database connection any time you need it: @@ -501,7 +501,7 @@ very elegant use: .. literalinclude:: model/046.php Runtime Return Type Changes ----------------------------- +=========================== You can specify the format that data should be returned as when using the **find*()** methods as the class property, ``$returnType``. There may be times that you would like the data back in a different format, though. The Model @@ -523,7 +523,7 @@ Returns data from the next **find*()** method as standard objects or custom clas .. literalinclude:: model/048.php Processing Large Amounts of Data --------------------------------- +================================ Sometimes, you need to process large amounts of data and would run the risk of running out of memory. To make this simpler, you may use the chunk() method to get smaller chunks of data that you can then @@ -535,7 +535,7 @@ This is best used during cronjobs, data exports, or other large tasks. .. literalinclude:: model/049.php Model Events -============ +************ There are several points within the model's execution that you can specify multiple callback methods to run. These methods can be used to normalize data, hash passwords, save related entities, and much more. The following @@ -543,7 +543,7 @@ points in the model's execution can be affected, each through a class property: ``$beforeUpdate``, ``$afterUpdate``, ``$afterFind``, and ``$afterDelete``. Defining Callbacks ------------------- +================== You specify the callbacks by first creating a new class method in your model to use. This class will always receive a ``$data`` array as its only parameter. The exact contents of the ``$data`` array will vary between events, but @@ -555,7 +555,7 @@ must return the original $data array so other callbacks have the full informatio .. literalinclude:: model/050.php Specifying Callbacks To Run ---------------------------- +=========================== You specify when to run the callbacks by adding the method name to the appropriate class property (``$beforeInsert``, ``$afterUpdate``, etc). Multiple callbacks can be added to a single event and they will be processed one after the other. You can @@ -572,7 +572,7 @@ You may also change this setting temporarily for a single model call sing the `` .. literalinclude:: model/053.php Event Parameters ----------------- +================ Since the exact data passed to each callback varies a bit, here are the details on what is in the ``$data`` parameter passed to each event: @@ -607,7 +607,7 @@ afterDelete **id** = primary key of row being deleted. ================ ========================================================================================================= Modifying Find* Data --------------------- +==================== The ``beforeFind`` and ``afterFind`` methods can both return a modified set of data to override the normal response from the model. For ``afterFind`` any changes made to ``data`` in the return array will automatically be passed back @@ -617,7 +617,7 @@ boolean, ``returnData``: .. literalinclude:: model/054.php Manual Model Creation -===================== +********************* You do not need to extend any special class to create a model for your application. All you need is to get an instance of the database connection and you're good to go. This allows you to bypass the features CodeIgniter's From f3a34f72ff38fe9fb9ebfe95beb84daf512b043c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Apr 2022 13:08:21 +0900 Subject: [PATCH 0145/8282] docs: change **foo** to headings You can link to headings, but cannot link to `**foo**`. --- user_guide_src/source/models/model.rst | 101 ++++++++++++++++--------- 1 file changed, 67 insertions(+), 34 deletions(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index e626662bef2d..84fdbf4be249 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -80,13 +80,15 @@ what table to use and how we can find the required records: .. literalinclude:: model/005.php -**$table** +$table +------ Specifies the database table that this model primarily works with. This only applies to the built-in CRUD methods. You are not restricted to using only this table in your own queries. -**$primaryKey** +$primaryKey +----------- This is the name of the column that uniquely identifies the records in this table. This does not necessarily have to match the primary key that is specified in the database, but @@ -95,7 +97,8 @@ is used with methods like ``find()`` to know what column to match the specified .. note:: All Models must have a primaryKey specified to allow all of the features to work as expected. -**$useAutoIncrement** +$useAutoIncrement +----------------- Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false`` then you are responsible for providing primary key value for every record in the table. This @@ -106,7 +109,8 @@ default value is ``true``. key in the database to ``unique``. This way you will make sure that all of Model's features will still work the same as before. -**$returnType** +$returnType +----------- The Model's CRUD methods will take a step of work away from you and automatically return the resulting data, instead of the Result object. This setting allows you to define @@ -114,7 +118,8 @@ the type of data that is returned. Valid values are '**array**' (the default), ' qualified name of a class** that can be used with the Result object's ``getCustomResultObject()`` method. -**$useSoftDeletes** +$useSoftDeletes +--------------- If true, then any ``delete()`` method calls will set ``deleted_at`` in the database, instead of actually deleting the row. This can preserve data when it might be referenced elsewhere, or @@ -126,66 +131,81 @@ This requires either a DATETIME or INTEGER field in the database as per the mode ``$dateFormat`` setting. The default field name is ``deleted_at`` however this name can be configured to any name of your choice by using ``$deletedField`` property. -**$allowedFields** +$allowedFields +-------------- This array should be updated with the field names that can be set during ``save()``, ``insert()``, or ``update()`` methods. Any field names other than these will be discarded. This helps to protect against just taking input from a form and throwing it all at the model, resulting in potential mass assignment vulnerabilities. -**$useTimestamps** +$useTimestamps +-------------- This boolean value determines whether the current date is automatically added to all inserts and updates. If true, will set the current time in the format specified by ``$dateFormat``. This requires that the table have columns named **created_at** and **updated_at** in the appropriate data type. -**$createdField** +$createdField +------------- Specifies which database field to use for data record create timestamp. Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled). -**$updatedField** +$updatedField +------------- Specifies which database field should use for keep data record update timestamp. Leave it empty to avoid update it (even ``$useTimestamps`` is enabled). -**$dateFormat** +$dateFormat +----------- This value works with ``$useTimestamps`` and ``$useSoftDeletes`` to ensure that the correct type of date value gets inserted into the database. By default, this creates DATETIME values, but valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using **useSoftDeletes** or -**useTimestamps** with an invalid or missing dateFormat will cause an exception. +useTimestamps with an invalid or missing dateFormat will cause an exception. -**$validationRules** +$validationRules +---------------- Contains either an array of validation rules as described in :ref:`validation-array` or a string containing the name of a validation group, as described in the same section. Described in more detail below. -**$validationMessages** +$validationMessages +------------------- Contains an array of custom error messages that should be used during validation, as described in :ref:`validation-custom-errors`. Described in more detail below. -**$skipValidation** +$skipValidation +--------------- Whether validation should be skipped during all **inserts** and **updates**. The default value is false, meaning that data will always attempt to be validated. This is primarily used by the ``skipValidation()`` method, but may be changed to ``true`` so this model will never validate. -**$beforeInsert** -**$afterInsert** -**$beforeUpdate** -**$afterUpdate** -**$afterFind** -**$afterDelete** +$beforeInsert +------------- +$afterInsert +------------ +$beforeUpdate +------------- +$afterUpdate +------------ +$afterFind +---------- +$afterDelete +------------ These arrays allow you to specify callback methods that will be run on the data at the time specified in the property name. -**$allowCallbacks** +$allowCallbacks +--------------- Whether the callbacks defined above should be used. @@ -198,7 +218,8 @@ Finding Data Several functions are provided for doing basic CRUD work on your tables, including ``find()``, ``insert()``, ``update()``, ``delete()`` and more. -**find()** +find() +------ Returns a single row where the primary key matches the value passed in as the first parameter: @@ -214,7 +235,8 @@ of just one: If no parameters are passed in, will return all rows in that model's table, effectively acting like ``findAll()``, though less explicit. -**findColumn()** +findColumn() +------------ Returns null or an indexed array of column values: @@ -222,7 +244,8 @@ Returns null or an indexed array of column values: ``$column_name`` should be a name of single column else you will get the DataException. -**findAll()** +findAll() +--------- Returns all results: @@ -237,20 +260,23 @@ parameters, respectively: .. literalinclude:: model/011.php -**first()** +first() +------- Returns the first row in the result set. This is best used in combination with the query builder. .. literalinclude:: model/012.php -**withDeleted()** +withDeleted() +------------- If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any rows where 'deleted_at IS NOT NULL'. To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method. .. literalinclude:: model/013.php -**onlyDeleted()** +onlyDeleted() +------------- Whereas ``withDeleted()`` will return both deleted and not-deleted rows, this method modifies the next **find*()** methods to return only soft deleted rows: @@ -260,7 +286,8 @@ the next **find*()** methods to return only soft deleted rows: Saving Data =========== -**insert()** +insert() +-------- An associative array of data is passed into this method as the only parameter to create a new row of data in the database. The array's keys must match the name of the columns in a ``$table``, while @@ -268,7 +295,8 @@ the array's values are the values to save for that key: .. literalinclude:: model/015.php -**update()** +update() +-------- Updates an existing record in the database. The first parameter is the ``$primaryKey`` of the record to update. An associative array of data is passed into this method as the second parameter. The array's keys must match the name @@ -285,7 +313,8 @@ update command, with the added benefit of validation, events, etc: .. literalinclude:: model/018.php -**save()** +save() +------ This is a wrapper around the ``insert()`` and ``update()`` methods that handle inserting or updating the record automatically, based on whether it finds an array key matching the **primary key** value: @@ -318,7 +347,8 @@ model's ``save()`` method to inspect the class, grab any public and private prop Deleting Data ============= -**delete()** +delete() +-------- Takes a primary key value as the first parameter and deletes the matching record from the model's table: @@ -336,7 +366,8 @@ previously: .. literalinclude:: model/025.php -**purgeDeleted()** +purgeDeleted() +-------------- Cleans out the database table by permanently removing all rows that have 'deleted_at IS NOT NULL'. @@ -510,13 +541,15 @@ provides methods that allow you to do just that. .. note:: These methods only change the return type for the next **find*()** method call. After that, it is reset to its default value. -**asArray()** +asArray() +--------- Returns data from the next **find*()** method as associative arrays: .. literalinclude:: model/047.php -**asObject()** +asObject() +---------- Returns data from the next **find*()** method as standard objects or custom class intances: From 8f1b0c80f73745abfeb9354e491391cdb41a0863 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 15:02:55 +0000 Subject: [PATCH 0146/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.12.20...0.12.21) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d3e0b85bdee8..9c1ee4adb46e 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpstan/phpstan": "^1.5.6", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1", - "rector/rector": "0.12.20" + "rector/rector": "0.12.21" }, "suggest": { "ext-fileinfo": "Improves mime type detection for files" From 185754ed87b80dc846810097bd38e147a9bac4fb Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 18 Apr 2022 22:15:59 +0700 Subject: [PATCH 0147/8282] clean up removed service and updated to use new RectorConfig --- rector.php | 98 ++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/rector.php b/rector.php index 9ee8a4217d21..79aa188aa94f 100644 --- a/rector.php +++ b/rector.php @@ -21,12 +21,11 @@ use Rector\CodeQuality\Rector\If_\ShortenElseIfRector; use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector; use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector; -use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector; use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector; use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector; use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; -use Rector\Core\Configuration\Option; +use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; @@ -45,31 +44,31 @@ use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector; use Rector\Set\ValueObject\LevelSetList; use Rector\Set\ValueObject\SetList; -use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use Utils\Rector\PassStrictParameterToFunctionParameterRector; use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector; use Utils\Rector\RemoveVarTagFromClassConstantRector; use Utils\Rector\UnderscoreToCamelCaseVariableNameRector; -return static function (ContainerConfigurator $containerConfigurator): void { - $containerConfigurator->import(SetList::DEAD_CODE); - $containerConfigurator->import(LevelSetList::UP_TO_PHP_74); - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD); - $containerConfigurator->import(PHPUnitSetList::PHPUNIT_80); +return static function (RectorConfig $rectorConfig): void { + $rectorConfig->sets([ + SetList::DEAD_CODE, + LevelSetList::UP_TO_PHP_74, + PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, + PHPUnitSetList::PHPUNIT_80, + ]); - $parameters = $containerConfigurator->parameters(); + $rectorConfig->parallel(); - $parameters->set(Option::PARALLEL, true); // paths to refactor; solid alternative to CLI arguments - $parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']); + $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']); // do you need to include constants, class aliases or custom autoloader? files listed will be executed - $parameters->set(Option::BOOTSTRAP_FILES, [ + $rectorConfig->bootstrapFiles([ __DIR__ . '/system/Test/bootstrap.php', ]); // is there a file you need to skip? - $parameters->set(Option::SKIP, [ + $rectorConfig->skip([ __DIR__ . '/app/Views', __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php', __DIR__ . '/system/ThirdParty', @@ -124,42 +123,39 @@ ]); // auto import fully qualified class names - $parameters->set(Option::AUTO_IMPORT_NAMES, true); - - $services = $containerConfigurator->services(); - $services->set(UnderscoreToCamelCaseVariableNameRector::class); - $services->set(SimplifyUselessVariableRector::class); - $services->set(RemoveAlwaysElseRector::class); - $services->set(PassStrictParameterToFunctionParameterRector::class); - $services->set(CountArrayToEmptyArrayComparisonRector::class); - $services->set(ForToForeachRector::class); - $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class); - $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class); - $services->set(SimplifyStrposLowerRector::class); - $services->set(CombineIfRector::class); - $services->set(SimplifyIfReturnBoolRector::class); - $services->set(InlineIfToExplicitIfRector::class); - $services->set(PreparedValueToEarlyReturnRector::class); - $services->set(ShortenElseIfRector::class); - $services->set(SimplifyIfElseToTernaryRector::class); - $services->set(UnusedForeachValueToArrayKeysRector::class); - $services->set(ChangeArrayPushToArrayAssignRector::class); - $services->set(UnnecessaryTernaryExpressionRector::class); - $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class); - $services->set(RemoveVarTagFromClassConstantRector::class); - $services->set(AddPregQuoteDelimiterRector::class); - $services->set(SimplifyRegexPatternRector::class); - $services->set(FuncGetArgsToVariadicParamRector::class); - $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class); - $services->set(SimplifyEmptyArrayCheckRector::class); - $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class); - $services->set(StringClassNameToClassConstantRector::class) - ->configure([ - 'Error', - 'Exception', - 'InvalidArgumentException', - 'Closure', - 'stdClass', - 'SQLite3', - ]); + $rectorConfig->importNames(); + + $rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class); + $rectorConfig->rule(RemoveAlwaysElseRector::class); + $rectorConfig->rule(PassStrictParameterToFunctionParameterRector::class); + $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class); + $rectorConfig->rule(ForToForeachRector::class); + $rectorConfig->rule(ChangeNestedForeachIfsToEarlyContinueRector::class); + $rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class); + $rectorConfig->rule(SimplifyStrposLowerRector::class); + $rectorConfig->rule(CombineIfRector::class); + $rectorConfig->rule(SimplifyIfReturnBoolRector::class); + $rectorConfig->rule(InlineIfToExplicitIfRector::class); + $rectorConfig->rule(PreparedValueToEarlyReturnRector::class); + $rectorConfig->rule(ShortenElseIfRector::class); + $rectorConfig->rule(SimplifyIfElseToTernaryRector::class); + $rectorConfig->rule(UnusedForeachValueToArrayKeysRector::class); + $rectorConfig->rule(ChangeArrayPushToArrayAssignRector::class); + $rectorConfig->rule(UnnecessaryTernaryExpressionRector::class); + $rectorConfig->rule(RemoveErrorSuppressInTryCatchStmtsRector::class); + $rectorConfig->rule(RemoveVarTagFromClassConstantRector::class); + $rectorConfig->rule(AddPregQuoteDelimiterRector::class); + $rectorConfig->rule(SimplifyRegexPatternRector::class); + $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class); + $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class); + $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class); + $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class); + $rectorConfig->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [ + 'Error', + 'Exception', + 'InvalidArgumentException', + 'Closure', + 'stdClass', + 'SQLite3', + ]); }; From 4fd7ac58307590112e6bdb6add99c1d9d085e57f Mon Sep 17 00:00:00 2001 From: Chl Date: Mon, 18 Apr 2022 16:43:20 +0200 Subject: [PATCH 0148/8282] script_tag: changelog, doc + test with default arg --- system/Helpers/html_helper.php | 4 ++-- tests/system/Helpers/HTMLHelperTest.php | 10 ++++++++++ user_guide_src/source/changelogs/v4.2.0.rst | 1 + user_guide_src/source/helpers/html_helper.rst | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php index a15b18ff47e8..c2e48d890fef 100755 --- a/system/Helpers/html_helper.php +++ b/system/Helpers/html_helper.php @@ -189,8 +189,8 @@ function doctype(string $type = 'html5'): string * * Generates link to a JS file * - * @param mixed $src Script source or an array - * @param bool $indexPage Should indexPage be added to the JS path + * @param array|string $src Script source or an array of attributes + * @param bool $indexPage Should indexPage be added to the JS path */ function script_tag($src = '', bool $indexPage = false): string { diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php index 74b087228fdd..d539d7421be6 100755 --- a/tests/system/Helpers/HTMLHelperTest.php +++ b/tests/system/Helpers/HTMLHelperTest.php @@ -269,6 +269,16 @@ public function testScriptTagWithSrcAndAttributes() $this->assertSame($expected, script_tag($target)); } + /** + * This test has probably no real-world value but may help detecting + * a change in the default behaviour. + */ + public function testScriptTagWithoutAnyArg() + { + $expected = ''; + $this->assertSame($expected, script_tag()); + } + public function testLinkTag() { $target = 'css/mystyles.css'; diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 0ed69ab0760a..fa88608dc355 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -38,6 +38,7 @@ Enhancements - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> (): " - Added support for webp files to **app/Config/Mimes.php**. - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`. +- HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: `` + - -
-
-

getCode() ? ' #' . $exception->getCode() : '') ?>

-

- getMessage())) ?> - getMessage())) ?>" - rel="noreferrer" target="_blank">search → -

-
-
- - -
-

at line

- - -
- -
- -
- -
- - - -
- - -
- -
    - $row) : ?> - -
  1. -

    - - - +

    +
    +

    getCode() ? ' #' . $exception->getCode() : '') ?>

    +

    + getMessage())) ?> + getMessage())) ?>" + rel="noreferrer" target="_blank">search → +

    +
    +
    + + +
    +

    at line

    + + +
    + +
    + +
    + +
    + + + +
    + + +
    + +
      + $row) : ?> + +
    1. +

      + + + - - {PHP internal code} - - - - -   —   - - - ( arguments ) -

      - - - + {PHP internal code} + + + + +   —   + + + ( arguments ) +
      +
      + + $value) : ?> - - - - - - -
      name : "#{$key}") ?>
      -
      - - () - - - - -   —   () - -

      - - - -
      - -
      - -
      2. - - -
    - -
    - - -
    - - + name : "#{$key}") ?> +
    + + + + +
    + + () + + + + +   —   () + +

    + + + +
    + +
    + +
    2. + + +
+ +
+ + +
+ + -

$

- - - - - - - - - - $value) : ?> - - - - - - -
KeyValue
- - - -
- -
- - - - - - -

Constants

- - - - - - - - - - $value) : ?> - - - - - - -
KeyValue
- - - -
- -
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PathgetUri()) ?>
HTTP MethodgetMethod())) ?>
IP AddressgetIPAddress()) ?>
Is AJAX Request?isAJAX() ? 'yes' : 'no' ?>
Is CLI Request?isCLI() ? 'yes' : 'no' ?>
Is Secure Request?isSecure() ? 'yes' : 'no' ?>
User AgentgetUserAgent()->getAgentString()) ?>
- - - - - $ + + + + + + + + + + $value) : ?> + + + + + + +
KeyValue
+ + + +
+ +
+ + + + + + +

Constants

+ + + + + + + + + + $value) : ?> + + + + + + +
KeyValue
+ + + +
+ +
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PathgetUri()) ?>
HTTP MethodgetMethod())) ?>
IP AddressgetIPAddress()) ?>
Is AJAX Request?isAJAX() ? 'yes' : 'no' ?>
Is CLI Request?isCLI() ? 'yes' : 'no' ?>
Is Secure Request?isSecure() ? 'yes' : 'no' ?>
User AgentgetUserAgent()->getAgentString()) ?>
+ + + + + - - -

$

- - - - - - - - - - $value) : ?> - - - - - - -
KeyValue
- - - -
- -
- - - - - -
- No $_GET, $_POST, or $_COOKIE Information to show. -
- - - - getHeaders(); ?> - - -

Headers

- - - - - - - - - - - + +

$

+ +
HeaderValue
+ + + + + + + + $value) : ?> + + + + + + +
KeyValue
+ + + +
+ +
+ + + + + +
+ No $_GET, $_POST, or $_COOKIE Information to show. +
+ + + + getHeaders(); ?> + + +

Headers

+ + + + + + + + + + + - - - - - - - - -
HeaderValue
getName(), 'html') ?>getValueLine(), 'html') ?>
- - -
- - - + + getName(), 'html') ?> + getValueLine(), 'html') ?> + + + + + + + +
+ + + setStatusCode(http_response_code()); ?> -
- - - - - -
Response StatusgetStatusCode() . ' - ' . $response->getReasonPhrase()) ?>
- - getHeaders(); ?> - - - -

Headers

- - - - - - - - - - $value) : ?> - - - - - - -
HeaderValue
getHeaderLine($name), 'html') ?>
- - -
- - -
- - -
    - -
    2. - -
-
- - -
- - - - - - - - - - - - - - - - -
Memory Usage
Peak Memory Usage:
Memory Limit:
- -
- -
- - - -
-
- -

- Displayed at — - PHP: — - CodeIgniter: -

- -
-
+
+ + + + + +
Response StatusgetStatusCode() . ' - ' . $response->getReasonPhrase()) ?>
+ + getHeaders(); ?> + + + +

Headers

+ + + + + + + + + + $value) : ?> + + + + + + +
HeaderValue
getHeaderLine($name), 'html') ?>
+ + +
+ + +
+ + +
    + +
    2. + +
+
+ + +
+ + + + + + + + + + + + + + + + +
Memory Usage
Peak Memory Usage:
Memory Limit:
+ +
+ + + + + +
+
+ +

+ Displayed at — + PHP: — + CodeIgniter: +

+ +
+
diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php index cca49c2ed9c3..9faa4a15b783 100644 --- a/app/Views/errors/html/production.php +++ b/app/Views/errors/html/production.php @@ -1,24 +1,24 @@ - - + + - Whoops! + Whoops! - + -
+
-

Whoops!

+

Whoops!

-

We seem to have hit a snag. Please try again later...

+

We seem to have hit a snag. Please try again later...

-
+
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index b982f58aa158..c66a9615c6be 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -1,229 +1,229 @@ - - Welcome to CodeIgniter 4! - - - - - - - + + Welcome to CodeIgniter 4! + + + + + + +
-
- -
- -
- -

Welcome to CodeIgniter

- -

The small framework with powerful features

- -
+
+ +
+ +
+ +

Welcome to CodeIgniter

+ +

The small framework with powerful features

+ +
@@ -231,91 +231,91 @@
-

About this page

+

About this page

-

The page you are looking at is being generated dynamically by CodeIgniter.

+

The page you are looking at is being generated dynamically by CodeIgniter.

-

If you would like to edit this page you will find it located at:

+

If you would like to edit this page you will find it located at:

- 
app/Views/welcome_message.php
+ 
app/Views/welcome_message.php
-

The corresponding controller for this page can be found at:

+

The corresponding controller for this page can be found at:

- 
app/Controllers/Home.php
+ 
app/Controllers/Home.php
-
+
-

Go further

+

Go further

-

- - Learn -

+

+ + Learn +

-

The User Guide contains an introduction, tutorial, a number of "how to" - guides, and then reference documentation for the components that make up - the framework. Check the User Guide !

+

The User Guide contains an introduction, tutorial, a number of "how to" + guides, and then reference documentation for the components that make up + the framework. Check the User Guide !

-

- - Discuss -

+

+ + Discuss +

-

CodeIgniter is a community-developed open source project, with several - venues for the community members to gather and exchange ideas. View all - the threads on CodeIgniter's forum, or chat on Slack !

+

CodeIgniter is a community-developed open source project, with several + venues for the community members to gather and exchange ideas. View all + the threads on CodeIgniter's forum, or chat on Slack !

-

- - Contribute -

+

+ + Contribute +

-

CodeIgniter is a community driven project and accepts contributions - of code and documentation from the community. Why not - - join us ?

+

CodeIgniter is a community driven project and accepts contributions + of code and documentation from the community. Why not + + join us ?

-
+
-
+
-

Page rendered in {elapsed_time} seconds

+

Page rendered in {elapsed_time} seconds

-

Environment:

+

Environment:

-
+
-
+
-

© CodeIgniter Foundation. CodeIgniter is open source project released under the MIT - open source licence.

+

© CodeIgniter Foundation. CodeIgniter is open source project released under the MIT + open source licence.

-
+
diff --git a/app/index.html b/app/index.html index b702fbc3967b..69df4e1dff68 100644 --- a/app/index.html +++ b/app/index.html @@ -1,7 +1,7 @@ - 403 Forbidden + 403 Forbidden diff --git a/system/Debug/Toolbar/Views/_config.tpl b/system/Debug/Toolbar/Views/_config.tpl index 3934cf62ebee..b6c7e0c3d86f 100644 --- a/system/Debug/Toolbar/Views/_config.tpl +++ b/system/Debug/Toolbar/Views/_config.tpl @@ -1,48 +1,48 @@

- Read the CodeIgniter docs... + Read the CodeIgniter docs...

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CodeIgniter Version:{ ciVersion }
PHP Version:{ phpVersion }
PHP SAPI:{ phpSAPI }
Environment:{ environment }
Base URL: - { if $baseURL == '' } -
- The $baseURL should always be set manually to prevent possible URL personification from external parties. -
- { else } - { baseURL } - { endif } -
Timezone:{ timezone }
Locale:{ locale }
Content Security Policy Enabled:{ if $cspEnabled } Yes { else } No { endif }
CodeIgniter Version:{ ciVersion }
PHP Version:{ phpVersion }
PHP SAPI:{ phpSAPI }
Environment:{ environment }
Base URL: + { if $baseURL == '' } +
+ The $baseURL should always be set manually to prevent possible URL personification from external parties. +
+ { else } + { baseURL } + { endif } +
Timezone:{ timezone }
Locale:{ locale }
Content Security Policy Enabled:{ if $cspEnabled } Yes { else } No { endif }
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js index 3bd05d5e9592..7805a99dda05 100644 --- a/system/Debug/Toolbar/Views/toolbar.js +++ b/system/Debug/Toolbar/Views/toolbar.js @@ -4,684 +4,684 @@ var ciDebugBar = { - toolbarContainer : null, - toolbar : null, - icon : null, - - init : function () { - this.toolbarContainer = document.getElementById('toolbarContainer'); - this.toolbar = document.getElementById('debug-bar'); - this.icon = document.getElementById('debug-icon'); - - ciDebugBar.createListeners(); - ciDebugBar.setToolbarState(); - ciDebugBar.setToolbarPosition(); - ciDebugBar.setToolbarTheme(); - ciDebugBar.toggleViewsHints(); - ciDebugBar.routerLink(); - - document.getElementById('debug-bar-link').addEventListener('click', ciDebugBar.toggleToolbar, true); - document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true); - - // Allows to highlight the row of the current history request - var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]'); - ciDebugBar.addClass(btn.parentNode.parentNode, 'current'); - - historyLoad = this.toolbar.getElementsByClassName('ci-history-load'); - - for (var i = 0; i < historyLoad.length; i++) - { - historyLoad[i].addEventListener('click', function () { - loadDoc(this.getAttribute('data-time')); - }, true); - } - - // Display the active Tab on page load - var tab = ciDebugBar.readCookie('debug-bar-tab'); - if (document.getElementById(tab)) - { - var el = document.getElementById(tab); - el.style.display = 'block'; - ciDebugBar.addClass(el, 'active'); - tab = document.querySelector('[data-tab=' + tab + ']'); - if (tab) - { - ciDebugBar.addClass(tab.parentNode, 'active'); - } - } - }, - - createListeners : function () { - var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a')); - - for (var i = 0; i < buttons.length; i++) - { - buttons[i].addEventListener('click', ciDebugBar.showTab, true); - } - - // Hook up generic toggle via data attributes `data-toggle="foo"` - var links = this.toolbar.querySelectorAll('[data-toggle]'); - for (var i = 0; i < links.length; i++) - { - links[i].addEventListener('click', ciDebugBar.toggleRows, true); - } - }, - - showTab: function () { - // Get the target tab, if any - var tab = document.getElementById(this.getAttribute('data-tab')); - - // If the label have not a tab stops here - if (! tab) - { - return; - } - - // Remove debug-bar-tab cookie - ciDebugBar.createCookie('debug-bar-tab', '', -1); - - // Check our current state. - var state = tab.style.display; - - // Hide all tabs - var tabs = document.querySelectorAll('#debug-bar .tab'); - - for (var i = 0; i < tabs.length; i++) - { - tabs[i].style.display = 'none'; - } - - // Mark all labels as inactive - var labels = document.querySelectorAll('#debug-bar .ci-label'); - - for (var i = 0; i < labels.length; i++) - { - ciDebugBar.removeClass(labels[i], 'active'); - } - - // Show/hide the selected tab - if (state != 'block') - { - tab.style.display = 'block'; - ciDebugBar.addClass(this.parentNode, 'active'); - // Create debug-bar-tab cookie to persistent state - ciDebugBar.createCookie('debug-bar-tab', this.getAttribute('data-tab'), 365); - } - }, - - addClass : function (el, className) { - if (el.classList) - { - el.classList.add(className); - } - else - { - el.className += ' ' + className; - } - }, - - removeClass : function (el, className) { - if (el.classList) - { - el.classList.remove(className); - } - else - { - el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); - } - }, - - /** - * Toggle display of another object based on - * the data-toggle value of this object - * - * @param event - */ - toggleRows : function(event) { - if(event.target) - { - let row = event.target.closest('tr'); - let target = document.getElementById(row.getAttribute('data-toggle')); - target.style.display = target.style.display === 'none' ? 'table-row' : 'none'; - } - }, - - /** - * Toggle display of a data table - * - * @param obj - */ - toggleDataTable : function (obj) { - if (typeof obj == 'string') - { - obj = document.getElementById(obj + '_table'); - } - - if (obj) - { - obj.style.display = obj.style.display === 'none' ? 'block' : 'none'; - } - }, - - /** - * Toggle display of timeline child elements - * - * @param obj - */ - toggleChildRows : function (obj) { - if (typeof obj == 'string') - { - par = document.getElementById(obj + '_parent') - obj = document.getElementById(obj + '_children'); - } - - if (par && obj) - { - obj.style.display = obj.style.display === 'none' ? '' : 'none'; - par.classList.toggle('timeline-parent-open'); - } - }, - - - //-------------------------------------------------------------------- - - /** - * Toggle tool bar from full to icon and icon to full - */ - toggleToolbar : function () { - var open = ciDebugBar.toolbar.style.display != 'none'; - - ciDebugBar.icon.style.display = open == true ? 'inline-block' : 'none'; - ciDebugBar.toolbar.style.display = open == false ? 'inline-block' : 'none'; - - // Remember it for other page loads on this site - ciDebugBar.createCookie('debug-bar-state', '', -1); - ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365); - }, - - /** - * Sets the initial state of the toolbar (open or minimized) when - * the page is first loaded to allow it to remember the state between refreshes. - */ - setToolbarState: function () { - var open = ciDebugBar.readCookie('debug-bar-state'); - - ciDebugBar.icon.style.display = open != 'open' ? 'inline-block' : 'none'; - ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none'; - }, - - toggleViewsHints: function () { - // Avoid toggle hints on history requests that are not the initial - if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new')) - { - var a = document.querySelector('a[data-tab="ci-views"]'); - a.href = '#'; - return; - } - - var nodeList = []; // [ Element, NewElement( 1 )/OldElement( 0 ) ] - var sortedComments = []; - var comments = []; - - var getComments = function () { - var nodes = []; - var result = []; - var xpathResults = document.evaluate( "//comment()[starts-with(., ' DEBUG-VIEW')]", document, null, XPathResult.ANY_TYPE, null); - var nextNode = xpathResults.iterateNext(); - while ( nextNode ) - { - nodes.push( nextNode ); - nextNode = xpathResults.iterateNext(); - } - - // sort comment by opening and closing tags - for (var i = 0; i < nodes.length; ++i) - { - // get file path + name to use as key - var path = nodes[i].nodeValue.substring( 18, nodes[i].nodeValue.length - 1 ); - - if ( nodes[i].nodeValue[12] === 'S' ) // simple check for start comment - { - // create new entry - result[path] = [ nodes[i], null ]; - } - else if (result[path]) - { - // add to existing entry - result[path][1] = nodes[i]; - } - } - - return result; - }; - - // find node that has TargetNode as parentNode - var getParentNode = function ( node, targetNode ) { - if ( node.parentNode === null ) - { - return null; - } - - if ( node.parentNode !== targetNode ) - { - return getParentNode( node.parentNode, targetNode ); - } - - return node; - }; - - // define invalid & outer ( also invalid ) elements - const INVALID_ELEMENTS = [ 'NOSCRIPT', 'SCRIPT', 'STYLE' ]; - const OUTER_ELEMENTS = [ 'HTML', 'BODY', 'HEAD' ]; - - var getValidElementInner = function ( node, reverse ) { - // handle invalid tags - if ( OUTER_ELEMENTS.indexOf( node.nodeName ) !== -1 ) - { - for (var i = 0; i < document.body.children.length; ++i) - { - var index = reverse ? document.body.children.length - ( i + 1 ) : i; - var element = document.body.children[index]; - - // skip invalid tags - if ( INVALID_ELEMENTS.indexOf( element.nodeName ) !== -1 ) - { - continue; - } - - return [ element, reverse ]; - } - - return null; - } - - // get to next valid element - while ( node !== null && INVALID_ELEMENTS.indexOf( node.nodeName ) !== -1 ) - { - node = reverse ? node.previousElementSibling : node.nextElementSibling; - } - - // return non array if we couldnt find something - if ( node === null ) - { - return null; - } - - return [ node, reverse ]; - }; - - // get next valid element ( to be safe to add divs ) - // @return [ element, skip element ] or null if we couldnt find a valid place - var getValidElement = function ( nodeElement ) { - if (nodeElement) - { - if ( nodeElement.nextElementSibling !== null ) - { - return getValidElementInner( nodeElement.nextElementSibling, false ) - || getValidElementInner( nodeElement.previousElementSibling, true ); - } - if ( nodeElement.previousElementSibling !== null ) - { - return getValidElementInner( nodeElement.previousElementSibling, true ); - } - } - - // something went wrong! -> element is not in DOM - return null; - }; - - function showHints() - { - // Had AJAX? Reset view blocks - sortedComments = getComments(); - - for (var key in sortedComments) - { - var startElement = getValidElement( sortedComments[key][0] ); - var endElement = getValidElement( sortedComments[key][1] ); - - // skip if we couldnt get a valid element - if ( startElement === null || endElement === null ) - { - continue; - } - - // find element which has same parent as startelement - var jointParent = getParentNode( endElement[0], startElement[0].parentNode ); - if ( jointParent === null ) - { - // find element which has same parent as endelement - jointParent = getParentNode( startElement[0], endElement[0].parentNode ); - if ( jointParent === null ) - { - // both tries failed - continue; - } - else - { - startElement[0] = jointParent; - } - } - else - { - endElement[0] = jointParent; - } - - var debugDiv = document.createElement( 'div' ); // holder - var debugPath = document.createElement( 'div' ); // path - var childArray = startElement[0].parentNode.childNodes; // target child array - var parent = startElement[0].parentNode; - var start, end; - - // setup container - debugDiv.classList.add( 'debug-view' ); - debugDiv.classList.add( 'show-view' ); - debugPath.classList.add( 'debug-view-path' ); - debugPath.innerText = key; - debugDiv.appendChild( debugPath ); - - // calc distance between them - // start - for (var i = 0; i < childArray.length; ++i) - { - // check for comment ( start & end ) -> if its before valid start element - if ( childArray[i] === sortedComments[key][1] || - childArray[i] === sortedComments[key][0] || - childArray[i] === startElement[0] ) - { - start = i; - if ( childArray[i] === sortedComments[key][0] ) - { - start++; // increase to skip the start comment - } - break; - } - } - // adjust if we want to skip the start element - if ( startElement[1] ) - { - start++; - } - - // end - for (var i = start; i < childArray.length; ++i) - { - if ( childArray[i] === endElement[0] ) - { - end = i; - // dont break to check for end comment after end valid element - } - else if ( childArray[i] === sortedComments[key][1] ) - { - // if we found the end comment, we can break - end = i; - break; - } - } - - // move elements - var number = end - start; - if ( endElement[1] ) - { - number++; - } - for (var i = 0; i < number; ++i) - { - if ( INVALID_ELEMENTS.indexOf( childArray[start] ) !== -1 ) - { - // skip invalid childs that can cause problems if moved - start++; - continue; - } - debugDiv.appendChild( childArray[start] ); - } - - // add container to DOM - nodeList.push( parent.insertBefore( debugDiv, childArray[start] ) ); - } - - ciDebugBar.createCookie('debug-view', 'show', 365); - ciDebugBar.addClass(btn, 'active'); - } - - function hideHints() - { - for (var i = 0; i < nodeList.length; ++i) - { - var index; - - // find index - for (var j = 0; j < nodeList[i].parentNode.childNodes.length; ++j) - { - if ( nodeList[i].parentNode.childNodes[j] === nodeList[i] ) - { - index = j; - break; - } - } - - // move child back - while ( nodeList[i].childNodes.length !== 1 ) - { - nodeList[i].parentNode.insertBefore( nodeList[i].childNodes[1], nodeList[i].parentNode.childNodes[index].nextSibling ); - index++; - } - - nodeList[i].parentNode.removeChild( nodeList[i] ); - } - nodeList.length = 0; - - ciDebugBar.createCookie('debug-view', '', -1); - ciDebugBar.removeClass(btn, 'active'); - } - - var btn = document.querySelector('[data-tab=ci-views]'); - - // If the Views Collector is inactive stops here - if (! btn) - { - return; - } - - btn.parentNode.onclick = function () { - if (ciDebugBar.readCookie('debug-view')) - { - hideHints(); - } - else - { - showHints(); - } - }; - - // Determine Hints state on page load - if (ciDebugBar.readCookie('debug-view')) - { - showHints(); - } - }, - - setToolbarPosition: function () { - var btnPosition = this.toolbar.querySelector('#toolbar-position'); - - if (ciDebugBar.readCookie('debug-bar-position') === 'top') - { - ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top'); - ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top'); - } - - btnPosition.addEventListener('click', function () { - var position = ciDebugBar.readCookie('debug-bar-position'); - - ciDebugBar.createCookie('debug-bar-position', '', -1); - - if (!position || position === 'bottom') - { - ciDebugBar.createCookie('debug-bar-position', 'top', 365); - ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top'); - ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top'); - } - else - { - ciDebugBar.createCookie('debug-bar-position', 'bottom', 365); - ciDebugBar.removeClass(ciDebugBar.icon, 'fixed-top'); - ciDebugBar.removeClass(ciDebugBar.toolbar, 'fixed-top'); - } - }, true); - }, - - setToolbarTheme: function () { - var btnTheme = this.toolbar.querySelector('#toolbar-theme'); - var isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches; - var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches; - - // If a cookie is set with a value, we force the color scheme - if (ciDebugBar.readCookie('debug-bar-theme') === 'dark') - { - ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light'); - ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark'); - } - else if (ciDebugBar.readCookie('debug-bar-theme') === 'light') - { - ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); - ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); - } - - btnTheme.addEventListener('click', function () { - var theme = ciDebugBar.readCookie('debug-bar-theme'); - - if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches) - { - // If there is no cookie, and "prefers-color-scheme" is set to "dark" - // It means that the user wants to switch to light mode - ciDebugBar.createCookie('debug-bar-theme', 'light', 365); - ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); - ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); - } - else - { - if (theme === 'dark') - { - ciDebugBar.createCookie('debug-bar-theme', 'light', 365); - ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); - ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); - } - else - { - // In any other cases: if there is no cookie, or the cookie is set to - // "light", or the "prefers-color-scheme" is "light"... - ciDebugBar.createCookie('debug-bar-theme', 'dark', 365); - ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light'); - ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark'); - } - } - }, true); - }, - - /** - * Helper to create a cookie. - * - * @param name - * @param value - * @param days - */ - createCookie : function (name,value,days) { - if (days) - { - var date = new Date(); - - date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); - - var expires = "; expires=" + date.toGMTString(); - } - else - { - var expires = ""; - } - - document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax"; - }, - - readCookie : function (name) { - var nameEQ = name + "="; - var ca = document.cookie.split(';'); - - for (var i = 0; i < ca.length; i++) - { - var c = ca[i]; - while (c.charAt(0) == ' ') - { - c = c.substring(1,c.length); - } - if (c.indexOf(nameEQ) == 0) - { - return c.substring(nameEQ.length,c.length); - } - } - return null; - }, - - trimSlash: function (text) { - return text.replace(/^\/|\/$/g, ''); - }, - - routerLink: function () { - var row, _location; - var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]'); - var patt = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/; - - for (var i = 0; i < rowGet.length; i++) - { - row = rowGet[i]; - if (!/\/\(.+?\)/.test(rowGet[i].innerText)) - { - row.style = 'cursor: pointer;'; - row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText)); - row.addEventListener('click', function (ev) { - _location = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText); - var redirectWindow = window.open(_location, '_blank'); - redirectWindow.location; - }); - } - else - { - row.innerHTML = '
' + row.innerText + '
' - + '
' - + row.innerText.replace(patt, '') - + '' - + '
'; - } - } - - rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form'); - for (var i = 0; i < rowGet.length; i++) - { - row = rowGet[i]; - - row.addEventListener('submit', function (event) { - event.preventDefault() - var inputArray = [], t = 0; - var input = event.target.querySelectorAll('input[type=text]'); - var tpl = event.target.getAttribute('data-debugbar-route-tpl'); - - for (var n = 0; n < input.length; n++) - { - if (input[n].value.length > 0) - { - inputArray.push(input[n].value); - } - } - - if (inputArray.length > 0) - { - _location = location.origin + '/' + tpl.replace(/\?/g, function () { - return inputArray[t++] - }); - - var redirectWindow = window.open(_location, '_blank'); - redirectWindow.location; - } - }) - } - } + toolbarContainer : null, + toolbar : null, + icon : null, + + init : function () { + this.toolbarContainer = document.getElementById('toolbarContainer'); + this.toolbar = document.getElementById('debug-bar'); + this.icon = document.getElementById('debug-icon'); + + ciDebugBar.createListeners(); + ciDebugBar.setToolbarState(); + ciDebugBar.setToolbarPosition(); + ciDebugBar.setToolbarTheme(); + ciDebugBar.toggleViewsHints(); + ciDebugBar.routerLink(); + + document.getElementById('debug-bar-link').addEventListener('click', ciDebugBar.toggleToolbar, true); + document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true); + + // Allows to highlight the row of the current history request + var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]'); + ciDebugBar.addClass(btn.parentNode.parentNode, 'current'); + + historyLoad = this.toolbar.getElementsByClassName('ci-history-load'); + + for (var i = 0; i < historyLoad.length; i++) + { + historyLoad[i].addEventListener('click', function () { + loadDoc(this.getAttribute('data-time')); + }, true); + } + + // Display the active Tab on page load + var tab = ciDebugBar.readCookie('debug-bar-tab'); + if (document.getElementById(tab)) + { + var el = document.getElementById(tab); + el.style.display = 'block'; + ciDebugBar.addClass(el, 'active'); + tab = document.querySelector('[data-tab=' + tab + ']'); + if (tab) + { + ciDebugBar.addClass(tab.parentNode, 'active'); + } + } + }, + + createListeners : function () { + var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a')); + + for (var i = 0; i < buttons.length; i++) + { + buttons[i].addEventListener('click', ciDebugBar.showTab, true); + } + + // Hook up generic toggle via data attributes `data-toggle="foo"` + var links = this.toolbar.querySelectorAll('[data-toggle]'); + for (var i = 0; i < links.length; i++) + { + links[i].addEventListener('click', ciDebugBar.toggleRows, true); + } + }, + + showTab: function () { + // Get the target tab, if any + var tab = document.getElementById(this.getAttribute('data-tab')); + + // If the label have not a tab stops here + if (! tab) + { + return; + } + + // Remove debug-bar-tab cookie + ciDebugBar.createCookie('debug-bar-tab', '', -1); + + // Check our current state. + var state = tab.style.display; + + // Hide all tabs + var tabs = document.querySelectorAll('#debug-bar .tab'); + + for (var i = 0; i < tabs.length; i++) + { + tabs[i].style.display = 'none'; + } + + // Mark all labels as inactive + var labels = document.querySelectorAll('#debug-bar .ci-label'); + + for (var i = 0; i < labels.length; i++) + { + ciDebugBar.removeClass(labels[i], 'active'); + } + + // Show/hide the selected tab + if (state != 'block') + { + tab.style.display = 'block'; + ciDebugBar.addClass(this.parentNode, 'active'); + // Create debug-bar-tab cookie to persistent state + ciDebugBar.createCookie('debug-bar-tab', this.getAttribute('data-tab'), 365); + } + }, + + addClass : function (el, className) { + if (el.classList) + { + el.classList.add(className); + } + else + { + el.className += ' ' + className; + } + }, + + removeClass : function (el, className) { + if (el.classList) + { + el.classList.remove(className); + } + else + { + el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' '); + } + }, + + /** + * Toggle display of another object based on + * the data-toggle value of this object + * + * @param event + */ + toggleRows : function(event) { + if(event.target) + { + let row = event.target.closest('tr'); + let target = document.getElementById(row.getAttribute('data-toggle')); + target.style.display = target.style.display === 'none' ? 'table-row' : 'none'; + } + }, + + /** + * Toggle display of a data table + * + * @param obj + */ + toggleDataTable : function (obj) { + if (typeof obj == 'string') + { + obj = document.getElementById(obj + '_table'); + } + + if (obj) + { + obj.style.display = obj.style.display === 'none' ? 'block' : 'none'; + } + }, + + /** + * Toggle display of timeline child elements + * + * @param obj + */ + toggleChildRows : function (obj) { + if (typeof obj == 'string') + { + par = document.getElementById(obj + '_parent') + obj = document.getElementById(obj + '_children'); + } + + if (par && obj) + { + obj.style.display = obj.style.display === 'none' ? '' : 'none'; + par.classList.toggle('timeline-parent-open'); + } + }, + + + //-------------------------------------------------------------------- + + /** + * Toggle tool bar from full to icon and icon to full + */ + toggleToolbar : function () { + var open = ciDebugBar.toolbar.style.display != 'none'; + + ciDebugBar.icon.style.display = open == true ? 'inline-block' : 'none'; + ciDebugBar.toolbar.style.display = open == false ? 'inline-block' : 'none'; + + // Remember it for other page loads on this site + ciDebugBar.createCookie('debug-bar-state', '', -1); + ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365); + }, + + /** + * Sets the initial state of the toolbar (open or minimized) when + * the page is first loaded to allow it to remember the state between refreshes. + */ + setToolbarState: function () { + var open = ciDebugBar.readCookie('debug-bar-state'); + + ciDebugBar.icon.style.display = open != 'open' ? 'inline-block' : 'none'; + ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none'; + }, + + toggleViewsHints: function () { + // Avoid toggle hints on history requests that are not the initial + if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new')) + { + var a = document.querySelector('a[data-tab="ci-views"]'); + a.href = '#'; + return; + } + + var nodeList = []; // [ Element, NewElement( 1 )/OldElement( 0 ) ] + var sortedComments = []; + var comments = []; + + var getComments = function () { + var nodes = []; + var result = []; + var xpathResults = document.evaluate( "//comment()[starts-with(., ' DEBUG-VIEW')]", document, null, XPathResult.ANY_TYPE, null); + var nextNode = xpathResults.iterateNext(); + while ( nextNode ) + { + nodes.push( nextNode ); + nextNode = xpathResults.iterateNext(); + } + + // sort comment by opening and closing tags + for (var i = 0; i < nodes.length; ++i) + { + // get file path + name to use as key + var path = nodes[i].nodeValue.substring( 18, nodes[i].nodeValue.length - 1 ); + + if ( nodes[i].nodeValue[12] === 'S' ) // simple check for start comment + { + // create new entry + result[path] = [ nodes[i], null ]; + } + else if (result[path]) + { + // add to existing entry + result[path][1] = nodes[i]; + } + } + + return result; + }; + + // find node that has TargetNode as parentNode + var getParentNode = function ( node, targetNode ) { + if ( node.parentNode === null ) + { + return null; + } + + if ( node.parentNode !== targetNode ) + { + return getParentNode( node.parentNode, targetNode ); + } + + return node; + }; + + // define invalid & outer ( also invalid ) elements + const INVALID_ELEMENTS = [ 'NOSCRIPT', 'SCRIPT', 'STYLE' ]; + const OUTER_ELEMENTS = [ 'HTML', 'BODY', 'HEAD' ]; + + var getValidElementInner = function ( node, reverse ) { + // handle invalid tags + if ( OUTER_ELEMENTS.indexOf( node.nodeName ) !== -1 ) + { + for (var i = 0; i < document.body.children.length; ++i) + { + var index = reverse ? document.body.children.length - ( i + 1 ) : i; + var element = document.body.children[index]; + + // skip invalid tags + if ( INVALID_ELEMENTS.indexOf( element.nodeName ) !== -1 ) + { + continue; + } + + return [ element, reverse ]; + } + + return null; + } + + // get to next valid element + while ( node !== null && INVALID_ELEMENTS.indexOf( node.nodeName ) !== -1 ) + { + node = reverse ? node.previousElementSibling : node.nextElementSibling; + } + + // return non array if we couldnt find something + if ( node === null ) + { + return null; + } + + return [ node, reverse ]; + }; + + // get next valid element ( to be safe to add divs ) + // @return [ element, skip element ] or null if we couldnt find a valid place + var getValidElement = function ( nodeElement ) { + if (nodeElement) + { + if ( nodeElement.nextElementSibling !== null ) + { + return getValidElementInner( nodeElement.nextElementSibling, false ) + || getValidElementInner( nodeElement.previousElementSibling, true ); + } + if ( nodeElement.previousElementSibling !== null ) + { + return getValidElementInner( nodeElement.previousElementSibling, true ); + } + } + + // something went wrong! -> element is not in DOM + return null; + }; + + function showHints() + { + // Had AJAX? Reset view blocks + sortedComments = getComments(); + + for (var key in sortedComments) + { + var startElement = getValidElement( sortedComments[key][0] ); + var endElement = getValidElement( sortedComments[key][1] ); + + // skip if we couldnt get a valid element + if ( startElement === null || endElement === null ) + { + continue; + } + + // find element which has same parent as startelement + var jointParent = getParentNode( endElement[0], startElement[0].parentNode ); + if ( jointParent === null ) + { + // find element which has same parent as endelement + jointParent = getParentNode( startElement[0], endElement[0].parentNode ); + if ( jointParent === null ) + { + // both tries failed + continue; + } + else + { + startElement[0] = jointParent; + } + } + else + { + endElement[0] = jointParent; + } + + var debugDiv = document.createElement( 'div' ); // holder + var debugPath = document.createElement( 'div' ); // path + var childArray = startElement[0].parentNode.childNodes; // target child array + var parent = startElement[0].parentNode; + var start, end; + + // setup container + debugDiv.classList.add( 'debug-view' ); + debugDiv.classList.add( 'show-view' ); + debugPath.classList.add( 'debug-view-path' ); + debugPath.innerText = key; + debugDiv.appendChild( debugPath ); + + // calc distance between them + // start + for (var i = 0; i < childArray.length; ++i) + { + // check for comment ( start & end ) -> if its before valid start element + if ( childArray[i] === sortedComments[key][1] || + childArray[i] === sortedComments[key][0] || + childArray[i] === startElement[0] ) + { + start = i; + if ( childArray[i] === sortedComments[key][0] ) + { + start++; // increase to skip the start comment + } + break; + } + } + // adjust if we want to skip the start element + if ( startElement[1] ) + { + start++; + } + + // end + for (var i = start; i < childArray.length; ++i) + { + if ( childArray[i] === endElement[0] ) + { + end = i; + // dont break to check for end comment after end valid element + } + else if ( childArray[i] === sortedComments[key][1] ) + { + // if we found the end comment, we can break + end = i; + break; + } + } + + // move elements + var number = end - start; + if ( endElement[1] ) + { + number++; + } + for (var i = 0; i < number; ++i) + { + if ( INVALID_ELEMENTS.indexOf( childArray[start] ) !== -1 ) + { + // skip invalid childs that can cause problems if moved + start++; + continue; + } + debugDiv.appendChild( childArray[start] ); + } + + // add container to DOM + nodeList.push( parent.insertBefore( debugDiv, childArray[start] ) ); + } + + ciDebugBar.createCookie('debug-view', 'show', 365); + ciDebugBar.addClass(btn, 'active'); + } + + function hideHints() + { + for (var i = 0; i < nodeList.length; ++i) + { + var index; + + // find index + for (var j = 0; j < nodeList[i].parentNode.childNodes.length; ++j) + { + if ( nodeList[i].parentNode.childNodes[j] === nodeList[i] ) + { + index = j; + break; + } + } + + // move child back + while ( nodeList[i].childNodes.length !== 1 ) + { + nodeList[i].parentNode.insertBefore( nodeList[i].childNodes[1], nodeList[i].parentNode.childNodes[index].nextSibling ); + index++; + } + + nodeList[i].parentNode.removeChild( nodeList[i] ); + } + nodeList.length = 0; + + ciDebugBar.createCookie('debug-view', '', -1); + ciDebugBar.removeClass(btn, 'active'); + } + + var btn = document.querySelector('[data-tab=ci-views]'); + + // If the Views Collector is inactive stops here + if (! btn) + { + return; + } + + btn.parentNode.onclick = function () { + if (ciDebugBar.readCookie('debug-view')) + { + hideHints(); + } + else + { + showHints(); + } + }; + + // Determine Hints state on page load + if (ciDebugBar.readCookie('debug-view')) + { + showHints(); + } + }, + + setToolbarPosition: function () { + var btnPosition = this.toolbar.querySelector('#toolbar-position'); + + if (ciDebugBar.readCookie('debug-bar-position') === 'top') + { + ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top'); + ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top'); + } + + btnPosition.addEventListener('click', function () { + var position = ciDebugBar.readCookie('debug-bar-position'); + + ciDebugBar.createCookie('debug-bar-position', '', -1); + + if (!position || position === 'bottom') + { + ciDebugBar.createCookie('debug-bar-position', 'top', 365); + ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top'); + ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top'); + } + else + { + ciDebugBar.createCookie('debug-bar-position', 'bottom', 365); + ciDebugBar.removeClass(ciDebugBar.icon, 'fixed-top'); + ciDebugBar.removeClass(ciDebugBar.toolbar, 'fixed-top'); + } + }, true); + }, + + setToolbarTheme: function () { + var btnTheme = this.toolbar.querySelector('#toolbar-theme'); + var isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches; + var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches; + + // If a cookie is set with a value, we force the color scheme + if (ciDebugBar.readCookie('debug-bar-theme') === 'dark') + { + ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light'); + ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark'); + } + else if (ciDebugBar.readCookie('debug-bar-theme') === 'light') + { + ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); + ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); + } + + btnTheme.addEventListener('click', function () { + var theme = ciDebugBar.readCookie('debug-bar-theme'); + + if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches) + { + // If there is no cookie, and "prefers-color-scheme" is set to "dark" + // It means that the user wants to switch to light mode + ciDebugBar.createCookie('debug-bar-theme', 'light', 365); + ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); + ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); + } + else + { + if (theme === 'dark') + { + ciDebugBar.createCookie('debug-bar-theme', 'light', 365); + ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark'); + ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light'); + } + else + { + // In any other cases: if there is no cookie, or the cookie is set to + // "light", or the "prefers-color-scheme" is "light"... + ciDebugBar.createCookie('debug-bar-theme', 'dark', 365); + ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light'); + ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark'); + } + } + }, true); + }, + + /** + * Helper to create a cookie. + * + * @param name + * @param value + * @param days + */ + createCookie : function (name,value,days) { + if (days) + { + var date = new Date(); + + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + + var expires = "; expires=" + date.toGMTString(); + } + else + { + var expires = ""; + } + + document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax"; + }, + + readCookie : function (name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + + for (var i = 0; i < ca.length; i++) + { + var c = ca[i]; + while (c.charAt(0) == ' ') + { + c = c.substring(1,c.length); + } + if (c.indexOf(nameEQ) == 0) + { + return c.substring(nameEQ.length,c.length); + } + } + return null; + }, + + trimSlash: function (text) { + return text.replace(/^\/|\/$/g, ''); + }, + + routerLink: function () { + var row, _location; + var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]'); + var patt = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/; + + for (var i = 0; i < rowGet.length; i++) + { + row = rowGet[i]; + if (!/\/\(.+?\)/.test(rowGet[i].innerText)) + { + row.style = 'cursor: pointer;'; + row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText)); + row.addEventListener('click', function (ev) { + _location = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText); + var redirectWindow = window.open(_location, '_blank'); + redirectWindow.location; + }); + } + else + { + row.innerHTML = '
' + row.innerText + '
' + + '
' + + row.innerText.replace(patt, '') + + '' + + '
'; + } + } + + rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form'); + for (var i = 0; i < rowGet.length; i++) + { + row = rowGet[i]; + + row.addEventListener('submit', function (event) { + event.preventDefault() + var inputArray = [], t = 0; + var input = event.target.querySelectorAll('input[type=text]'); + var tpl = event.target.getAttribute('data-debugbar-route-tpl'); + + for (var n = 0; n < input.length; n++) + { + if (input[n].value.length > 0) + { + inputArray.push(input[n].value); + } + } + + if (inputArray.length > 0) + { + _location = location.origin + '/' + tpl.replace(/\?/g, function () { + return inputArray[t++] + }); + + var redirectWindow = window.open(_location, '_blank'); + redirectWindow.location; + } + }) + } + } }; diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 077fc9f070ba..0e73076f0e02 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -19,250 +19,250 @@ */ ?>
-
- ↕ - 🔅 - - - - ms   MB - - +
+ ↕ + 🔅 + + + + ms   MB + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - Vars - - + + + + Vars + + -

- - - - - - -

+

+ + + + + + +

- - - - -
+ + + + +
- -
- - - - - - - - - - - - - renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?> - -
NAMECOMPONENTDURATION ms
-
+ +
+ + + + + + + + + + + + + renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?> + +
NAMECOMPONENTDURATION ms
+
- - - - -
-

+ + + + +
+

- setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?> -
- - - + setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?> +
+ + + - -
+ +
- - - $items) : ?> + + + $items) : ?> - -

- + +

+ - + - - - $value) : ?> - - - - - - -
+ + + $value) : ?> + + + + + + +
- -

No data to display.

- - - + +

No data to display.

+ + + - - -

Session User Data

- + + +

Session User Data

+ - - - - - $value) : ?> - - - - - - -
- -

No data to display.

- - -

Session doesn't seem to be active.

- + + + + + $value) : ?> + + + + + + +
+ +

No data to display.

+ + +

Session doesn't seem to be active.

+ -

Request ( )

+

Request ( )

- - -

$_GET

- + + +

$_GET

+ - - - $value) : ?> - - - - - - -
- + + + $value) : ?> + + + + + + +
+ - - -

$_POST

- + + +

$_POST

+ - - - $value) : ?> - - - - - - -
- + + + $value) : ?> + + + + + + +
+ - - -

Headers

- + + +

Headers

+ - - - $value) : ?> - - - - - - -
- + + + $value) : ?> + + + + + + +
+ - - -

Cookies

- + + +

Cookies

+ - - - $value) : ?> - - - - - - - - + + + $value) : ?> + + + + + + + + -

Response - ( ) -

+

Response + ( ) +

- - -

Headers

- + + +

Headers

+ - - - $value) : ?> - - - - - - -
- -
+ + + $value) : ?> + + + + + + +
+ +
- -
-

System Configuration

+ +
+

System Configuration

- setData($config)->render('_config.tpl') ?> -
+ setData($config)->render('_config.tpl') ?> +
+ + + +
+ +

+ +

+ +
+ + + + From 4fc4b12a9d7312bf6780da8829130fdea7618399 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Wed, 6 Jul 2022 07:51:29 +0200 Subject: [PATCH 0776/8282] Update production.php --- app/Views/errors/html/production.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php index 9faa4a15b783..b6964026150d 100644 --- a/app/Views/errors/html/production.php +++ b/app/Views/errors/html/production.php @@ -4,7 +4,7 @@ - Whoops! + <?= lang('Errors.whoops') ?> - - - -
- -

- -

- -
- - - - + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +// Errors language settings +return [ + 'whoops' => 'Whoops!', + 'weHitASnag' => 'We seem to have hit a snag. Please try again later...', +]; From cb351810c20ca11f755a8b5b959f9bf42449902b Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Wed, 6 Jul 2022 12:15:10 +0200 Subject: [PATCH 0778/8282] Update production.php fix indentation --- app/Views/errors/html/production.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php index b6964026150d..2a26d767fd61 100644 --- a/app/Views/errors/html/production.php +++ b/app/Views/errors/html/production.php @@ -12,13 +12,13 @@ -
+
-

+

-

+

-
+
From ea17779800d177cad3862456cd86a593eecf0f84 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Wed, 6 Jul 2022 12:18:08 +0200 Subject: [PATCH 0779/8282] Update production.php remove obsolete type="text/css" attribute --- app/Views/errors/html/production.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php index 2a26d767fd61..2f59a8de1bc7 100644 --- a/app/Views/errors/html/production.php +++ b/app/Views/errors/html/production.php @@ -6,7 +6,7 @@ <?= lang('Errors.whoops') ?> - From ffa88d2fc82daa772bd86039244b37ea781fc566 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 7 Jul 2022 14:27:23 +0900 Subject: [PATCH 0780/8282] docs: add note about the status code for set404Override() --- user_guide_src/source/incoming/routing.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 4496057a5247..a92eaa7d54f9 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -519,6 +519,11 @@ a valid class/method pair, just like you would show in any route, or a Closure: .. literalinclude:: routing/051.php +.. note:: The ``set404Override()`` method does not change the Response status code to ``404``. + If you don't set the status code in the controller you set, the default status code ``200`` + will be returned. See :php:func:`Response::setStatusCode() ` for + information on how to set the status code. + Route processing by priority ============================ From 40c0e92ae2d3467d0557d3790875f306cb6b01ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:04:54 +0000 Subject: [PATCH 0781/8282] build(deps-dev): update rector/rector requirement from 0.13.7 to 0.13.8 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.13.7...0.13.8) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7520948f965b..8ad8b1e91a9f 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpstan/phpstan": "^1.7.1", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.13.7" + "rector/rector": "0.13.8" }, "suggest": { "ext-fileinfo": "Improves mime type detection for files" From 85563a325988ca81d0b82a31ed52b1a795aa9692 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 8 Jul 2022 00:10:58 +0700 Subject: [PATCH 0782/8282] re-run rector for remove just variabel used for assign variable --- system/HTTP/URI.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index e0a6ff9f2386..7634b415ec7e 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -661,10 +661,8 @@ public function setAuthority(string $str) */ public function setScheme(string $str) { - $str = strtolower($str); - $str = preg_replace('#:(//)?$#', '', $str); - - $this->scheme = $str; + $str = strtolower($str); + $this->scheme = preg_replace('#:(//)?$#', '', $str); return $this; } @@ -932,8 +930,7 @@ protected function applyParts(array $parts) // Port if (isset($parts['port']) && $parts['port'] !== null) { // Valid port numbers are enforced by earlier parse_url or setPort() - $port = $parts['port']; - $this->port = $port; + $this->port = $parts['port']; } if (isset($parts['pass'])) { From ca9d244517e152d54c3da0dca2de905a06eeb42b Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 8 Jul 2022 10:25:24 +0900 Subject: [PATCH 0783/8282] test: add test case --- .../Validation/StrictRules/ValidationTest.php | 14 ++++++++++---- tests/system/Validation/ValidationTest.php | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php index 865d3a026d9c..1e2e8a97ecc8 100644 --- a/tests/system/Validation/StrictRules/ValidationTest.php +++ b/tests/system/Validation/StrictRules/ValidationTest.php @@ -202,17 +202,23 @@ public function testRunReturnsLocalizedErrors(): void public function testRunWithCustomErrors(): void { - $data = ['foo' => 'notanumber']; - + $data = [ + 'foo' => 'notanumber', + 'bar' => 'notanumber', + ]; $messages = [ 'foo' => [ 'is_numeric' => 'Nope. Not a number.', ], + 'bar' => [ + 'is_numeric' => 'No. Not a number.', + ], ]; - - $this->validation->setRules(['foo' => 'is_numeric'], $messages); + $this->validation->setRules(['foo' => 'is_numeric', 'bar' => 'is_numeric'], $messages); $this->validation->run($data); + $this->assertSame('Nope. Not a number.', $this->validation->getError('foo')); + $this->assertSame('No. Not a number.', $this->validation->getError('bar')); } public function testCheck(): void diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index c43b7d997d88..05f07aae58de 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -305,17 +305,23 @@ public function testRunReturnsLocalizedErrors(): void public function testRunWithCustomErrors(): void { - $data = ['foo' => 'notanumber']; - + $data = [ + 'foo' => 'notanumber', + 'bar' => 'notanumber', + ]; $messages = [ 'foo' => [ 'is_numeric' => 'Nope. Not a number.', ], + 'bar' => [ + 'is_numeric' => 'No. Not a number.', + ], ]; - - $this->validation->setRules(['foo' => 'is_numeric'], $messages); + $this->validation->setRules(['foo' => 'is_numeric', 'bar' => 'is_numeric'], $messages); $this->validation->run($data); + $this->assertSame('Nope. Not a number.', $this->validation->getError('foo')); + $this->assertSame('No. Not a number.', $this->validation->getError('bar')); } public function testCheck(): void From 8baf85fa3651d8311c18d9c77711495510cf2416 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 8 Jul 2022 10:43:16 +0900 Subject: [PATCH 0784/8282] fix: custom validation error is cleared when calling setRule() twice --- system/Validation/Validation.php | 2 +- .../Validation/StrictRules/ValidationTest.php | 27 +++++++++++++++++++ tests/system/Validation/ValidationTest.php | 27 +++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index eb91114ca218..2b190ef2963a 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -399,7 +399,7 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [ $ruleSet[$field]['errors'] = $errors; } - $this->setRules($ruleSet + $this->getRules()); + $this->setRules($ruleSet + $this->getRules(), $this->customErrors); return $this; } diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php index 1e2e8a97ecc8..ba0e8c6ec0c5 100644 --- a/tests/system/Validation/StrictRules/ValidationTest.php +++ b/tests/system/Validation/StrictRules/ValidationTest.php @@ -221,6 +221,33 @@ public function testRunWithCustomErrors(): void $this->assertSame('No. Not a number.', $this->validation->getError('bar')); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/6239 + */ + public function testSetRuleWithCustomErrors(): void + { + $data = [ + 'foo' => 'notanumber', + 'bar' => 'notanumber', + ]; + $this->validation->setRule( + 'foo', + 'Foo', + ['foo' => 'is_numeric'], + ['is_numeric' => 'Nope. Not a number.'] + ); + $this->validation->setRule( + 'bar', + 'Bar', + ['bar' => 'is_numeric'], + ['is_numeric' => 'Nope. Not a number.'] + ); + $this->validation->run($data); + + $this->assertSame('Nope. Not a number.', $this->validation->getError('foo')); + $this->assertSame('Nope. Not a number.', $this->validation->getError('bar')); + } + public function testCheck(): void { $this->assertFalse($this->validation->check('notanumber', 'is_numeric')); diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index 05f07aae58de..867dd6475d8e 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -324,6 +324,33 @@ public function testRunWithCustomErrors(): void $this->assertSame('No. Not a number.', $this->validation->getError('bar')); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/6239 + */ + public function testSetRuleWithCustomErrors(): void + { + $data = [ + 'foo' => 'notanumber', + 'bar' => 'notanumber', + ]; + $this->validation->setRule( + 'foo', + 'Foo', + ['foo' => 'is_numeric'], + ['is_numeric' => 'Nope. Not a number.'] + ); + $this->validation->setRule( + 'bar', + 'Bar', + ['bar' => 'is_numeric'], + ['is_numeric' => 'Nope. Not a number.'] + ); + $this->validation->run($data); + + $this->assertSame('Nope. Not a number.', $this->validation->getError('foo')); + $this->assertSame('Nope. Not a number.', $this->validation->getError('bar')); + } + public function testCheck(): void { $this->assertFalse($this->validation->check('notanumber', 'is_numeric')); From d6a2327f5a1b70c9197521b5ea6bc60d49a26e6f Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Fri, 8 Jul 2022 15:31:54 +0800 Subject: [PATCH 0785/8282] Fix: Validation. Leading asterisk. --- system/Validation/Validation.php | 6 ++++-- tests/system/Validation/ValidationTest.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index eb91114ca218..61fbb60e7bdd 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -147,7 +147,9 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup if (strpos($field, '*') !== false) { $values = array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match( - '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/', + '/^' + . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/')) + . '$/', $key ), ARRAY_FILTER_USE_KEY); // if keys not found @@ -657,7 +659,7 @@ public function getError(?string $field = null): string } $errors = array_filter($this->getErrors(), static fn ($key) => preg_match( - '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/', + '/^' . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/')) . '$/', $key ), ARRAY_FILTER_USE_KEY); diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index c43b7d997d88..530205243976 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -1098,6 +1098,12 @@ public function validationArrayDataCaseProvider(): iterable ['foo' => ['boz']], ]], ]; + + yield 'leading-asterisk' => [ + true, + ['*.foo' => 'required'], + [['foo' => 'bar']], + ]; } /** @@ -1324,4 +1330,17 @@ public function testNestedArrayThrowsException(): void 'beneficiaries_accounts.account_2.purpose' => 'The PURPOSE field must be at least 3 characters in length.', ], $this->validation->getErrors()); } + + public function testRuleWithLeadingAsterisk(): void + { + $data = [ + ['foo' => 1], + ['foo' => null], + ]; + + $this->validation->setRules(['*.foo' => 'required'], ['1.foo' => ['required' => 'Required {field}']]); + + $this->assertFalse($this->validation->run($data)); + $this->assertSame('Required *.foo', $this->validation->getError('*.foo')); + } } From 770d5a1206973e97a104317540ac6ca425c8876c Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Fri, 8 Jul 2022 15:36:54 +0800 Subject: [PATCH 0786/8282] Fix: Validation. Leading asterisk. --- user_guide_src/source/changelogs/v4.2.2.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.2.2.rst b/user_guide_src/source/changelogs/v4.2.2.rst index 45fbeb205d54..eb457750e7c5 100644 --- a/user_guide_src/source/changelogs/v4.2.2.rst +++ b/user_guide_src/source/changelogs/v4.2.2.rst @@ -25,6 +25,7 @@ Changes ******* - Fixed: ``BaseBuilder::increment()`` and ``BaseBuilder::decrement()`` do not reset the ``BaseBuilder`` state after a query. +- Fixed: Validation of fields with a leading asterisk (wildcard). - Now ``CLIRequest::isCLI()`` always returns true. - Now ``IncommingRequest::isCLI()`` always returns false. From ed6c368e8a4a0b94fda5cf720cc7cbc2b7dd9a45 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 1 Jul 2022 16:11:52 -0700 Subject: [PATCH 0787/8282] rework SQLite Connection::_getIndexData() and add/fix tests --- system/Database/SQLite3/Connection.php | 50 +++++--- tests/system/Database/Live/ForgeTest.php | 13 +- .../Database/Live/SQLite/AlterTableTest.php | 2 +- .../Database/Live/SQLite/GetIndexDataTest.php | 121 ++++++++++++++++++ 4 files changed, 160 insertions(+), 26 deletions(-) create mode 100644 tests/system/Database/Live/SQLite/GetIndexDataTest.php diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php index 4f9990e1b11d..159438aae7c8 100644 --- a/system/Database/SQLite3/Connection.php +++ b/system/Database/SQLite3/Connection.php @@ -265,34 +265,50 @@ protected function _fieldData(string $table): array */ protected function _indexData(string $table): array { - // Get indexes - // Don't use PRAGMA index_list, so we can preserve index order - $sql = "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name=" . $this->escape(strtolower($table)); + $sql = "SELECT 'PRIMARY' as indexname, l.name as fieldname, 'PRIMARY' as indextype + FROM pragma_table_info(" . $this->escape(strtolower($table)) . ") as l + WHERE l.pk <> 0 + UNION ALL + SELECT sqlite_master.name as indexname, ii.name as fieldname, + CASE + WHEN ti.pk <> 0 AND sqlite_master.name LIKE 'sqlite_autoindex_%' THEN 'PRIMARY' + WHEN sqlite_master.name LIKE 'sqlite_autoindex_%' THEN 'UNIQUE' + WHEN sqlite_master.sql LIKE '% UNIQUE %' THEN 'UNIQUE' + ELSE '' + END as indextype + FROM sqlite_master + INNER JOIN pragma_index_xinfo(sqlite_master.name) ii ON ii.name IS NOT NULL + LEFT JOIN pragma_table_info(" . $this->escape(strtolower($table)) . ") ti ON ti.name = ii.name + WHERE sqlite_master.type='index' AND sqlite_master.tbl_name = " . $this->escape(strtolower($table)) . ' COLLATE NOCASE'; + if (($query = $this->query($sql)) === false) { throw new DatabaseException(lang('Database.failGetIndexData')); } $query = $query->getResultObject(); - $retVal = []; + $tempVal = []; foreach ($query as $row) { - $obj = new stdClass(); - - $obj->name = $row->name; - - // Get fields for index - $obj->fields = []; - - if (false === $fields = $this->query('PRAGMA index_info(' . $this->escape(strtolower($row->name)) . ')')) { - throw new DatabaseException(lang('Database.failGetIndexData')); + if ($row->indextype === 'PRIMARY') { + $tempVal['PRIMARY']['indextype'] = $row->indextype; + $tempVal['PRIMARY']['indexname'] = $row->indexname; + $tempVal['PRIMARY']['fields'][$row->fieldname] = $row->fieldname; + } else { + $tempVal[$row->indexname]['indextype'] = $row->indextype; + $tempVal[$row->indexname]['indexname'] = $row->indexname; + $tempVal[$row->indexname]['fields'][$row->fieldname] = $row->fieldname; } + } - $fields = $fields->getResultObject(); + $retVal = []; - foreach ($fields as $field) { - $obj->fields[] = $field->name; - } + foreach ($tempVal as $val) { + $fields = array_values($val['fields']); + $obj = new stdClass(); + $obj->name = $val['indexname']; + $obj->fields = $fields; + $obj->type = $val['indextype']; $retVal[$obj->name] = $obj; } diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 2122afb36a45..2470faaee9ef 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -879,14 +879,11 @@ public function testAddFields() public function testCompositeKey() { - // SQLite3 uses auto increment different - $uniqueOrAuto = $this->db->DBDriver === 'SQLite3' ? 'unique' : 'auto_increment'; - $this->forge->addField([ 'id' => [ - 'type' => 'INTEGER', - 'constraint' => 3, - $uniqueOrAuto => true, + 'type' => 'INTEGER', + 'constraint' => 3, + 'auto_increment' => true, ], 'code' => [ 'type' => 'VARCHAR', @@ -929,8 +926,8 @@ public function testCompositeKey() $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']); $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE'); } elseif ($this->db->DBDriver === 'SQLite3') { - $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1'); - $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']); + $this->assertSame($keys['PRIMARY']->name, 'PRIMARY'); + $this->assertSame($keys['PRIMARY']->fields, ['id']); $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company'); $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']); $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active'); diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php index 7eb2216139e5..83ab4586c7c9 100644 --- a/tests/system/Database/Live/SQLite/AlterTableTest.php +++ b/tests/system/Database/Live/SQLite/AlterTableTest.php @@ -107,7 +107,7 @@ public function testFromTableFillsDetails() $keys = $this->getPrivateProperty($this->table, 'keys'); - $this->assertCount(3, $keys); + $this->assertCount(4, $keys); $this->assertArrayHasKey('foo_name', $keys); $this->assertSame(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']); $this->assertArrayHasKey('id', $keys); diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite/GetIndexDataTest.php new file mode 100644 index 000000000000..15d1e56f831f --- /dev/null +++ b/tests/system/Database/Live/SQLite/GetIndexDataTest.php @@ -0,0 +1,121 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Database\Live\SQLite; + +use CodeIgniter\Database\SQLite3\Connection; +use CodeIgniter\Database\SQLite3\Forge; +use CodeIgniter\Test\CIUnitTestCase; +use CodeIgniter\Test\DatabaseTestTrait; +use Config\Database; +use stdClass; + +/** + * @group DatabaseLive + * + * @internal + */ +final class GetIndexDataTest extends CIUnitTestCase +{ + use DatabaseTestTrait; + + /** + * In setUp() db connection is changed. So migration doesn't work + * + * @var bool + */ + protected $migrate = false; + + /** + * @var Connection + */ + protected $db; + + private Forge $forge; + + protected function setUp(): void + { + parent::setUp(); + + $config = [ + 'DBDriver' => 'SQLite3', + 'database' => 'database.db', + 'DBDebug' => true, + ]; + + $this->db = db_connect($config); + $this->forge = Database::forge($config); + } + + public function testGetIndexData() + { + $this->forge->addField([ + 'id' => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true], + 'name' => ['type' => 'VARCHAR', 'constraint' => 80], + 'email' => ['type' => 'VARCHAR', 'constraint' => 100], + 'country' => ['type' => 'VARCHAR', 'constraint' => 40], + 'created_at' => ['type' => 'DATETIME', 'null' => true], + 'updated_at' => ['type' => 'DATETIME', 'null' => true], + 'deleted_at' => ['type' => 'DATETIME', 'null' => true], + ])->addKey(['id'], true)->createTable('userforeign', true); + + // INTEGER PRIMARY KEY AUTO_INCREMENT doesn't get an index by default + $this->forge->addField([ + 'id' => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true], + 'userid' => ['type' => 'INTEGER', 'constraint' => 3], + 'name' => ['type' => 'VARCHAR', 'constraint' => 80], + 'email' => ['type' => 'VARCHAR', 'constraint' => 100], + 'country' => ['type' => 'VARCHAR', 'constraint' => 40], + 'created_at' => ['type' => 'DATETIME', 'null' => true], + 'updated_at' => ['type' => 'DATETIME', 'null' => true], + 'deleted_at' => ['type' => 'DATETIME', 'null' => true], + ]) + ->addKey(['id'], true)->addUniqueKey('email') + ->addKey('country') + ->addForeignKey('userid', 'userforeign', 'id') + ->addForeignKey('email', 'userforeign', 'email') + ->createTable('testuser', true); + + $expectedIndexes = []; + + $row = new stdclass(); + $row->name = 'PRIMARY'; + $row->fields = ['id']; + $row->type = 'PRIMARY'; + $expectedIndexes['PRIMARY'] = $row; + + $row = new stdclass(); + $row->name = 'testuser_email'; + $row->fields = ['email']; + $row->type = 'UNIQUE'; + $expectedIndexes['testuser_email'] = $row; + + $row = new stdclass(); + $row->name = 'testuser_country'; + $row->fields = ['country']; + $row->type = ''; + $expectedIndexes['testuser_country'] = $row; + + $indexes = $this->db->getIndexData('testuser'); + + $this->assertSame($expectedIndexes['PRIMARY']->fields, $indexes['PRIMARY']->fields); + $this->assertSame($expectedIndexes['PRIMARY']->type, $indexes['PRIMARY']->type); + + $this->assertSame($expectedIndexes['testuser_email']->fields, $indexes['testuser_email']->fields); + $this->assertSame($expectedIndexes['testuser_email']->type, $indexes['testuser_email']->type); + + $this->assertSame($expectedIndexes['testuser_country']->fields, $indexes['testuser_country']->fields); + $this->assertSame($expectedIndexes['testuser_country']->type, $indexes['testuser_country']->type); + + $this->forge->dropTable('testuser', true); + $this->forge->dropTable('userforeign', true); + } +} From 0be91e23a044e44ceb101c3dd4fca7217b9e0374 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 1 Jul 2022 16:56:37 -0700 Subject: [PATCH 0788/8282] removed unused code from GetIndexDataTest --- .../Database/Live/SQLite/GetIndexDataTest.php | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite/GetIndexDataTest.php index 15d1e56f831f..f9498cd0301d 100644 --- a/tests/system/Database/Live/SQLite/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite/GetIndexDataTest.php @@ -57,16 +57,6 @@ protected function setUp(): void public function testGetIndexData() { - $this->forge->addField([ - 'id' => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true], - 'name' => ['type' => 'VARCHAR', 'constraint' => 80], - 'email' => ['type' => 'VARCHAR', 'constraint' => 100], - 'country' => ['type' => 'VARCHAR', 'constraint' => 40], - 'created_at' => ['type' => 'DATETIME', 'null' => true], - 'updated_at' => ['type' => 'DATETIME', 'null' => true], - 'deleted_at' => ['type' => 'DATETIME', 'null' => true], - ])->addKey(['id'], true)->createTable('userforeign', true); - // INTEGER PRIMARY KEY AUTO_INCREMENT doesn't get an index by default $this->forge->addField([ 'id' => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true], @@ -78,10 +68,9 @@ public function testGetIndexData() 'updated_at' => ['type' => 'DATETIME', 'null' => true], 'deleted_at' => ['type' => 'DATETIME', 'null' => true], ]) - ->addKey(['id'], true)->addUniqueKey('email') + ->addKey(['id'], true) + ->addUniqueKey('email') ->addKey('country') - ->addForeignKey('userid', 'userforeign', 'id') - ->addForeignKey('email', 'userforeign', 'email') ->createTable('testuser', true); $expectedIndexes = []; From b25b29dd878571d54316f2c5dcc2e16024b1c810 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 1 Jul 2022 19:52:52 -0700 Subject: [PATCH 0789/8282] fix --- system/Database/SQLite3/Connection.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php index 159438aae7c8..c59963f7c843 100644 --- a/system/Database/SQLite3/Connection.php +++ b/system/Database/SQLite3/Connection.php @@ -303,11 +303,9 @@ protected function _indexData(string $table): array $retVal = []; foreach ($tempVal as $val) { - $fields = array_values($val['fields']); - $obj = new stdClass(); $obj->name = $val['indexname']; - $obj->fields = $fields; + $obj->fields = array_values($val['fields']); $obj->type = $val['indextype']; $retVal[$obj->name] = $obj; } From 9a7c4c1ef812311da9e22a84ae3e912afc777439 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 5 Jul 2022 15:50:42 -0700 Subject: [PATCH 0790/8282] fix alter table test and SQLite Table - deal with psudo index PRIMARY --- system/Database/SQLite3/Connection.php | 2 +- system/Database/SQLite3/Table.php | 15 +++++++++++---- tests/system/Database/Live/ForgeTest.php | 11 +++++++++++ .../Database/Live/SQLite/AlterTableTest.php | 10 +++++----- .../Database/Live/SQLite/GetIndexDataTest.php | 3 +-- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php index c59963f7c843..24918cb7be97 100644 --- a/system/Database/SQLite3/Connection.php +++ b/system/Database/SQLite3/Connection.php @@ -274,7 +274,7 @@ protected function _indexData(string $table): array WHEN ti.pk <> 0 AND sqlite_master.name LIKE 'sqlite_autoindex_%' THEN 'PRIMARY' WHEN sqlite_master.name LIKE 'sqlite_autoindex_%' THEN 'UNIQUE' WHEN sqlite_master.sql LIKE '% UNIQUE %' THEN 'UNIQUE' - ELSE '' + ELSE 'INDEX' END as indextype FROM sqlite_master INNER JOIN pragma_index_xinfo(sqlite_master.name) ii ON ii.name IS NOT NULL diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php index 1ecb28fdf8b7..3eb5437c6a44 100644 --- a/system/Database/SQLite3/Table.php +++ b/system/Database/SQLite3/Table.php @@ -110,6 +110,13 @@ public function fromTable(string $table) $this->keys = array_merge($this->keys, $this->formatKeys($this->db->getIndexData($table))); + // if primary key index exists twice then remove psuedo index name 'primary'. + $primaryIndexes = array_filter($this->keys, static fn ($index) => $index['type'] === 'primary'); + + if (! empty($primaryIndexes) && count($primaryIndexes) > 1 && array_key_exists('primary', $this->keys)) { + unset($this->keys['primary']); + } + $this->foreignKeys = $this->db->getForeignKeyData($table); return $this; @@ -316,7 +323,7 @@ protected function formatFields($fields) ]; if ($field->primary_key) { - $this->keys[$field->name] = [ + $this->keys['primary'] = [ 'fields' => [$field->name], 'type' => 'primary', ]; @@ -343,9 +350,9 @@ protected function formatKeys($keys) $return = []; foreach ($keys as $name => $key) { - $return[$name] = [ + $return[strtolower($name)] = [ 'fields' => $key->fields, - 'type' => 'index', + 'type' => strtolower($key->type), ]; } @@ -363,7 +370,7 @@ protected function dropIndexes() } foreach ($this->keys as $name => $key) { - if ($key['type'] === 'primary' || $key['type'] === 'unique') { + if ($name === 'primary') { continue; } diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 2470faaee9ef..6eacb6ba176c 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -909,9 +909,11 @@ public function testCompositeKey() $this->assertSame($keys['PRIMARY']->name, 'PRIMARY'); $this->assertSame($keys['PRIMARY']->fields, ['id']); $this->assertSame($keys['PRIMARY']->type, 'PRIMARY'); + $this->assertSame($keys['code_company']->name, 'code_company'); $this->assertSame($keys['code_company']->fields, ['code', 'company']); $this->assertSame($keys['code_company']->type, 'INDEX'); + $this->assertSame($keys['code_active']->name, 'code_active'); $this->assertSame($keys['code_active']->fields, ['code', 'active']); $this->assertSame($keys['code_active']->type, 'UNIQUE'); @@ -919,19 +921,26 @@ public function testCompositeKey() $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1'); $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']); $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY'); + $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company'); $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']); $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX'); + $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active'); $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']); $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE'); } elseif ($this->db->DBDriver === 'SQLite3') { $this->assertSame($keys['PRIMARY']->name, 'PRIMARY'); $this->assertSame($keys['PRIMARY']->fields, ['id']); + $this->assertSame($keys['PRIMARY']->type, 'PRIMARY'); + $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company'); $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']); + $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX'); + $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active'); $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']); + $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE'); } elseif ($this->db->DBDriver === 'SQLSRV') { $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1'); $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']); @@ -948,9 +957,11 @@ public function testCompositeKey() $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1'); $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']); $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY'); + $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company'); $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']); $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX'); + $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active'); $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']); $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE'); diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php index 83ab4586c7c9..ce1055d04c2b 100644 --- a/tests/system/Database/Live/SQLite/AlterTableTest.php +++ b/tests/system/Database/Live/SQLite/AlterTableTest.php @@ -107,13 +107,13 @@ public function testFromTableFillsDetails() $keys = $this->getPrivateProperty($this->table, 'keys'); - $this->assertCount(4, $keys); + $this->assertCount(3, $keys); $this->assertArrayHasKey('foo_name', $keys); $this->assertSame(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']); - $this->assertArrayHasKey('id', $keys); - $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']); - $this->assertArrayHasKey('id', $keys); - $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']); + $this->assertArrayHasKey('foo_email', $keys); + $this->assertSame(['fields' => ['email'], 'type' => 'unique'], $keys['foo_email']); + $this->assertArrayHasKey('primary', $keys); + $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['primary']); } public function testDropColumnSuccess() diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite/GetIndexDataTest.php index f9498cd0301d..74074b17b823 100644 --- a/tests/system/Database/Live/SQLite/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite/GetIndexDataTest.php @@ -90,7 +90,7 @@ public function testGetIndexData() $row = new stdclass(); $row->name = 'testuser_country'; $row->fields = ['country']; - $row->type = ''; + $row->type = 'INDEX'; $expectedIndexes['testuser_country'] = $row; $indexes = $this->db->getIndexData('testuser'); @@ -105,6 +105,5 @@ public function testGetIndexData() $this->assertSame($expectedIndexes['testuser_country']->type, $indexes['testuser_country']->type); $this->forge->dropTable('testuser', true); - $this->forge->dropTable('userforeign', true); } } From def6e1f3146d65e9ec56e3b723f3f445ee905c7b Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 5 Jul 2022 16:28:41 -0700 Subject: [PATCH 0791/8282] fix cs --- system/Database/SQLite3/Table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php index 3eb5437c6a44..6c3328557578 100644 --- a/system/Database/SQLite3/Table.php +++ b/system/Database/SQLite3/Table.php @@ -369,7 +369,7 @@ protected function dropIndexes() return; } - foreach ($this->keys as $name => $key) { + foreach (array_keys($this->keys) as $name) { if ($name === 'primary') { continue; } From 60ce81d94338690ba87e85865f7827b78990af9d Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 16 Jun 2022 15:35:33 +0900 Subject: [PATCH 0792/8282] feat: add class ContentReplacer --- system/Publisher/ContentReplacer.php | 87 ++++++++ .../system/Publisher/ContentReplacerTest.php | 200 ++++++++++++++++++ 2 files changed, 287 insertions(+) create mode 100644 system/Publisher/ContentReplacer.php create mode 100644 tests/system/Publisher/ContentReplacerTest.php diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php new file mode 100644 index 000000000000..4c31b604c89e --- /dev/null +++ b/system/Publisher/ContentReplacer.php @@ -0,0 +1,87 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Publisher; + +class ContentReplacer +{ + /** + * Replace content + * + * @param array $replaces [search => replace] + */ + public function replace(string $content, array $replaces): string + { + return strtr($content, $replaces); + } + + /** + * Add text + * + * @param string $text Text to add. + * @param string $pattern Regexp search pattern. + * @param string $replace Regexp replacement including text to add. + * + * @return bool|string true: already updated, false: regexp error. + */ + public function add(string $content, string $text, string $pattern, string $replace) + { + $return = preg_match('/' . preg_quote($text, '/') . '/u', $content); + + if ($return === 1) { + // It has already been updated. + + return true; + } + + if ($return === false) { + // Regexp error. + + return false; + } + + return preg_replace($pattern, $replace, $content); + } + + /** + * Add line after the line with the string + * + * @param string $content Whole content. + * @param string $line Line to add. + * @param string $after String to search. + * + * @return bool|string true: already updated, false: regexp error. + */ + public function addAfter(string $content, string $line, string $after) + { + $pattern = '/(.*)(\n[^\n]*?' . preg_quote($after, '/') . '[^\n]*?\n)/su'; + $replace = '$1$2' . $line . "\n"; + + return $this->add($content, $line, $pattern, $replace); + } + + /** + * Add line before the line with the string + * + * @param string $content Whole content. + * @param string $line Line to add. + * @param string $before String to search. + * + * @return bool|string true: already updated, false: regexp error. + */ + public function addBefore(string $content, string $line, string $before) + { + $pattern = '/(\n)([^\n]*?' . preg_quote($before, '/') . ')(.*)/su'; + $replace = '$1' . $line . "\n" . '$2$3'; + + return $this->add($content, $line, $pattern, $replace); + } +} diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php new file mode 100644 index 000000000000..00875c59825d --- /dev/null +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -0,0 +1,200 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Publisher; + +use CodeIgniter\Test\CIUnitTestCase; + +/** + * @internal + */ +final class ContentReplacerTest extends CIUnitTestCase +{ + public function testReplace(): void + { + $replacer = new ContentReplacer(); + $content = <<<'FILE' + 'namespace Config', + "use CodeIgniter\\Config\\BaseConfig;\n" => '', + 'extends BaseConfig' => 'extends \\CodeIgniter\\Shield\\Config\\Auth', + ]; + $output = $replacer->replace($content, $replaces); + + $expected = <<<'FILE' + assertSame($expected, $output); + } + + public function testAddAddingAfter(): void + { + $replacer = new ContentReplacer(); + $content = <<<'FILE' + get('/', 'Home::index'); + + /** + * You will have access to the $routes object within that file without + * needing to reload it. + */ + + FILE; + + $text = 'service(\'auth\')->routes($routes);'; + $pattern = '/(.*)(\n' . preg_quote('$routes->', '/') . '[^\n]+?\n)/su'; + $replace = '$1$2' . "\n" . $text . "\n"; + $output = $replacer->add($content, $text, $pattern, $replace); + + $expected = <<<'FILE' + get('/', 'Home::index'); + + service('auth')->routes($routes); + + /** + * You will have access to the $routes object within that file without + * needing to reload it. + */ + + FILE; + $this->assertSame($expected, $output); + } + + public function testAddAddingBefore(): void + { + $replacer = new ContentReplacer(); + $content = <<<'FILE' + helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; + $pattern = '/(' . preg_quote('// Do Not Edit This Line', '/') . ')/u'; + $replace = $text . "\n\n " . '$1'; + $output = $replacer->add($content, $text, $pattern, $replace); + + $expected = <<<'FILE' + helpers = array_merge($this->helpers, ['auth', 'setting']); + + // Do Not Edit This Line + parent::initController($request, $response, $logger); + } + } + FILE; + $this->assertSame($expected, $output); + } + + public function testAddAfter(): void + { + $replacer = new ContentReplacer(); + $content = <<<'FILE' + $routes->get('/', 'Home::index'); + $routes->get('/login', 'Login::index'); + + FILE; + + $line = "\n" . 'service(\'auth\')->routes($routes);'; + $after = '$routes->'; + $output = $replacer->addAfter($content, $line, $after); + + $expected = <<<'FILE' + $routes->get('/', 'Home::index'); + $routes->get('/login', 'Login::index'); + + service('auth')->routes($routes); + + FILE; + $this->assertSame($expected, $output); + } + + public function testAddBefore(): void + { + $replacer = new ContentReplacer(); + $content = <<<'FILE' + helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; + $before = '// Do Not Edit This Line'; + $output = $replacer->addBefore($content, $line, $before); + + $expected = <<<'FILE' + helpers = array_merge($this->helpers, ['auth', 'setting']); + // Do Not Edit This Line + parent::initController($request, $response, $logger); + // Do Not Edit This Line + + FILE; + $this->assertSame($expected, $output); + } +} From 362a56262e46df31578a23fe43e87f39f68910f9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 16 Jun 2022 18:03:34 +0900 Subject: [PATCH 0793/8282] feat: add Publisher::replace(), addLineAfter(), addLineBefore() --- system/Publisher/Publisher.php | 85 +++++++++++++++- .../Publisher/PublisherContentReplaceTest.php | 97 +++++++++++++++++++ 2 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 tests/system/Publisher/PublisherContentReplaceTest.php diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 01a3c62db657..6ab147b4f8b7 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -71,6 +71,8 @@ class Publisher extends FileCollection */ private array $restrictions; + private ContentReplacer $replacer; + /** * Base path to use for the source. * @@ -157,6 +159,8 @@ public function __construct(?string $source = null, ?string $destination = null) $this->source = self::resolveDirectory($source ?? $this->source); $this->destination = self::resolveDirectory($destination ?? $this->destination); + $this->replacer = new ContentReplacer(); + // Restrictions are intentionally not injected to prevent overriding $this->restrictions = config('Publisher')->restrictions; @@ -397,12 +401,73 @@ final public function merge(bool $replace = true): bool } /** - * Copies a file with directory creation and identical file awareness. - * Intentionally allows errors. + * Replace content * - * @throws PublisherException For collisions and restriction violations + * @param array $replaces [search => replace] + * + * @return bool */ - private function safeCopyFile(string $from, string $to, bool $replace): void + public function replace(string $file, array $replaces) + { + $this->verifyAllowed($file, $file); + + $content = file_get_contents($file); + + $newContent = $this->replacer->replace($content, $replaces); + + $return = file_put_contents($file, $newContent); + + return $return !== false; + } + + /** + * Add line after the line with the string + * + * @param string $after String to search. + */ + public function addLineAfter(string $file, string $line, string $after): bool + { + $this->verifyAllowed($file, $file); + + $content = file_get_contents($file); + + $newContent = $this->replacer->addAfter($content, $line, $after); + + if (is_bool($newContent)) { + return $newContent; + } + + $return = file_put_contents($file, $newContent); + + return $return !== false; + } + + /** + * Add line before the line with the string + * + * @param string $before String to search. + */ + public function addLineBefore(string $file, string $line, string $before): bool + { + $this->verifyAllowed($file, $file); + + $content = file_get_contents($file); + + $newContent = $this->replacer->addBefore($content, $line, $before); + + if (is_bool($newContent)) { + return $newContent; + } + + $return = file_put_contents($file, $newContent); + + return $return !== false; + } + + /** + * Verify this is an allowed file for its destination. + */ + private function verifyAllowed(string $from, string $to) { // Verify this is an allowed file for its destination foreach ($this->restrictions as $directory => $pattern) { @@ -410,6 +475,18 @@ private function safeCopyFile(string $from, string $to, bool $replace): void throw PublisherException::forFileNotAllowed($from, $directory, $pattern); } } + } + + /** + * Copies a file with directory creation and identical file awareness. + * Intentionally allows errors. + * + * @throws PublisherException For collisions and restriction violations + */ + private function safeCopyFile(string $from, string $to, bool $replace): void + { + // Verify this is an allowed file for its destination + $this->verifyAllowed($from, $to); // Check for an existing file if (file_exists($to)) { diff --git a/tests/system/Publisher/PublisherContentReplaceTest.php b/tests/system/Publisher/PublisherContentReplaceTest.php new file mode 100644 index 000000000000..f265bc4c14d4 --- /dev/null +++ b/tests/system/Publisher/PublisherContentReplaceTest.php @@ -0,0 +1,97 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Publisher; + +use CodeIgniter\Test\CIUnitTestCase; + +/** + * @internal + */ +final class PublisherContentReplaceTest extends CIUnitTestCase +{ + private string $file; + private Publisher $publisher; + + protected function setUp(): void + { + parent::setUp(); + + $this->file = __DIR__ . '/App.php'; + copy(APPPATH . 'Config/App.php', $this->file); + + $this->publisher = new Publisher(__DIR__, __DIR__); + } + + protected function tearDown(): void + { + parent::tearDown(); + + unlink($this->file); + } + + public function testAddLineAfter() + { + $result = $this->publisher->addLineAfter( + $this->file, + ' public $myOwnConfig = 1000;', + 'public $CSPEnabled = false;' + ); + + $this->assertTrue($result); + $this->assertStringContainsString( + ' public $CSPEnabled = false; + public $myOwnConfig = 1000;', + file_get_contents($this->file) + ); + } + + public function testAddLineBefore() + { + $result = $this->publisher->addLineBefore( + $this->file, + ' public $myOwnConfig = 1000;', + 'public $CSPEnabled = false;' + ); + + $this->assertTrue($result); + $this->assertStringContainsString( + ' public $myOwnConfig = 1000; + public $CSPEnabled = false;', + file_get_contents($this->file) + ); + } + + public function testReplace() + { + $result = $this->publisher->replace( + $this->file, + [ + 'use CodeIgniter\Config\BaseConfig;' . "\n" => '', + 'class App extends BaseConfig' => 'class App extends \Some\Package\SomeConfig', + ] + ); + + $this->assertTrue($result); + $this->assertStringNotContainsString( + 'use CodeIgniter\Config\BaseConfig;', + file_get_contents($this->file) + ); + $this->assertStringContainsString( + 'class App extends \Some\Package\SomeConfig', + file_get_contents($this->file) + ); + $this->assertStringNotContainsString( + 'class App extends BaseConfig', + file_get_contents($this->file) + ); + } +} From 003e64d68d798319107be13ae69b619881ec6471 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Jun 2022 07:46:46 +0900 Subject: [PATCH 0794/8282] refactor: change visibility Co-authored-by: MGatner --- system/Publisher/ContentReplacer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index 4c31b604c89e..367d901a76b5 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -32,7 +32,7 @@ public function replace(string $content, array $replaces): string * * @return bool|string true: already updated, false: regexp error. */ - public function add(string $content, string $text, string $pattern, string $replace) + private function add(string $content, string $text, string $pattern, string $replace) { $return = preg_match('/' . preg_quote($text, '/') . '/u', $content); From 1dc06ec87b6910c7db6017d5e3a3e238f84ef021 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Jun 2022 08:43:21 +0900 Subject: [PATCH 0795/8282] feat: change return type of ContentReplacer::add() --- system/Publisher/ContentReplacer.php | 38 ++++-- system/Publisher/Publisher.php | 24 ++-- .../system/Publisher/ContentReplacerTest.php | 118 ++++++------------ 3 files changed, 80 insertions(+), 100 deletions(-) diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index 367d901a76b5..05d75457ca0a 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -11,6 +11,9 @@ namespace CodeIgniter\Publisher; +use RuntimeException; +use stdClass; + class ContentReplacer { /** @@ -30,25 +33,38 @@ public function replace(string $content, array $replaces): string * @param string $pattern Regexp search pattern. * @param string $replace Regexp replacement including text to add. * - * @return bool|string true: already updated, false: regexp error. + * @return stdClass {updated: bool, content: string} */ - private function add(string $content, string $text, string $pattern, string $replace) + private function add(string $content, string $text, string $pattern, string $replace): stdClass { + $result = new stdClass(); + $return = preg_match('/' . preg_quote($text, '/') . '/u', $content); + if ($return === false) { + // Regexp error. + throw new RuntimeException(preg_last_error_msg()); + } + if ($return === 1) { // It has already been updated. + $result->updated = false; + $result->content = $content; - return true; + return $result; } - if ($return === false) { - // Regexp error. + $return = preg_replace($pattern, $replace, $content); - return false; + if ($return === null) { + // Regexp error. + throw new RuntimeException(preg_last_error_msg()); } - return preg_replace($pattern, $replace, $content); + $result->updated = true; + $result->content = $return; + + return $result; } /** @@ -58,9 +74,9 @@ private function add(string $content, string $text, string $pattern, string $rep * @param string $line Line to add. * @param string $after String to search. * - * @return bool|string true: already updated, false: regexp error. + * @return stdClass {updated: bool, content: string} */ - public function addAfter(string $content, string $line, string $after) + public function addAfter(string $content, string $line, string $after): stdClass { $pattern = '/(.*)(\n[^\n]*?' . preg_quote($after, '/') . '[^\n]*?\n)/su'; $replace = '$1$2' . $line . "\n"; @@ -75,9 +91,9 @@ public function addAfter(string $content, string $line, string $after) * @param string $line Line to add. * @param string $before String to search. * - * @return bool|string true: already updated, false: regexp error. + * @return stdClass {updated: bool, content: string} */ - public function addBefore(string $content, string $line, string $before) + public function addBefore(string $content, string $line, string $before): stdClass { $pattern = '/(\n)([^\n]*?' . preg_quote($before, '/') . ')(.*)/su'; $replace = '$1' . $line . "\n" . '$2$3'; diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 6ab147b4f8b7..23179da9abd2 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -431,15 +431,15 @@ public function addLineAfter(string $file, string $line, string $after): bool $content = file_get_contents($file); - $newContent = $this->replacer->addAfter($content, $line, $after); + $result = $this->replacer->addAfter($content, $line, $after); - if (is_bool($newContent)) { - return $newContent; - } + if ($result->updated) { + $return = file_put_contents($file, $result->content); - $return = file_put_contents($file, $newContent); + return $return !== false; + } - return $return !== false; + return false; } /** @@ -453,15 +453,15 @@ public function addLineBefore(string $file, string $line, string $before): bool $content = file_get_contents($file); - $newContent = $this->replacer->addBefore($content, $line, $before); + $result = $this->replacer->addBefore($content, $line, $before); - if (is_bool($newContent)) { - return $newContent; - } + if ($result->updated) { + $return = file_put_contents($file, $result->content); - $return = file_put_contents($file, $newContent); + return $return !== false; + } - return $return !== false; + return false; } /** diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php index 00875c59825d..0274eb56a4a3 100644 --- a/tests/system/Publisher/ContentReplacerTest.php +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -53,129 +53,92 @@ class Auth extends \CodeIgniter\Shield\Config\Auth $this->assertSame($expected, $output); } - public function testAddAddingAfter(): void + public function testAddAfter(): void { $replacer = new ContentReplacer(); $content = <<<'FILE' - get('/', 'Home::index'); - - /** - * You will have access to the $routes object within that file without - * needing to reload it. - */ + $routes->get('/login', 'Login::index'); FILE; - $text = 'service(\'auth\')->routes($routes);'; - $pattern = '/(.*)(\n' . preg_quote('$routes->', '/') . '[^\n]+?\n)/su'; - $replace = '$1$2' . "\n" . $text . "\n"; - $output = $replacer->add($content, $text, $pattern, $replace); + $line = "\n" . 'service(\'auth\')->routes($routes);'; + $after = '$routes->'; + $result = $replacer->addAfter($content, $line, $after); $expected = <<<'FILE' - get('/', 'Home::index'); + $routes->get('/login', 'Login::index'); service('auth')->routes($routes); - /** - * You will have access to the $routes object within that file without - * needing to reload it. - */ - FILE; - $this->assertSame($expected, $output); + $this->assertSame($expected, $result->content); + $this->assertTrue($result->updated); } - public function testAddAddingBefore(): void + public function testAddAfterAlreadyUpdated(): void { $replacer = new ContentReplacer(); $content = <<<'FILE' - get('/', 'Home::index'); + $routes->get('/login', 'Login::index'); - namespace App\Controllers; + service('auth')->routes($routes); - abstract class BaseController extends Controller - { - public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) - { - // Do Not Edit This Line - parent::initController($request, $response, $logger); - } - } FILE; - $text = '$this->helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; - $pattern = '/(' . preg_quote('// Do Not Edit This Line', '/') . ')/u'; - $replace = $text . "\n\n " . '$1'; - $output = $replacer->add($content, $text, $pattern, $replace); + $line = "\n" . 'service(\'auth\')->routes($routes);'; + $after = '$routes->'; + $result = $replacer->addAfter($content, $line, $after); $expected = <<<'FILE' - get('/', 'Home::index'); + $routes->get('/login', 'Login::index'); - namespace App\Controllers; + service('auth')->routes($routes); - abstract class BaseController extends Controller - { - public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) - { - $this->helpers = array_merge($this->helpers, ['auth', 'setting']); - - // Do Not Edit This Line - parent::initController($request, $response, $logger); - } - } FILE; - $this->assertSame($expected, $output); + $this->assertSame($expected, $result->content); + $this->assertFalse($result->updated); } - public function testAddAfter(): void + public function testAddBefore(): void { $replacer = new ContentReplacer(); $content = <<<'FILE' - $routes->get('/', 'Home::index'); - $routes->get('/login', 'Login::index'); + routes($routes);'; - $after = '$routes->'; - $output = $replacer->addAfter($content, $line, $after); + $line = '$this->helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; + $before = '// Do Not Edit This Line'; + $result = $replacer->addBefore($content, $line, $before); $expected = <<<'FILE' - $routes->get('/', 'Home::index'); - $routes->get('/login', 'Login::index'); + routes($routes); + $this->helpers = array_merge($this->helpers, ['auth', 'setting']); + // Do Not Edit This Line + parent::initController($request, $response, $logger); + // Do Not Edit This Line FILE; - $this->assertSame($expected, $output); + $this->assertSame($expected, $result->content); + $this->assertTrue($result->updated); } - public function testAddBefore(): void + public function testAddBeforeAlreadyUpdated(): void { $replacer = new ContentReplacer(); $content = <<<'FILE' helpers = array_merge($this->helpers, ['auth', 'setting']); // Do Not Edit This Line parent::initController($request, $response, $logger); // Do Not Edit This Line @@ -184,7 +147,7 @@ public function testAddBefore(): void $line = '$this->helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; $before = '// Do Not Edit This Line'; - $output = $replacer->addBefore($content, $line, $before); + $result = $replacer->addBefore($content, $line, $before); $expected = <<<'FILE' assertSame($expected, $output); + $this->assertSame($expected, $result->content); + $this->assertFalse($result->updated); } } From 830d0c0003a700742778ff9118f97751a762cc6c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 10 Jul 2022 11:35:20 +0900 Subject: [PATCH 0796/8282] refactor: preg_last_error_msg() requires PHP8 or later --- system/Publisher/ContentReplacer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index 05d75457ca0a..eca0c7ac55a6 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -43,7 +43,7 @@ private function add(string $content, string $text, string $pattern, string $rep if ($return === false) { // Regexp error. - throw new RuntimeException(preg_last_error_msg()); + throw new RuntimeException('Regex error. PCRE error code: ' . preg_last_error()); } if ($return === 1) { @@ -58,7 +58,7 @@ private function add(string $content, string $text, string $pattern, string $rep if ($return === null) { // Regexp error. - throw new RuntimeException(preg_last_error_msg()); + throw new RuntimeException('Regex error. PCRE error code: ' . preg_last_error()); } $result->updated = true; From ca91e22929040d9e7721b023cc968f2ecb44b2a3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 10 Jul 2022 11:58:26 +0900 Subject: [PATCH 0797/8282] test: update assertions Config\App has been changed. --- .../Publisher/PublisherContentReplaceTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/system/Publisher/PublisherContentReplaceTest.php b/tests/system/Publisher/PublisherContentReplaceTest.php index f265bc4c14d4..ab6748027f17 100644 --- a/tests/system/Publisher/PublisherContentReplaceTest.php +++ b/tests/system/Publisher/PublisherContentReplaceTest.php @@ -42,14 +42,14 @@ public function testAddLineAfter() { $result = $this->publisher->addLineAfter( $this->file, - ' public $myOwnConfig = 1000;', - 'public $CSPEnabled = false;' + ' public int $myOwnConfig = 1000;', + 'public bool $CSPEnabled = false;' ); $this->assertTrue($result); $this->assertStringContainsString( - ' public $CSPEnabled = false; - public $myOwnConfig = 1000;', + ' public bool $CSPEnabled = false; + public int $myOwnConfig = 1000;', file_get_contents($this->file) ); } @@ -58,14 +58,14 @@ public function testAddLineBefore() { $result = $this->publisher->addLineBefore( $this->file, - ' public $myOwnConfig = 1000;', - 'public $CSPEnabled = false;' + ' public int $myOwnConfig = 1000;', + 'public bool $CSPEnabled = false;' ); $this->assertTrue($result); $this->assertStringContainsString( - ' public $myOwnConfig = 1000; - public $CSPEnabled = false;', + ' public int $myOwnConfig = 1000; + public bool $CSPEnabled = false;', file_get_contents($this->file) ); } From 6ae1dbcca1c15a15c934183ebd7c25d3548cf604 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Jul 2022 11:10:59 +0900 Subject: [PATCH 0798/8282] refactor: remove stdClass result object Using stdClass is not good practice. --- system/Publisher/ContentReplacer.php | 25 +++++----------- system/Publisher/Publisher.php | 8 ++--- .../system/Publisher/ContentReplacerTest.php | 30 +++---------------- 3 files changed, 16 insertions(+), 47 deletions(-) diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index eca0c7ac55a6..2372e850b080 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -12,7 +12,6 @@ namespace CodeIgniter\Publisher; use RuntimeException; -use stdClass; class ContentReplacer { @@ -33,12 +32,10 @@ public function replace(string $content, array $replaces): string * @param string $pattern Regexp search pattern. * @param string $replace Regexp replacement including text to add. * - * @return stdClass {updated: bool, content: string} + * @return string|null Updated content, or null if not updated. */ - private function add(string $content, string $text, string $pattern, string $replace): stdClass + private function add(string $content, string $text, string $pattern, string $replace): ?string { - $result = new stdClass(); - $return = preg_match('/' . preg_quote($text, '/') . '/u', $content); if ($return === false) { @@ -48,10 +45,7 @@ private function add(string $content, string $text, string $pattern, string $rep if ($return === 1) { // It has already been updated. - $result->updated = false; - $result->content = $content; - - return $result; + return null; } $return = preg_replace($pattern, $replace, $content); @@ -61,10 +55,7 @@ private function add(string $content, string $text, string $pattern, string $rep throw new RuntimeException('Regex error. PCRE error code: ' . preg_last_error()); } - $result->updated = true; - $result->content = $return; - - return $result; + return $return; } /** @@ -74,9 +65,9 @@ private function add(string $content, string $text, string $pattern, string $rep * @param string $line Line to add. * @param string $after String to search. * - * @return stdClass {updated: bool, content: string} + * @return string|null Updated content, or null if not updated. */ - public function addAfter(string $content, string $line, string $after): stdClass + public function addAfter(string $content, string $line, string $after): ?string { $pattern = '/(.*)(\n[^\n]*?' . preg_quote($after, '/') . '[^\n]*?\n)/su'; $replace = '$1$2' . $line . "\n"; @@ -91,9 +82,9 @@ public function addAfter(string $content, string $line, string $after): stdClass * @param string $line Line to add. * @param string $before String to search. * - * @return stdClass {updated: bool, content: string} + * @return string|null Updated content, or null if not updated. */ - public function addBefore(string $content, string $line, string $before): stdClass + public function addBefore(string $content, string $line, string $before): ?string { $pattern = '/(\n)([^\n]*?' . preg_quote($before, '/') . ')(.*)/su'; $replace = '$1' . $line . "\n" . '$2$3'; diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 23179da9abd2..920650fe9351 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -433,8 +433,8 @@ public function addLineAfter(string $file, string $line, string $after): bool $result = $this->replacer->addAfter($content, $line, $after); - if ($result->updated) { - $return = file_put_contents($file, $result->content); + if ($result !== null) { + $return = file_put_contents($file, $result); return $return !== false; } @@ -455,8 +455,8 @@ public function addLineBefore(string $file, string $line, string $before): bool $result = $this->replacer->addBefore($content, $line, $before); - if ($result->updated) { - $return = file_put_contents($file, $result->content); + if ($result !== null) { + $return = file_put_contents($file, $result); return $return !== false; } diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php index 0274eb56a4a3..dbfc6d80109b 100644 --- a/tests/system/Publisher/ContentReplacerTest.php +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -73,8 +73,7 @@ public function testAddAfter(): void service('auth')->routes($routes); FILE; - $this->assertSame($expected, $result->content); - $this->assertTrue($result->updated); + $this->assertSame($expected, $result); } public function testAddAfterAlreadyUpdated(): void @@ -91,16 +90,7 @@ public function testAddAfterAlreadyUpdated(): void $line = "\n" . 'service(\'auth\')->routes($routes);'; $after = '$routes->'; $result = $replacer->addAfter($content, $line, $after); - - $expected = <<<'FILE' - $routes->get('/', 'Home::index'); - $routes->get('/login', 'Login::index'); - - service('auth')->routes($routes); - - FILE; - $this->assertSame($expected, $result->content); - $this->assertFalse($result->updated); + $this->assertNull($result); } public function testAddBefore(): void @@ -128,8 +118,7 @@ public function testAddBefore(): void // Do Not Edit This Line FILE; - $this->assertSame($expected, $result->content); - $this->assertTrue($result->updated); + $this->assertSame($expected, $result); } public function testAddBeforeAlreadyUpdated(): void @@ -148,17 +137,6 @@ public function testAddBeforeAlreadyUpdated(): void $line = '$this->helpers = array_merge($this->helpers, [\'auth\', \'setting\']);'; $before = '// Do Not Edit This Line'; $result = $replacer->addBefore($content, $line, $before); - - $expected = <<<'FILE' - helpers = array_merge($this->helpers, ['auth', 'setting']); - // Do Not Edit This Line - parent::initController($request, $response, $logger); - // Do Not Edit This Line - - FILE; - $this->assertSame($expected, $result->content); - $this->assertFalse($result->updated); + $this->assertNull($result); } } From 615400147b5e8cbc38d43446d6eceea7ad0937cc Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Jul 2022 11:28:33 +0900 Subject: [PATCH 0799/8282] docs: add doc comment --- system/Publisher/ContentReplacer.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index 2372e850b080..76cef11336f1 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -13,6 +13,9 @@ use RuntimeException; +/** + * Replace Text Content + */ class ContentReplacer { /** From 40ee9c8db826a5f66f6a47cf0f05f5c9eccb2bee Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Jul 2022 11:56:53 +0900 Subject: [PATCH 0800/8282] style: align comments --- app/Config/Constants.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 0c1b53487cd9..47b92f832935 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -67,16 +67,16 @@ | http://tldp.org/LDP/abs/html/exitcodes.html | */ -defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors -defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error -defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error -defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found -defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class +defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors +defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error +defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error +defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found +defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member -defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input -defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error -defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code -defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code +defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input +defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error +defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code +defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code /** * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead. From b0ed2d511c79a9289a689880e9929d546678f68e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Jul 2022 14:00:24 +0900 Subject: [PATCH 0801/8282] fix: invalid INSERT query when builder uses table alias --- system/Database/BaseBuilder.php | 17 ++++++++++-- tests/system/Database/Builder/InsertTest.php | 29 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 4f835730d176..a5903c49625b 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -1863,7 +1863,7 @@ public function getCompiledInsert(bool $reset = true) } $sql = $this->_insert( - $this->db->protectIdentifiers($this->QBFrom[0], true, null, false), + $this->db->protectIdentifiers($this->removeAlias($this->QBFrom[0]), true, null, false), array_keys($this->QBSet), array_values($this->QBSet) ); @@ -1895,7 +1895,7 @@ public function insert($set = null, ?bool $escape = null) } $sql = $this->_insert( - $this->db->protectIdentifiers($this->QBFrom[0], true, $escape, false), + $this->db->protectIdentifiers($this->removeAlias($this->QBFrom[0]), true, $escape, false), array_keys($this->QBSet), array_values($this->QBSet) ); @@ -1914,6 +1914,19 @@ public function insert($set = null, ?bool $escape = null) return false; } + protected function removeAlias(string $from): string + { + if (strpos($from, ' ') !== false) { + // if the alias is written with the AS keyword, remove it + $from = preg_replace('/\s+AS\s+/i', ' ', $from); + + $parts = explode(' ', $from); + $from = $parts[0]; + } + + return $from; + } + /** * This method is used by both insert() and getCompiledInsert() to * validate that the there data is actually being set and that table diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index daa605be40f9..774dd1082ed0 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -85,6 +85,35 @@ public function testInsertObject() $this->assertSame($expectedBinds, $builder->getBinds()); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5365 + */ + public function testInsertWithTableAlias() + { + $builder = $this->db->table('jobs as j'); + + $insertData = [ + 'id' => 1, + 'name' => 'Grocery Sales', + ]; + $builder->testMode()->insert($insertData, true); + + $expectedSQL = 'INSERT INTO "jobs" ("id", "name") VALUES (1, \'Grocery Sales\')'; + $expectedBinds = [ + 'id' => [ + 1, + true, + ], + 'name' => [ + 'Grocery Sales', + true, + ], + ]; + + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledInsert())); + $this->assertSame($expectedBinds, $builder->getBinds()); + } + public function testThrowsExceptionOnNoValuesSet() { $builder = $this->db->table('jobs'); From dd279db1103223bc1bd63efff013b7c29613fd0d Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 23 Nov 2021 17:36:43 +0900 Subject: [PATCH 0802/8282] style: break long lines --- system/Database/BaseBuilder.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index a5903c49625b..958292b1a820 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -1863,7 +1863,12 @@ public function getCompiledInsert(bool $reset = true) } $sql = $this->_insert( - $this->db->protectIdentifiers($this->removeAlias($this->QBFrom[0]), true, null, false), + $this->db->protectIdentifiers( + $this->removeAlias($this->QBFrom[0]), + true, + null, + false + ), array_keys($this->QBSet), array_values($this->QBSet) ); @@ -1895,7 +1900,12 @@ public function insert($set = null, ?bool $escape = null) } $sql = $this->_insert( - $this->db->protectIdentifiers($this->removeAlias($this->QBFrom[0]), true, $escape, false), + $this->db->protectIdentifiers( + $this->removeAlias($this->QBFrom[0]), + true, + $escape, + false + ), array_keys($this->QBSet), array_values($this->QBSet) ); From bd5ac2475816493abaa954ee106bfc0ffeeaba5e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 23 Nov 2021 20:26:31 +0900 Subject: [PATCH 0803/8282] fix: invalid DELETE query when builder uses table alias --- system/Database/BaseBuilder.php | 2 +- tests/system/Database/Builder/DeleteTest.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 958292b1a820..e4b399f5fbee 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -2363,7 +2363,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true) return false; // @codeCoverageIgnore } - $sql = $this->_delete($table); + $sql = $this->_delete($this->removeAlias($table)); if (! empty($limit)) { $this->QBLimit = $limit; diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php index 777a646992c4..ab27a2ec9266 100644 --- a/tests/system/Database/Builder/DeleteTest.php +++ b/tests/system/Database/Builder/DeleteTest.php @@ -60,6 +60,20 @@ public function testGetCompiledDelete() $this->assertSame($expectedSQL, $sql); } + public function testGetCompiledDeleteWithTableAlias() + { + $builder = $this->db->table('jobs j'); + + $builder->where('id', 1); + $sql = $builder->getCompiledDelete(); + + $expectedSQL = <<<'EOL' + DELETE FROM "jobs" + WHERE "id" = 1 + EOL; + $this->assertSame($expectedSQL, $sql); + } + public function testGetCompiledDeleteWithLimit() { $builder = $this->db->table('jobs'); From bfcbde3d7e49d7deee66d0585f705daa6380aebc Mon Sep 17 00:00:00 2001 From: nalakapws <106789904+nalakapws@users.noreply.github.com> Date: Mon, 11 Jul 2022 11:05:48 +0530 Subject: [PATCH 0804/8282] Add db port entry into env file. --- env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/env b/env index 67faaee5b57a..cc0681c67711 100644 --- a/env +++ b/env @@ -45,6 +45,7 @@ # database.default.password = root # database.default.DBDriver = MySQLi # database.default.DBPrefix = +# database.default.port = 3306 # database.tests.hostname = localhost # database.tests.database = ci4 @@ -52,6 +53,7 @@ # database.tests.password = root # database.tests.DBDriver = MySQLi # database.tests.DBPrefix = +# database.tests.port = 3306 #-------------------------------------------------------------------- # CONTENT SECURITY POLICY From cdd7278948da89eccbbcaf759b134fd779ca012a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Jul 2022 14:47:27 +0900 Subject: [PATCH 0805/8282] fix: Call to undefined method CodeIgniter\Pager\PagerRenderer::getDetails() --- system/Pager/Pager.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php index 32843ba9e98d..80861646efdc 100644 --- a/system/Pager/Pager.php +++ b/system/Pager/Pager.php @@ -122,7 +122,8 @@ protected function displayLinks(string $group, string $template): string $pager = new PagerRenderer($this->getDetails($group)); - return $this->view->setVar('pager', $pager)->render($this->config->templates[$template]); + return $this->view->setVar('pager', $pager) + ->render($this->config->templates[$template], null, false); } /** From 5383d46679c24b15cdbe2cd5dedab738e41c83c7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 10:07:21 +0900 Subject: [PATCH 0806/8282] fix: incorrect HTTP status code may return --- system/Debug/Exceptions.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 736a67fa9711..fb2dfc6d6002 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -14,6 +14,7 @@ use CodeIgniter\API\ResponseTrait; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\HTTP\CLIRequest; +use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; use Config\Exceptions as ExceptionsConfig; @@ -115,7 +116,14 @@ public function exceptionHandler(Throwable $exception) } if (! is_cli()) { - $this->response->setStatusCode($statusCode); + try { + $this->response->setStatusCode($statusCode); + } catch (HTTPException $e) { + // Workaround for invalid HTTP status code. + $statusCoden = 500; + $this->response->setStatusCode($statusCoden); + } + if (! headers_sent()) { header(sprintf('HTTP/%s %s %s', $this->request->getProtocolVersion(), $this->response->getStatusCode(), $this->response->getReasonPhrase()), true, $statusCode); } From 50fa7ada5aa71cbcaf29d48f030c8bbc8757dda2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 15:11:22 +0900 Subject: [PATCH 0807/8282] refactor: fix type in variable name --- system/Debug/Exceptions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index fb2dfc6d6002..3ec1230291ea 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -120,8 +120,8 @@ public function exceptionHandler(Throwable $exception) $this->response->setStatusCode($statusCode); } catch (HTTPException $e) { // Workaround for invalid HTTP status code. - $statusCoden = 500; - $this->response->setStatusCode($statusCoden); + $statusCode = 500; + $this->response->setStatusCode($statusCode); } if (! headers_sent()) { From 2258c955e004aca1a3c03c196f7ed59605828c4b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 17:06:55 +0900 Subject: [PATCH 0808/8282] refactor: add return type --- system/Publisher/Publisher.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 920650fe9351..502d3670ff12 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -404,10 +404,8 @@ final public function merge(bool $replace = true): bool * Replace content * * @param array $replaces [search => replace] - * - * @return bool */ - public function replace(string $file, array $replaces) + public function replace(string $file, array $replaces): bool { $this->verifyAllowed($file, $file); From 7c028b718270c3fde17f9ea0b84be0b6f626a9e6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 17:07:44 +0900 Subject: [PATCH 0809/8282] docs: fix existing sample code --- user_guide_src/source/libraries/publisher/010.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/publisher/010.php b/user_guide_src/source/libraries/publisher/010.php index 652322fd0bcb..61b75287e51f 100644 --- a/user_guide_src/source/libraries/publisher/010.php +++ b/user_guide_src/source/libraries/publisher/010.php @@ -15,9 +15,9 @@ class AuthPublish extends BaseCommand public function run(array $params) { // Use the Autoloader to figure out the module path - $source = service('autoloader')->getNamespace('Math\\Auth'); + $source = service('autoloader')->getNamespace('Math\\Auth')[0]; - $publisher = new Publisher($source, APPATH); + $publisher = new Publisher($source, APPPATH); try { // Add only the desired components From a4f5e8c69834d09b408ed4b9febcd21fbcb98e75 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 17:21:13 +0900 Subject: [PATCH 0810/8282] docs: add replace(), addLineAfter(), addLineBefore() --- user_guide_src/source/libraries/publisher.rst | 24 +++++++++++++++++++ .../source/libraries/publisher/013.php | 16 +++++++++++++ .../source/libraries/publisher/014.php | 14 +++++++++++ .../source/libraries/publisher/015.php | 14 +++++++++++ 4 files changed, 68 insertions(+) create mode 100644 user_guide_src/source/libraries/publisher/013.php create mode 100644 user_guide_src/source/libraries/publisher/014.php create mode 100644 user_guide_src/source/libraries/publisher/015.php diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst index 5c437c3715e8..9da4e6c9eb9d 100644 --- a/user_guide_src/source/libraries/publisher.rst +++ b/user_guide_src/source/libraries/publisher.rst @@ -264,3 +264,27 @@ affect other files in the destination. Returns success or failure, use ``getPubl Example: .. literalinclude:: publisher/012.php + +Modifying Files +=============== + +replace(string $file, array $replaces): bool +-------------------------------------------- + +Replaces the ``$file`` contents. The second parameter ``$replaces`` array specifies the search strings as keys and the replacements as values. + +.. literalinclude:: publisher/013.php + +addLineAfter(string $file, string $line, string $after): bool +------------------------------------------------------------- + +Adds ``$line`` after a line with specific string ``$after``. + +.. literalinclude:: publisher/014.php + +addLineBefore(string $file, string $line, string $after): bool +-------------------------------------------------------------- + +Adds ``$line`` before a line with specific string ``$after``. + +.. literalinclude:: publisher/015.php diff --git a/user_guide_src/source/libraries/publisher/013.php b/user_guide_src/source/libraries/publisher/013.php new file mode 100644 index 000000000000..a48935497f5e --- /dev/null +++ b/user_guide_src/source/libraries/publisher/013.php @@ -0,0 +1,16 @@ +getNamespace('CodeIgniter\\Shield')[0]; +$publisher = new Publisher($source, APPPATH); + +$file = APPPATH . 'Config/Auth.php'; + +$publisher->replace( + $file, + [ + 'use CodeIgniter\Config\BaseConfig;' . "\n" => '', + 'class App extends BaseConfig' => 'class App extends \Some\Package\SomeConfig', + ] +); diff --git a/user_guide_src/source/libraries/publisher/014.php b/user_guide_src/source/libraries/publisher/014.php new file mode 100644 index 000000000000..06acbe1313cb --- /dev/null +++ b/user_guide_src/source/libraries/publisher/014.php @@ -0,0 +1,14 @@ +getNamespace('CodeIgniter\\Shield')[0]; +$publisher = new Publisher($source, APPPATH); + +$file = APPPATH . 'Config/App.php'; + +$publisher->addLineAfter( + $file, + ' public int $myOwnConfig = 1000;', // Adds this line + 'public bool $CSPEnabled = false;' // After this line +); diff --git a/user_guide_src/source/libraries/publisher/015.php b/user_guide_src/source/libraries/publisher/015.php new file mode 100644 index 000000000000..28cb609d4d0b --- /dev/null +++ b/user_guide_src/source/libraries/publisher/015.php @@ -0,0 +1,14 @@ +getNamespace('CodeIgniter\\Shield')[0]; +$publisher = new Publisher($source, APPPATH); + +$file = APPPATH . 'Config/App.php'; + +$publisher->addLineBefore( + $file, + ' public int $myOwnConfig = 1000;', // Add this line + 'public bool $CSPEnabled = false;' // Before this line +); From d9ea9da28679cbc340739956060a06456cb95027 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 17:30:10 +0900 Subject: [PATCH 0811/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + user_guide_src/source/libraries/publisher.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index f2f311c5ce89..e753fc93ef13 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -36,6 +36,7 @@ Enhancements - Added before and after events to ``BaseModel::insertBatch()`` and ``BaseModel::updateBatch()`` methods. See :ref:`model-events-callbacks`. - Added ``Model::allowEmptyInserts()`` method to insert empty data. See :ref:`Using CodeIgniter's Model ` - Added ``$routes->useSupportedLocalesOnly(true)`` so that the Router returns 404 Not Found if the locale in the URL is not supported in ``Config\App::$supportedLocales``. See :ref:`Localization ` +- Added methods ``replace()``, ``addLineAfter()`` and ``addLineBefore()`` to modify files in Publisher. See :ref:`Publisher ` for details. - The call handler for Spark commands from the ``CodeIgniter\CodeIgniter`` class has been extracted. This will reduce the cost of console calls. Changes diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst index 9da4e6c9eb9d..630eac44b3ad 100644 --- a/user_guide_src/source/libraries/publisher.rst +++ b/user_guide_src/source/libraries/publisher.rst @@ -265,6 +265,8 @@ Example: .. literalinclude:: publisher/012.php +.. _publisher-modifying-files: + Modifying Files =============== From a8b0edd5a1d8d36daeb874100314b10342a81b5a Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 12 Jul 2022 17:43:18 +0900 Subject: [PATCH 0812/8282] docs: add @internal --- system/Database/BaseBuilder.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index e4b399f5fbee..a899ffbe5628 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -1924,6 +1924,12 @@ public function insert($set = null, ?bool $escape = null) return false; } + /** + * @internal This is a temporary solution. + * + * @see https://github.com/codeigniter4/CodeIgniter4/pull/5376 + * @TODO Fix a root cause, and this method should be removed. + */ protected function removeAlias(string $from): string { if (strpos($from, ' ') !== false) { From 3d3923570ea48479c4c7d280cb99e9ca3c4f3a95 Mon Sep 17 00:00:00 2001 From: Toto Date: Tue, 12 Jul 2022 18:28:18 +0700 Subject: [PATCH 0813/8282] remove `stale.yml` --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index f1ed82db1653..6d9cd569c5a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,7 +16,6 @@ contributing/ export-ignore CODE_OF_CONDUCT.md export-ignore CONTRIBUTING.md export-ignore PULL_REQUEST_TEMPLATE.md export-ignore -stale.yml export-ignore Vagrantfile.dist export-ignore # They don't want our test files From fe229a43d69eed9952f173200b3d164b9b3a5fa7 Mon Sep 17 00:00:00 2001 From: Toto Date: Tue, 12 Jul 2022 18:31:10 +0700 Subject: [PATCH 0814/8282] remove `PULL_REQUEST_TEMPLATE.md` --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6d9cd569c5a3..c17992b1ff54 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ contributing/ export-ignore .nojekyll export-ignore export-ignore CODE_OF_CONDUCT.md export-ignore CONTRIBUTING.md export-ignore -PULL_REQUEST_TEMPLATE.md export-ignore Vagrantfile.dist export-ignore # They don't want our test files From 189a561661d1a0c4368da9c7d8929ff03453ae23 Mon Sep 17 00:00:00 2001 From: Toto Date: Tue, 12 Jul 2022 18:35:54 +0700 Subject: [PATCH 0815/8282] remove `depfile.yaml` --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index c17992b1ff54..6e2767f58b27 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,7 +21,6 @@ Vagrantfile.dist export-ignore tests/AutoReview/ export-ignore tests/system/ export-ignore utils/ export-ignore -depfile.yaml export-ignore rector.php export-ignore phpunit.xml.dist export-ignore phpstan-baseline.neon.dist export-ignore From f7b54767cfec6c5b2905cf9159af4a8c408573a6 Mon Sep 17 00:00:00 2001 From: Toto Date: Tue, 12 Jul 2022 18:40:14 +0700 Subject: [PATCH 0816/8282] add `deptrac.yaml` --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 6e2767f58b27..e81e6ce3a031 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,6 +21,7 @@ Vagrantfile.dist export-ignore tests/AutoReview/ export-ignore tests/system/ export-ignore utils/ export-ignore +deptrac.yaml export-ignore rector.php export-ignore phpunit.xml.dist export-ignore phpstan-baseline.neon.dist export-ignore From 3fc49fd5b56729fbefe703f7b49414bc2f6f36ba Mon Sep 17 00:00:00 2001 From: fcosrno Date: Tue, 12 Jul 2022 13:16:44 -0400 Subject: [PATCH 0817/8282] Update CodeIgniter.php Use getenv instead of $_SESSION in detectEnvironment --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index e7b14a96f170..5468133b81c3 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -528,7 +528,7 @@ protected function detectEnvironment() { // Make sure ENVIRONMENT isn't already set by other means. if (! defined('ENVIRONMENT')) { - define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production'); + define('ENVIRONMENT', getenv('CI_ENVIRONMENT') ?? 'production'); } } From 3bddc85bacf7fc1354887f8ebc3711cb56aa1627 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 10 Jul 2022 14:10:35 -0700 Subject: [PATCH 0818/8282] Fix create table if not exists when indexes exist --- phpstan-baseline.neon.dist | 2 +- system/Database/Forge.php | 27 +++++----- system/Database/OCI8/Forge.php | 4 +- system/Database/SQLSRV/Forge.php | 12 +---- system/Database/SQLite3/Forge.php | 3 +- user_guide_src/source/dbmgmt/forge.rst | 4 +- user_guide_src/source/dbmgmt/forge/015.php | 2 +- .../source/installation/upgrade_422.rst | 50 +++++++++++++++++++ 8 files changed, 69 insertions(+), 35 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_422.rst diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 713e54cb0142..da08082b3e08 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -337,7 +337,7 @@ parameters: - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#" - count: 14 + count: 13 path: system/Database/SQLSRV/Forge.php - diff --git a/system/Database/Forge.php b/system/Database/Forge.php index 0ffd245fa7a0..8678022b5d19 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -107,9 +107,7 @@ class Forge protected $createTableStr = "%s %s (%s\n)"; /** - * CREATE TABLE IF statement - * - * @var bool|string + * @deprecated This is no longer used. */ protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS'; @@ -495,7 +493,14 @@ public function createTable(string $table, bool $ifNotExists = false, array $att throw new RuntimeException('Field information is required.'); } - $sql = $this->_createTable($table, $ifNotExists, $attributes); + // If table exists lets stop here + if ($ifNotExists === true && $this->db->tableExists($table)) { + $this->reset(); + + return true; + } + + $sql = $this->_createTable($table, false, $attributes); if (is_bool($sql)) { $this->reset(); @@ -530,20 +535,12 @@ public function createTable(string $table, bool $ifNotExists = false, array $att /** * @return bool|string + * + * @deprecated $ifNotExists is no longer used, and will be removed. */ protected function _createTable(string $table, bool $ifNotExists, array $attributes) { - // For any platforms that don't support Create If Not Exists... - if ($ifNotExists === true && $this->createTableIfStr === false) { - if ($this->db->tableExists($table)) { - return true; - } - - $ifNotExists = false; - } - - $sql = ($ifNotExists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table)) - : 'CREATE TABLE'; + $sql = 'CREATE TABLE'; $columns = $this->_processFields(true); diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 9cd5bad945cd..5fd7c5d0b8a5 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -40,9 +40,7 @@ class Forge extends BaseForge protected $createTableIfStr = false; /** - * DROP TABLE IF EXISTS statement - * - * @var false + * @deprecated This is no longer used. */ protected $dropTableIfStr = false; diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index 67ef057e12de..63130fd87289 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -91,9 +91,7 @@ class Forge extends BaseForge protected $createTableIfStr; /** - * CREATE TABLE statement - * - * @var string + * @deprecated This is no longer used. */ protected $createTableStr; @@ -101,14 +99,6 @@ public function __construct(BaseConnection $db) { parent::__construct($db); - $this->createTableIfStr = 'IF NOT EXISTS' - . '(SELECT t.name, s.name as schema_name, t.type_desc ' - . 'FROM sys.tables t ' - . 'INNER JOIN sys.schemas s on s.schema_id = t.schema_id ' - . "WHERE s.name=N'" . $this->db->schema . "' " - . "AND t.name=REPLACE(N'%s', '\"', '') " - . "AND t.type_desc='USER_TABLE')\nCREATE TABLE "; - $this->createTableStr = '%s ' . $this->db->escapeIdentifiers($this->db->schema) . ".%s (%s\n) "; $this->renameTableStr = 'EXEC sp_rename [' . $this->db->escapeIdentifiers($this->db->schema) . '.%s] , %s ;'; diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php index 1f48f20bd54e..154c9f97b554 100644 --- a/system/Database/SQLite3/Forge.php +++ b/system/Database/SQLite3/Forge.php @@ -56,8 +56,7 @@ public function __construct(BaseConnection $db) parent::__construct($db); if (version_compare($this->db->getVersion(), '3.3', '<')) { - $this->createTableIfStr = false; - $this->dropTableIfStr = false; + $this->dropTableIfStr = false; } } diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 804a0e6ac9d1..6464af2f99a8 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -191,8 +191,8 @@ with .. literalinclude:: forge/014.php -An optional second parameter set to true adds an ``IF NOT EXISTS`` clause -into the definition +An optional second parameter set to true will only execute create table statement if +the table name is not in the array of know tables .. literalinclude:: forge/015.php diff --git a/user_guide_src/source/dbmgmt/forge/015.php b/user_guide_src/source/dbmgmt/forge/015.php index ad478406a903..ec116bf6d00d 100644 --- a/user_guide_src/source/dbmgmt/forge/015.php +++ b/user_guide_src/source/dbmgmt/forge/015.php @@ -1,4 +1,4 @@ createTable('table_name', true); -// gives CREATE TABLE IF NOT EXISTS table_name +// creates table only if table does not exist diff --git a/user_guide_src/source/installation/upgrade_422.rst b/user_guide_src/source/installation/upgrade_422.rst new file mode 100644 index 000000000000..374f7703e97b --- /dev/null +++ b/user_guide_src/source/installation/upgrade_422.rst @@ -0,0 +1,50 @@ +############################# +Upgrading from 4.2.1 to 4.2.2 +############################# + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +Mandatory File Changes +********************** + + +Breaking Changes +**************** + +- The method ``Forge::createTable()`` no longer executes a ``CREATE TABLE IF NOT EXISTS``. If table is not found in ``$db->tableExists($table)`` then ``CREATE TABLE`` is executed. +- The method signature of ``Forge::_createTable()`` is deprecated. The ``bool`` ``$ifNotExists`` is no longer used and will be removed in a future release. + +Breaking Enhancements +********************* + + +Project Files +************* + +Numerous files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space + will break your application. All changes noted here are optional until the next major version, + and any mandatory changes will be covered in the sections above. + +Content Changes +=============== + + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + From fbf292f6c6f87a6b84fcf3028647cd482114cf74 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 12 Jul 2022 11:31:03 -0700 Subject: [PATCH 0819/8282] Cleanup create table if not exists when indexes exist --- system/Database/Forge.php | 4 +--- system/Database/OCI8/Forge.php | 8 ++++---- system/Database/SQLSRV/Forge.php | 8 ++++---- user_guide_src/source/dbmgmt/forge.rst | 3 +-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/system/Database/Forge.php b/system/Database/Forge.php index 8678022b5d19..a30c0f388ffb 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -540,8 +540,6 @@ public function createTable(string $table, bool $ifNotExists = false, array $att */ protected function _createTable(string $table, bool $ifNotExists, array $attributes) { - $sql = 'CREATE TABLE'; - $columns = $this->_processFields(true); for ($i = 0, $c = count($columns); $i < $c; $i++) { @@ -563,7 +561,7 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu return sprintf( $this->createTableStr . '%s', - $sql, + 'CREATE TABLE', $this->db->escapeIdentifiers($table), $columns, $this->_createTableAttributes($attributes) diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 5fd7c5d0b8a5..5dfc1cf77838 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -33,14 +33,14 @@ class Forge extends BaseForge protected $createDatabaseStr = false; /** - * CREATE TABLE IF statement - * - * @var false + * @deprecated This is no longer used. */ protected $createTableIfStr = false; /** - * @deprecated This is no longer used. + * DROP TABLE IF EXISTS statement + * + * @var false */ protected $dropTableIfStr = false; diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index 63130fd87289..f83fdc869494 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -84,14 +84,14 @@ class Forge extends BaseForge ]; /** - * CREATE TABLE IF statement - * - * @var string + * @deprecated This is no longer used. */ protected $createTableIfStr; /** - * @deprecated This is no longer used. + * CREATE TABLE statement + * + * @var string */ protected $createTableStr; diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 6464af2f99a8..2fb13c72d3e1 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -191,8 +191,7 @@ with .. literalinclude:: forge/014.php -An optional second parameter set to true will only execute create table statement if -the table name is not in the array of know tables +An optional second parameter set to true will create the table only if it doesn't already exist. .. literalinclude:: forge/015.php From 01689104f8934a168bfd14dd786154b10e7911dd Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 12 Jul 2022 13:46:59 -0700 Subject: [PATCH 0820/8282] Added change log and source guide notes --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + user_guide_src/source/database/metadata.rst | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index f2f311c5ce89..1730eb026d63 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -37,6 +37,7 @@ Enhancements - Added ``Model::allowEmptyInserts()`` method to insert empty data. See :ref:`Using CodeIgniter's Model ` - Added ``$routes->useSupportedLocalesOnly(true)`` so that the Router returns 404 Not Found if the locale in the URL is not supported in ``Config\App::$supportedLocales``. See :ref:`Localization ` - The call handler for Spark commands from the ``CodeIgniter\CodeIgniter`` class has been extracted. This will reduce the cost of console calls. +- Added a psuedo index named 'PRIMARY' for SQLite `AUTOINCREMENT` column. SQLite treats these in a special way which was excluding them from being retrieved by calling ``BaseConnection::getIndexData()``. Changes ******* diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst index 458f70004102..8e3c71458d90 100644 --- a/user_guide_src/source/database/metadata.rst +++ b/user_guide_src/source/database/metadata.rst @@ -121,6 +121,10 @@ The key types may be unique to the database you are using. For instance, MySQL will return one of primary, fulltext, spatial, index or unique for each key associated with a table. +SQLite3 includes a psuedo index named 'PRIMARY'. `AUTOINCREMENT` columns are treated +in special way and wouldn't otherwise be returned. A drop command on this index will +cause an error. + $db->getForeignKeyData() ------------------------ From 0e9335a0bfac45c259ece5e8673ba8bcbe83a369 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 12 Jul 2022 15:09:20 -0700 Subject: [PATCH 0821/8282] Fix Comments --- system/Database/Forge.php | 4 ++++ system/Database/OCI8/Forge.php | 4 ++++ system/Database/SQLSRV/Forge.php | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/system/Database/Forge.php b/system/Database/Forge.php index a30c0f388ffb..6f65f676a17c 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -107,6 +107,10 @@ class Forge protected $createTableStr = "%s %s (%s\n)"; /** + * CREATE TABLE IF statement + * + * @var bool|string + * * @deprecated This is no longer used. */ protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS'; diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 5dfc1cf77838..42393cd63aa9 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -33,6 +33,10 @@ class Forge extends BaseForge protected $createDatabaseStr = false; /** + * CREATE TABLE IF statement + * + * @var false + * * @deprecated This is no longer used. */ protected $createTableIfStr = false; diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index f83fdc869494..95ec9ff0b601 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -84,6 +84,10 @@ class Forge extends BaseForge ]; /** + * CREATE TABLE IF statement + * + * @var string + * * @deprecated This is no longer used. */ protected $createTableIfStr; From 3370dd632373f5962b7e96bcdcfef147fbe2cc59 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 12 Jul 2022 15:11:25 -0700 Subject: [PATCH 0822/8282] Update user_guide_src/source/installation/upgrade_422.rst Co-authored-by: kenjis --- user_guide_src/source/installation/upgrade_422.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_422.rst b/user_guide_src/source/installation/upgrade_422.rst index 374f7703e97b..b16b52675d4a 100644 --- a/user_guide_src/source/installation/upgrade_422.rst +++ b/user_guide_src/source/installation/upgrade_422.rst @@ -20,7 +20,7 @@ Breaking Changes **************** - The method ``Forge::createTable()`` no longer executes a ``CREATE TABLE IF NOT EXISTS``. If table is not found in ``$db->tableExists($table)`` then ``CREATE TABLE`` is executed. -- The method signature of ``Forge::_createTable()`` is deprecated. The ``bool`` ``$ifNotExists`` is no longer used and will be removed in a future release. +- The second parameter ``$ifNotExists`` of ``Forge::_createTable()`` is deprecated. It is no longer used and will be removed in a future release. Breaking Enhancements ********************* From 6c8e8b09f0db442f6baebdebad807ca8afff8293 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 11:22:07 +0900 Subject: [PATCH 0823/8282] docs: fix section title marks --- user_guide_src/source/testing/benchmark.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst index 1e7a5c9607b7..896ad7b53026 100644 --- a/user_guide_src/source/testing/benchmark.rst +++ b/user_guide_src/source/testing/benchmark.rst @@ -14,9 +14,9 @@ sending the output to the user, enabling a very accurate timing of the entire sy :local: :depth: 2 -=============== +*************** Using the Timer -=============== +*************** With the Timer, you can measure the time between two moments in the execution of your application. This makes it simple to measure the performance of different aspects of your application. All measurement is done using @@ -63,9 +63,9 @@ the timer to display. The second is the number of decimal places to display. Thi .. literalinclude:: benchmark/006.php -================== +****************** Using the Iterator -================== +****************** The Iterator is a simple tool that is designed to allow you to try out multiple variations on a solution to see the speed differences and different memory usage patterns. You can add any number of "tasks" for it to From 1b60a8efcc88a501cb59dd183eb9c4ad93a532af Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 11:26:38 +0900 Subject: [PATCH 0824/8282] docs: fix text decoration --- user_guide_src/source/testing/benchmark.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst index 896ad7b53026..6bc59c7826d1 100644 --- a/user_guide_src/source/testing/benchmark.rst +++ b/user_guide_src/source/testing/benchmark.rst @@ -3,7 +3,7 @@ Benchmarking ############ CodeIgniter provides two separate tools to help you benchmark your code and test different options: -the Timer and the Iterator. The Timer allows you to easily calculate the time between two points in the +the **Timer** and the **Iterator**. The Timer allows you to easily calculate the time between two points in the execution of your script. The Iterator allows you to set up several variations and runs those tests, recording performance and memory statistics to help you decide which version is the best. @@ -58,7 +58,7 @@ Displaying Execution Time ========================= While the ``getTimers()`` method will give you the raw data for all of the timers in your project, you can retrieve -the duration of a single timer, in seconds, with the `getElapsedTime()` method. The first parameter is the name of +the duration of a single timer, in seconds, with the ``getElapsedTime()`` method. The first parameter is the name of the timer to display. The second is the number of decimal places to display. This defaults to 4: .. literalinclude:: benchmark/006.php @@ -76,7 +76,7 @@ Creating Tasks To Run ===================== Tasks are defined within Closures. Any output the task creates will be discarded automatically. They are -added to the Iterator class through the `add()` method. The first parameter is a name you want to refer to +added to the Iterator class through the ``add()`` method. The first parameter is a name you want to refer to this test by. The second parameter is the Closure, itself: .. literalinclude:: benchmark/007.php @@ -91,6 +91,6 @@ to run the tests more times than that, you can pass the number as the first para .. literalinclude:: benchmark/008.php Once it has run, it will return an HTML table with the results of the test. If you don't want the results -displayed, you can pass in `false` as the second parameter: +displayed, you can pass in ``false`` as the second parameter: .. literalinclude:: benchmark/009.php From 57a8cc973238430f9fd6e5ab5215b82523332d51 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 11:35:47 +0900 Subject: [PATCH 0825/8282] docs: fix incorrect namespace --- user_guide_src/source/testing/benchmark/007.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/testing/benchmark/007.php b/user_guide_src/source/testing/benchmark/007.php index 13a95ec66e29..00c1b7aa2b8f 100644 --- a/user_guide_src/source/testing/benchmark/007.php +++ b/user_guide_src/source/testing/benchmark/007.php @@ -1,6 +1,6 @@ add('single_concat', static function () { From 3ad2dce923d8002e0766d1d0a96ed37a169d66a2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 11:36:21 +0900 Subject: [PATCH 0826/8282] docs: improve explanation --- user_guide_src/source/testing/benchmark.rst | 4 ++-- user_guide_src/source/testing/benchmark/008.php | 2 +- user_guide_src/source/testing/benchmark/009.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst index 6bc59c7826d1..fb92eb19dfec 100644 --- a/user_guide_src/source/testing/benchmark.rst +++ b/user_guide_src/source/testing/benchmark.rst @@ -90,7 +90,7 @@ to run the tests more times than that, you can pass the number as the first para .. literalinclude:: benchmark/008.php -Once it has run, it will return an HTML table with the results of the test. If you don't want the results -displayed, you can pass in ``false`` as the second parameter: +Once it has run, it will return an HTML table with the results of the test. +If you don't want the results, you can pass in ``false`` as the second parameter: .. literalinclude:: benchmark/009.php diff --git a/user_guide_src/source/testing/benchmark/008.php b/user_guide_src/source/testing/benchmark/008.php index da0f6a83b5fa..931250447f6c 100644 --- a/user_guide_src/source/testing/benchmark/008.php +++ b/user_guide_src/source/testing/benchmark/008.php @@ -1,4 +1,4 @@ run(3000); +$htmlTable = $iterator->run(3000); diff --git a/user_guide_src/source/testing/benchmark/009.php b/user_guide_src/source/testing/benchmark/009.php index 1f30692559b2..0e966c638e70 100644 --- a/user_guide_src/source/testing/benchmark/009.php +++ b/user_guide_src/source/testing/benchmark/009.php @@ -1,4 +1,4 @@ run(1000, false); From 1f732552d20f2b63f4a6e12d72a99d96996e0e0d Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 13:38:32 +0900 Subject: [PATCH 0827/8282] chore: update Kint to 4.1.3 in ThirdParty --- system/ThirdParty/Kint/Parser/Parser.php | 7 ++++++- system/ThirdParty/Kint/resources/compiled/rich.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php index d658b092479d..75781206bf01 100644 --- a/system/ThirdParty/Kint/Parser/Parser.php +++ b/system/ThirdParty/Kint/Parser/Parser.php @@ -34,6 +34,7 @@ use Kint\Zval\Value; use ReflectionObject; use stdClass; +use TypeError; class Parser { @@ -524,7 +525,11 @@ private function parseObject(&$var, Value $o) } $stash = $val; - $copy[$i] = $refmarker; + try { + $copy[$i] = $refmarker; + } catch (TypeError $e) { + $child->reference = true; + } if ($val === $refmarker) { $child->reference = true; $val = $stash; diff --git a/system/ThirdParty/Kint/resources/compiled/rich.js b/system/ThirdParty/Kint/resources/compiled/rich.js index 7ab616cf62c1..f15d38ff0616 100644 --- a/system/ThirdParty/Kint/resources/compiled/rich.js +++ b/system/ThirdParty/Kint/resources/compiled/rich.js @@ -1 +1 @@ -void 0===window.kintRich&&(window.kintRich=function(){"use strict";var l={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&e.classList.contains(t=void 0===t?"kint-show":t)},addClass:function(e,t){e.classList.add(t=void 0===t?"kint-show":t)},removeClass:function(e,t){return e.classList.remove(t=void 0===t?"kint-show":t),e},toggle:function(e,t){var a=l.getChildren(e);a&&((t=void 0===t?l.hasClass(e):t)?l.removeClass(e):l.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&l.hasClass(a,"kint-parent")&&l.toggle(a,t))},toggleChildren:function(e,t){var a=l.getChildren(e);if(a){var o=a.getElementsByClassName("kint-parent"),r=o.length;for(void 0===t&&(t=!l.hasClass(e));r--;)l.toggle(o[r],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,o=!l.hasClass(e.parentNode);a--;)l.toggle(t[a],o)},switchTab:function(e){var t=e.previousSibling,a=0;for(l.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),l.addClass(e,"kint-active-tab");t;)1===t.nodeType&&a++,t=t.previousSibling;for(var o=e.parentNode.nextSibling.childNodes,r=0;r"},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)",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&&l.removeClass(t,"kint-focused"),l.keyboardNav.active&&(t=l.keyboardNav.targets[l.keyboardNav.target],l.addClass(t,"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 Date: Wed, 13 Jul 2022 14:19:45 +0900 Subject: [PATCH 0828/8282] docs: add text decoration --- user_guide_src/source/libraries/uploaded_files.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 57951041e216..968cc4b68020 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -32,7 +32,7 @@ find reference information. Creating the Upload Form ======================== -Using a text editor, create a form called upload_form.php. In it, place +Using a text editor, create a form called **upload_form.php**. In it, place this code and save it to your **app/Views/** directory: .. literalinclude:: uploaded_files/001.php @@ -46,7 +46,7 @@ wrong. The Success Page ================ -Using a text editor, create a form called upload_success.php. In it, +Using a text editor, create a form called **upload_success.php**. In it, place this code and save it to your **app/Views/** directory:: @@ -72,7 +72,7 @@ place this code and save it to your **app/Views/** directory:: The Controller ============== -Using a text editor, create a controller called Upload.php. In it, place +Using a text editor, create a controller called **Upload.php**. In it, place this code and save it to your **app/Controllers/** directory: .. literalinclude:: uploaded_files/002.php From 8332b3b73b4a255e1c462b0e6428b1930f14f362 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 14:20:48 +0900 Subject: [PATCH 0829/8282] docs: add routing for Upload sample code --- .../source/libraries/uploaded_files.rst | 7 +++++++ .../source/libraries/uploaded_files/021.php | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 user_guide_src/source/libraries/uploaded_files/021.php diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 968cc4b68020..3695b5d5873e 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -81,6 +81,13 @@ this code and save it to your **app/Controllers/** directory: only :ref:`rules-for-file-uploads` can be used to validate upload file with :doc:`validation`. The rule ``required`` also can't be used, so use ``uploaded`` instead. +The Routes +========== + +Using a text editor, open **app/Config/Routes.php**. In it, add the following two routes: + +.. literalinclude:: uploaded_files/021.php + The Upload Directory ==================== diff --git a/user_guide_src/source/libraries/uploaded_files/021.php b/user_guide_src/source/libraries/uploaded_files/021.php new file mode 100644 index 000000000000..c7cfcddc76f7 --- /dev/null +++ b/user_guide_src/source/libraries/uploaded_files/021.php @@ -0,0 +1,18 @@ +get('/', 'Home::index'); + +$routes->get('upload', 'Upload::index'); // Add this line. +$routes->post('upload/upload', 'Upload::upload'); // Add this line. + +// ... From 708454cab1103e6e259fd62a11d6a6cc8582cb43 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 14:36:54 +0900 Subject: [PATCH 0830/8282] fix: add parameter checking --- system/Validation/FileRules.php | 10 +++++++--- tests/system/Validation/FileRulesTest.php | 10 ++++++++++ tests/system/Validation/StrictRules/FileRulesTest.php | 10 ++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php index 2becb34b1950..89b91a7fdbf8 100644 --- a/system/Validation/FileRules.php +++ b/system/Validation/FileRules.php @@ -14,6 +14,7 @@ use CodeIgniter\HTTP\RequestInterface; use Config\Mimes; use Config\Services; +use InvalidArgumentException; /** * File validation rules @@ -79,8 +80,11 @@ public function max_size(?string $blank, string $params): bool { // Grab the file name off the top of the $params // after we split it. - $params = explode(',', $params); - $name = array_shift($params); + $paramArray = explode(',', $params); + if (count($paramArray) !== 2) { + throw new InvalidArgumentException('Invalid max_size parameter: "' . $params . '"'); + } + $name = array_shift($paramArray); if (! ($files = $this->request->getFileMultiple($name))) { $files = [$this->request->getFile($name)]; @@ -99,7 +103,7 @@ public function max_size(?string $blank, string $params): bool return false; } - if ($file->getSize() / 1024 > $params[0]) { + if ($file->getSize() / 1024 > $paramArray[0]) { return false; } } diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php index 8c5ce6e142ac..574e1d4ec50f 100644 --- a/tests/system/Validation/FileRulesTest.php +++ b/tests/system/Validation/FileRulesTest.php @@ -13,6 +13,7 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use InvalidArgumentException; use Tests\Support\Validation\TestRules; /** @@ -198,6 +199,15 @@ public function testMaxSizeBad(): void $this->assertFalse($this->validation->run([])); } + public function testMaxSizeInvalidParam(): void + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid max_size parameter: "avatar.100"'); + + $this->validation->setRules(['avatar' => 'max_size[avatar.100]']); + $this->validation->run([]); + } + public function testMaxDims(): void { $this->validation->setRules(['avatar' => 'max_dims[avatar,640,480]']); diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php index 3446d9f62010..949339755761 100644 --- a/tests/system/Validation/StrictRules/FileRulesTest.php +++ b/tests/system/Validation/StrictRules/FileRulesTest.php @@ -14,6 +14,7 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; +use InvalidArgumentException; use Tests\Support\Validation\TestRules; /** @@ -199,6 +200,15 @@ public function testMaxSizeBad(): void $this->assertFalse($this->validation->run([])); } + public function testMaxSizeInvalidParam(): void + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Invalid max_size parameter: "avatar.100"'); + + $this->validation->setRules(['avatar' => 'max_size[avatar.100]']); + $this->validation->run([]); + } + public function testMaxDims(): void { $this->validation->setRules(['avatar' => 'max_dims[avatar,640,480]']); From 80bd30afccfe8d6fe59cd86fa289679713807720 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 17:16:56 +0900 Subject: [PATCH 0831/8282] refactor: replace locale_set_default() with Locale::setDefault() We are using Locale::getDefault(). --- system/CodeIgniter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index e7b14a96f170..35589102a2ca 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -35,6 +35,7 @@ use Kint; use Kint\Renderer\CliRenderer; use Kint\Renderer\RichRenderer; +use Locale; use LogicException; /** @@ -190,7 +191,7 @@ public function initialize() } // Set default locale on the server - locale_set_default($this->config->defaultLocale ?? 'en'); + Locale::setDefault($this->config->defaultLocale ?? 'en'); // Set default timezone on the server date_default_timezone_set($this->config->appTimezone ?? 'UTC'); From ad7e9e1429f635d7f347682a6539eae2894f35e8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 13 Jul 2022 17:15:00 +0900 Subject: [PATCH 0832/8282] fix: format_number() depends on IncommingRequest --- system/Helpers/number_helper.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 0a1e16cedc29..56a2c39e71dd 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -9,8 +9,6 @@ * the LICENSE file that was distributed with this source code. */ -use Config\Services; - // CodeIgniter Number Helpers if (! function_exists('number_to_size')) { @@ -129,8 +127,9 @@ function number_to_currency(float $num, string $currency, ?string $locale = null */ function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string { - // Locale is either passed in here, negotiated with client, or grabbed from our config file. - $locale ??= Services::request()->getLocale(); + // If locate is not passed, get from the default locale that is set from our config file + // or set by HTTP content negotiation. + $locale ??= Locale::getDefault(); // Type can be any of the NumberFormatter options, but provide a default. $type = (int) ($options['type'] ?? NumberFormatter::DECIMAL); From cdaadd34103615dab10864f0cba0f1f809bc8849 Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Wed, 13 Jul 2022 17:20:47 +0700 Subject: [PATCH 0833/8282] use SVG logo grab from codeigniter.com --- app/Views/welcome_message.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index c66a9615c6be..3193b5a98ecf 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -200,9 +200,10 @@
    -
  • From 711a4f7b5ba997bf68983a1b8f8f2dfcf12309ae Mon Sep 17 00:00:00 2001 From: sclubricants Date: Wed, 13 Jul 2022 10:14:26 -0700 Subject: [PATCH 0834/8282] fix _createTable() no longer returns bool --- system/Database/Forge.php | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/system/Database/Forge.php b/system/Database/Forge.php index 6f65f676a17c..5fd92843e926 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -506,19 +506,6 @@ public function createTable(string $table, bool $ifNotExists = false, array $att $sql = $this->_createTable($table, false, $attributes); - if (is_bool($sql)) { - $this->reset(); - if ($sql === false) { - if ($this->db->DBDebug) { - throw new DatabaseException('This feature is not available for the database you are using.'); - } - - return false; - } - - return true; - } - if (($result = $this->db->query($sql)) !== false) { if (isset($this->db->dataCache['table_names']) && ! in_array($table, $this->db->dataCache['table_names'], true)) { $this->db->dataCache['table_names'][] = $table; @@ -538,7 +525,7 @@ public function createTable(string $table, bool $ifNotExists = false, array $att } /** - * @return bool|string + * @return string * * @deprecated $ifNotExists is no longer used, and will be removed. */ From 741461c7aa8650a5583a79aabaac9429c2c23a05 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Wed, 13 Jul 2022 10:21:57 -0700 Subject: [PATCH 0835/8282] Update user_guide_src/source/changelogs/v4.3.0.rst Co-authored-by: kenjis --- user_guide_src/source/changelogs/v4.3.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 1730eb026d63..dd8fb8b0c8f1 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -37,7 +37,7 @@ Enhancements - Added ``Model::allowEmptyInserts()`` method to insert empty data. See :ref:`Using CodeIgniter's Model ` - Added ``$routes->useSupportedLocalesOnly(true)`` so that the Router returns 404 Not Found if the locale in the URL is not supported in ``Config\App::$supportedLocales``. See :ref:`Localization ` - The call handler for Spark commands from the ``CodeIgniter\CodeIgniter`` class has been extracted. This will reduce the cost of console calls. -- Added a psuedo index named 'PRIMARY' for SQLite `AUTOINCREMENT` column. SQLite treats these in a special way which was excluding them from being retrieved by calling ``BaseConnection::getIndexData()``. +- SQLite ``BaseConnection::getIndexData()`` now can return pseudo index named ``PRIMARY`` for `AUTOINCREMENT` column, and each returned index data has ``type`` property. Changes ******* From 97c89e13bd6d64f7e4b7c48034abb37990efddc2 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Wed, 13 Jul 2022 10:22:07 -0700 Subject: [PATCH 0836/8282] Update user_guide_src/source/database/metadata.rst Co-authored-by: kenjis --- user_guide_src/source/database/metadata.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst index 8e3c71458d90..ed864afaf801 100644 --- a/user_guide_src/source/database/metadata.rst +++ b/user_guide_src/source/database/metadata.rst @@ -121,9 +121,7 @@ The key types may be unique to the database you are using. For instance, MySQL will return one of primary, fulltext, spatial, index or unique for each key associated with a table. -SQLite3 includes a psuedo index named 'PRIMARY'. `AUTOINCREMENT` columns are treated -in special way and wouldn't otherwise be returned. A drop command on this index will -cause an error. +SQLite3 returns a pseudo index named ``PRIMARY``. But it is a special index, and you can't use it in your SQL commands. $db->getForeignKeyData() ------------------------ From b2abfbf75fbe1c509d5d36195db3c9c6753db75a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 06:50:50 +0900 Subject: [PATCH 0837/8282] docs: fix typo Co-authored-by: MGatner --- system/Helpers/number_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 56a2c39e71dd..c61229dad345 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -127,7 +127,7 @@ function number_to_currency(float $num, string $currency, ?string $locale = null */ function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string { - // If locate is not passed, get from the default locale that is set from our config file + // If locale is not passed, get from the default locale that is set from our config file // or set by HTTP content negotiation. $locale ??= Locale::getDefault(); From 38141de5bfc340325d4706455576ff525f8bdb5a Mon Sep 17 00:00:00 2001 From: Toto Prayogo Date: Thu, 14 Jul 2022 10:00:11 +0700 Subject: [PATCH 0838/8282] add `role` and `aria-label` Co-authored-by: kenjis --- app/Views/welcome_message.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index 3193b5a98ecf..c5325b57a813 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -201,8 +201,8 @@
    • From 0e086795c15ce4c2c193ae52d2a5520c07f8524a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 14:28:13 +0900 Subject: [PATCH 0839/8282] docs: improve text decoration --- user_guide_src/source/general/environments.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index 49ec2d6ed788..0807831da547 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -16,9 +16,9 @@ tools loaded that you don't in production environments, etc. The ENVIRONMENT Constant ======================== -By default, CodeIgniter comes with the environment constant set to use +By default, CodeIgniter comes with the ``ENVIRONMENT`` constant set to use the value provided in ``$_SERVER['CI_ENVIRONMENT']``, otherwise defaulting to -'production'. This can be set in several ways depending on your server setup. +``production``. This can be set in several ways depending on your server setup. .. note:: The environment ``testing`` is the special one for PHPUnit testing. It has special conditions built into the framework at various places to assist with that. From 011c53473b983ad7c8cce7589855b36363a29480 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 14:28:54 +0900 Subject: [PATCH 0840/8282] docs: add note on `spark env` --- user_guide_src/source/general/environments.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index 0807831da547..28426182cad8 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -24,6 +24,10 @@ the value provided in ``$_SERVER['CI_ENVIRONMENT']``, otherwise defaulting to It has special conditions built into the framework at various places to assist with that. You can't use it for your development. +.. note:: You can check the current environment by ``spark env`` command:: + + > php spark env + .env ---- @@ -33,6 +37,10 @@ The simplest method to set the variable is in your :doc:`.env file php spark env production + Apache ------ From 03b3057f8d324f13f7e5b61200c95c2ed1e55c98 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 14:32:02 +0900 Subject: [PATCH 0841/8282] docs: add note on `spark namespaces` --- user_guide_src/source/concepts/autoloader.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index db60dce9a427..ee2dc5a8a3d8 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -47,6 +47,10 @@ The key of each row is the namespace itself. This does not need a trailing back The value is the location to the directory the classes can be found in. They should have a trailing slash. +.. note:: You can check the namespace configuration by ``spark namespaces`` command:: + + > php spark namespaces + By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers, libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace. You may change this namespace by editing the **app/Config/Constants.php** file and setting the From 494d7f63e4a3530dec852d0827703eb7ef573121 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:19:15 +0900 Subject: [PATCH 0842/8282] docs: make section title linkable --- user_guide_src/source/libraries/caching.rst | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 57490e49e853..89792ebc6631 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -30,37 +30,44 @@ Configuring the Cache All configuration for the cache engine is done in **app/Config/Cache.php**. In that file, the following items are available. -**$handler** +$handler +-------- The is the name of the handler that should be used as the primary handler when starting up the engine. Available names are: dummy, file, memcached, redis, predis, wincache. -**$backupHandler** +$backupHandler +-------------- In the case that the first choice $handler is not available, this is the next cache handler to load. This is commonly the **file** handler since the file system is always available, but may not fit more complex, multi-server setups. -**$prefix** +$prefix +------- If you have more than one application using the same cache storage, you can add a custom prefix string here that is prepended to all key names. -**$ttl** +$ttl +---- The default number of seconds to save items when none is specified. WARNING: This is not used by framework handlers where 60 seconds is hard-coded, but may be useful to projects and modules. This will replace the hard-coded value in a future release. -**$file** +$file +----- This is an array of settings specific to the ``File`` handler to determine how it should save the cache files. -**$memcached** +$memcached +---------- This is an array of servers that will be used when using the ``Memcache(d)`` handler. -**$redis** +$redis +------ The settings for the Redis server that you wish to use when using the ``Redis`` and ``Predis`` handler. From e9709a2966658ea3463b2e87c32b303839f5da73 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:43:01 +0900 Subject: [PATCH 0843/8282] docs: remove unnecessary section title marks --- user_guide_src/source/libraries/caching.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 89792ebc6631..6230018929e9 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -23,7 +23,6 @@ You can grab an instance of the cache engine directly through the Services class .. literalinclude:: caching/002.php -===================== Configuring the Cache ===================== @@ -242,7 +241,6 @@ Class Reference Drivers ******* -================== File-based Caching ================== @@ -252,7 +250,6 @@ make sure to benchmark your application, as a point can come where disk I/O will negate positive gains by caching. This requires a cache directory to be really writable by the application. -================= Memcached Caching ================= @@ -263,7 +260,6 @@ Memcached servers can be specified in the cache configuration file. Available op For more information on Memcached, please see `https://www.php.net/memcached `_. -================ WinCache Caching ================ @@ -272,7 +268,6 @@ Under Windows, you can also utilize the WinCache driver. For more information on WinCache, please see `https://www.php.net/wincache `_. -============= Redis Caching ============= @@ -286,7 +281,6 @@ Config options to connect to redis server stored in the cache configuration file For more information on Redis, please see `https://redis.io `_. -============== Predis Caching ============== @@ -298,7 +292,6 @@ To use it, from the command line inside your project root:: For more information on Redis, please see `https://github.com/nrk/predis `_. -=========== Dummy Cache =========== From 5d026d619b625f8308673ccd362c6e10ea9088de Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:43:43 +0900 Subject: [PATCH 0844/8282] docs: add indentation for notes --- user_guide_src/source/libraries/caching.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 6230018929e9..1798b0cae395 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -119,8 +119,8 @@ Class Reference .. literalinclude:: caching/004.php -.. note:: The ``$raw`` parameter is only utilized by Memcache, - in order to allow usage of ``increment()`` and ``decrement()``. + .. note:: The ``$raw`` parameter is only utilized by Memcache, + in order to allow usage of ``increment()`` and ``decrement()``. .. php:method:: delete($key): bool @@ -203,8 +203,8 @@ Class Reference .. literalinclude:: caching/010.php -.. note:: The information returned and the structure of the data is dependent - on which adapter is being used. + .. note:: The information returned and the structure of the data is dependent + on which adapter is being used. .. php:method:: getMetadata(string $key) @@ -219,7 +219,7 @@ Class Reference .. literalinclude:: caching/011.php -.. note:: The information returned and the structure of the data is dependent + .. note:: The information returned and the structure of the data is dependent on which adapter is being used. Some adapters (File, Memcached, Wincache) still return ``false`` for missing items. From 9086bf27b2f231124cd17c72afaa3eed84ed1399 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:44:48 +0900 Subject: [PATCH 0845/8282] docs: fix text decoration --- user_guide_src/source/libraries/caching.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 1798b0cae395..0fd14b52d954 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -38,8 +38,8 @@ Available names are: dummy, file, memcached, redis, predis, wincache. $backupHandler -------------- -In the case that the first choice $handler is not available, this is the next cache handler to load. -This is commonly the **file** handler since the file system is always available, but may not fit +In the case that the first choice ``$handler`` is not available, this is the next cache handler to load. +This is commonly the ``File`` handler since the file system is always available, but may not fit more complex, multi-server setups. $prefix From 81cad468a1d98bbbfb24c8441ecfde2fcb41bd45 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:47:06 +0900 Subject: [PATCH 0846/8282] docs: add empty line --- user_guide_src/source/libraries/caching.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 0fd14b52d954..c60015fb476f 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -52,6 +52,7 @@ $ttl ---- The default number of seconds to save items when none is specified. + WARNING: This is not used by framework handlers where 60 seconds is hard-coded, but may be useful to projects and modules. This will replace the hard-coded value in a future release. From 6cae58009087803c5a381648d1cd0e436c34a25d Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 15:47:21 +0900 Subject: [PATCH 0847/8282] docs: add spark commands --- user_guide_src/source/libraries/caching.rst | 24 +++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index c60015fb476f..9d663fccdcdf 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -71,6 +71,30 @@ $redis The settings for the Redis server that you wish to use when using the ``Redis`` and ``Predis`` handler. +****************** +Command-Line Tools +****************** + +CodeIgniter ships with several :doc:`commands ` that are available +from the command line to help you work with Cache. +These tools are not required to use Cache driver but might help you. + +cache:clear +=========== + +Clears the current system caches:: + + > php spark cache:clear + +cache:info +========== + +Shows file cache information in the current system:: + + > php spark cache:info + +.. note:: This command only supports the File cache handler. + *************** Class Reference *************** From 148ab572e0e33747408b6aeac1dba8da200cf05a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 16:22:31 +0900 Subject: [PATCH 0848/8282] docs: make section title linkable --- user_guide_src/source/dbmgmt/migration.rst | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 5fc93f79aa6f..a1485ab8d086 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -112,7 +112,8 @@ CodeIgniter ships with several :doc:`commands ` that are avai you work with migrations. These tools are not required to use migrations but might make things easier for those of you that wish to use them. The tools primarily provide access to the same methods that are available within the MigrationRunner class. -**migrate** +migrate +======= Migrates a database group with all available migrations:: @@ -132,7 +133,8 @@ When using the ``--all`` option, it will scan through all namespaces attempting not been run. These will all be collected and then sorted as a group by date created. This should help to minimize any potential conflicts between the main application and any modules. -**rollback** +rollback +======== Rolls back all migrations, taking the database group to a blank slate, effectively migration 0:: @@ -144,7 +146,8 @@ You can use (rollback) with the following options: - ``-b`` - to choose a batch: natural numbers specify the batch, negatives indicate a relative batch - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment -**refresh** +refresh +======= Refreshes the database state by first rolling back all migrations, and then migrating all:: @@ -157,7 +160,8 @@ You can use (refresh) with the following options: - ``--all`` - to refresh all namespaces - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment -**status** +status +====== Displays a list of all migrations and the date and time they ran, or '--' if they have not been run:: @@ -174,7 +178,8 @@ You can use (status) with the following options: - ``-g`` - to choose database group, otherwise default database group will be used. -**make:migration** +make:migration +============== Creates a skeleton migration file in **app/Database/Migrations**. It automatically prepends the current timestamp. The class name it From 83b49b5a68609f3cd3da8739f89fb23d3d14aa68 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 14 Jul 2022 16:22:54 +0900 Subject: [PATCH 0849/8282] docs: fix link to Spark commands page --- user_guide_src/source/dbmgmt/migration.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index a1485ab8d086..71148ad98bff 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -108,7 +108,8 @@ to update the schema: ******************* Command-Line Tools ******************* -CodeIgniter ships with several :doc:`commands ` that are available from the command line to help + +CodeIgniter ships with several :doc:`commands ` that are available from the command line to help you work with migrations. These tools are not required to use migrations but might make things easier for those of you that wish to use them. The tools primarily provide access to the same methods that are available within the MigrationRunner class. From 8a2c1e9badcf0932734169942888b548eb55a54e Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 8 Jul 2022 16:21:03 -0700 Subject: [PATCH 0850/8282] test user table ->addUniqueKey('email')->addKey('country') --- .../Migrations/20160428212500_Create_test_tables.php | 2 +- tests/system/Database/Live/UpdateTest.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php index e802dcedc9be..ac489ecbb57b 100644 --- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php +++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php @@ -26,7 +26,7 @@ public function up() 'created_at' => ['type' => 'DATETIME', 'null' => true], 'updated_at' => ['type' => 'DATETIME', 'null' => true], 'deleted_at' => ['type' => 'DATETIME', 'null' => true], - ])->addKey('id', true)->createTable('user', true); + ])->addKey('id', true)->addUniqueKey('email')->addKey('country')->createTable('user', true); // Job Table $this->forge->addField([ diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php index d69db467cdc2..49e9446deb0d 100644 --- a/tests/system/Database/Live/UpdateTest.php +++ b/tests/system/Database/Live/UpdateTest.php @@ -51,8 +51,15 @@ public function testUpdateSetsAllWithoutWhereAndLimit() ->get() ->getResult(); - $this->assertSame('Bobby', $result[0]->name); - $this->assertSame('Ahmadinejad', $result[1]->name); + // this is really a bad test - indexes and other things can affect sort order + if ($this->db->DBDriver === 'SQLSRV') { + $this->assertSame('Derek Jones', $result[0]->name); + $this->assertSame('Bobby', $result[1]->name); + } else { + $this->assertSame('Bobby', $result[0]->name); + $this->assertSame('Ahmadinejad', $result[1]->name); + } + $this->assertSame('Richard A Causey', $result[2]->name); $this->assertSame('Chris Martin', $result[3]->name); } catch (DatabaseException $e) { From 0cf7fd3259be32f5b1209fefaa3b7f65825a6c55 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 8 Jul 2022 16:45:13 -0700 Subject: [PATCH 0851/8282] fix insertModelTest unique constraint error --- tests/system/Models/InsertModelTest.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php index 7cf1ceb87dde..77b7de0bf646 100644 --- a/tests/system/Models/InsertModelTest.php +++ b/tests/system/Models/InsertModelTest.php @@ -185,16 +185,24 @@ public function testInsertBatchNewEntityWithDateTime(): void ]; }; + $entityTwo = clone $entity; + $this->createModel(UserModel::class); - $entity->name = 'Mark'; - $entity->email = 'mark@example.com'; + $entity->name = 'Mark One'; + $entity->email = 'markone@example.com'; $entity->country = 'India'; $entity->deleted = 0; $entity->created_at = new Time('now'); + $entityTwo->name = 'Mark Two'; + $entityTwo->email = 'marktwo@example.com'; + $entityTwo->country = 'India'; + $entityTwo->deleted = 0; + $entityTwo->created_at = $entity->created_at; + $this->setPrivateProperty($this->model, 'useTimestamps', true); - $this->assertSame(2, $this->model->insertBatch([$entity, $entity])); + $this->assertSame(2, $this->model->insertBatch([$entity, $entityTwo])); } public function testInsertArrayWithNoDataException(): void From f9931e437651e3bde5d811190cc96e25fd357cb7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Jul 2022 09:43:47 +0900 Subject: [PATCH 0852/8282] fix: route name is not displayed in Exception message --- system/HTTP/RedirectResponse.php | 6 +++++- system/Language/en/HTTP.php | 2 +- tests/system/HTTP/RedirectResponseTest.php | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php index b9cabbba6793..1040c1578628 100644 --- a/system/HTTP/RedirectResponse.php +++ b/system/HTTP/RedirectResponse.php @@ -44,16 +44,20 @@ public function to(string $uri, ?int $code = null, string $method = 'auto') * Sets the URI to redirect to but as a reverse-routed or named route * instead of a raw URI. * + * @param string $route Named route or Controller::method + * * @throws HTTPException * * @return $this */ public function route(string $route, array $params = [], int $code = 302, string $method = 'auto') { + $namedRoute = $route; + $route = Services::routes()->reverseRoute($route, ...$params); if (! $route) { - throw HTTPException::forInvalidRedirectRoute($route); + throw HTTPException::forInvalidRedirectRoute($namedRoute); } return $this->redirect(site_url($route), $method, $code); diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php index 8902b8ea4d89..5ee3cae27bc3 100644 --- a/system/Language/en/HTTP.php +++ b/system/Language/en/HTTP.php @@ -27,7 +27,7 @@ 'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.', // RedirectResponse - 'invalidRoute' => '{0} route cannot be found while reverse-routing.', + 'invalidRoute' => 'The route for "{0}" cannot be found.', // DownloadResponse 'cannotSetBinary' => 'When setting filepath cannot set binary.', diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index 9773ab8c7b72..95cd6003f275 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -81,9 +81,10 @@ public function testRedirectRoute() $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location')); } - public function testRedirectRouteBad() + public function testRedirectRouteBadNamedRoute() { $this->expectException(HTTPException::class); + $this->expectExceptionMessage('The route for "differentRoute" cannot be found.'); $response = new RedirectResponse(new App()); @@ -92,6 +93,18 @@ public function testRedirectRouteBad() $response->route('differentRoute'); } + public function testRedirectRouteBadControllerMethod() + { + $this->expectException(HTTPException::class); + $this->expectExceptionMessage('The route for "Bad::badMethod" cannot be found.'); + + $response = new RedirectResponse(new App()); + + $this->routes->add('exampleRoute', 'Home::index'); + + $response->route('Bad::badMethod'); + } + public function testRedirectRelativeConvertsToFullURI() { $response = new RedirectResponse($this->config); From dcfc17e804081e43870a0e9c66df1caa0e0aae0f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Jul 2022 10:54:21 +0900 Subject: [PATCH 0853/8282] fix: spark routes does not show routes at all --- system/Commands/Utilities/Routes.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index c8fc46bf3876..c62e11df6d3f 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -75,7 +75,10 @@ class Routes extends BaseCommand */ public function run(array $params) { - $collection = Services::routes(true); + $routes = Services::routes(true); + require APPPATH . 'Config/Routes.php'; + + $collection = $routes; $methods = [ 'get', 'head', From f64e258ef81aa4de631e618cbd4379cbc1f70db4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Jul 2022 20:09:17 +0900 Subject: [PATCH 0854/8282] refactor: remove unnecessary getBody() --- system/Debug/Toolbar.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index b91fb16023b0..dcfdd60f66b2 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -397,8 +397,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r // for this response if ($request->isAJAX() || strpos($format, 'html') === false) { $response->setHeader('Debugbar-Time', "{$time}") - ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}")) - ->getBody(); + ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}")); return; } From b9cdbdc367b1a44fecf7bded0e0ad3d49244abcb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Jul 2022 20:11:33 +0900 Subject: [PATCH 0855/8282] style: break long line --- system/Debug/Toolbar.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index dcfdd60f66b2..462a019eae15 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -418,7 +418,14 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r . PHP_EOL; if (strpos($response->getBody(), '') !== false) { - $response->setBody(preg_replace('//', '' . $script, $response->getBody(), 1)); + $response->setBody( + preg_replace( + '//', + '' . $script, + $response->getBody(), + 1 + ) + ); return; } From a2e66a07bbcc7960d3db7624cebe8dabb0fa1894 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 08:02:44 +0900 Subject: [PATCH 0856/8282] docs: fix PHPDocs --- system/Entity/Entity.php | 4 ++-- system/Format/FormatterInterface.php | 2 +- system/Format/JSONFormatter.php | 2 +- system/HTTP/Message.php | 4 ++-- system/HTTP/MessageTrait.php | 2 +- system/HTTP/ResponseTrait.php | 7 ++++--- system/Helpers/array_helper.php | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 194f7441717b..7c451f646ea5 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -41,7 +41,7 @@ class Entity implements JsonSerializable * * Example: * $datamap = [ - * 'class_name' => 'db_name' + * 'class_property_name' => 'db_column_name' * ]; */ protected $datamap = []; @@ -287,7 +287,7 @@ public function setAttributes(array $data) * Checks the datamap to see if this property name is being mapped, * and returns the db column name, if any, or the original property name. * - * @return mixed|string + * @return string */ protected function mapProperty(string $key) { diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php index 04ba3e8973e9..f2b211152b87 100644 --- a/system/Format/FormatterInterface.php +++ b/system/Format/FormatterInterface.php @@ -21,7 +21,7 @@ interface FormatterInterface * * @param array|string $data * - * @return mixed + * @return bool|string */ public function format($data); } diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php index b9b3daaebb25..7933351a0507 100644 --- a/system/Format/JSONFormatter.php +++ b/system/Format/JSONFormatter.php @@ -24,7 +24,7 @@ class JSONFormatter implements FormatterInterface * * @param mixed $data * - * @return bool|string (JSON string | false) + * @return false|string (JSON string | false) */ public function format($data) { diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php index 99a4e39588b9..fb65d5436802 100644 --- a/system/HTTP/Message.php +++ b/system/HTTP/Message.php @@ -39,14 +39,14 @@ class Message implements MessageInterface /** * Message body * - * @var mixed + * @var string|null */ protected $body; /** * Returns the Message's body. * - * @return mixed + * @return string|null */ public function getBody() { diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php index ce2f98b78cca..90e36ad5dccc 100644 --- a/system/HTTP/MessageTrait.php +++ b/system/HTTP/MessageTrait.php @@ -45,7 +45,7 @@ trait MessageTrait /** * Sets the body of the current message. * - * @param mixed $data + * @param string $data * * @return $this */ diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index 7e317897d211..66c7ce263fed 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -299,7 +299,7 @@ public function getXML() } /** - * Handles conversion of the of the data into the appropriate format, + * Handles conversion of the data into the appropriate format, * and sets the correct Content-Type header for our response. * * @param array|string $body @@ -755,8 +755,9 @@ private function doSetCookie(string $name, string $value, array $options): void * Generates the headers that force a download to happen. And * sends the file to the browser. * - * @param string $filename The path to the file to send - * @param string|null $data The data to be downloaded + * @param string $filename The name you want the downloaded file to be named + * or the path to the file to send + * @param string|null $data The data to be downloaded. Set null if the $filename is the file path * @param bool $setMime Whether to try and send the actual MIME type * * @return DownloadResponse|null diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index 9d2b44876cc9..5a72efed67d3 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -16,7 +16,7 @@ * Searches an array through dot syntax. Supports * wildcard searches, like foo.*.bar * - * @return mixed + * @return array|bool|int|object|string|null */ function dot_array_search(string $index, array $array) { From 17b5c3f6dc13d3222e300bf7251d48616f26cde0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 08:42:12 +0900 Subject: [PATCH 0857/8282] docs: remove spaces at the end of the lines --- admin/module/tests/README.md | 38 +++++++++++++++--------------- admin/starter/tests/README.md | 42 ++++++++++++++++----------------- tests/README.md | 44 +++++++++++++++++------------------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/admin/module/tests/README.md b/admin/module/tests/README.md index 3c05eeae92e7..a56c5f04420f 100644 --- a/admin/module/tests/README.md +++ b/admin/module/tests/README.md @@ -1,8 +1,8 @@ # Running Module Tests -This is the quick-start to CodeIgniter testing. Its intent is to describe what -it takes to set up your module and get it ready to run unit tests. -It is not intended to be a full description of the test features that you can +This is the quick-start to CodeIgniter testing. Its intent is to describe what +it takes to set up your module and get it ready to run unit tests. +It is not intended to be a full description of the test features that you can use to test your module. Those details can be found in the documentation. ## Resources @@ -11,9 +11,9 @@ use to test your module. Those details can be found in the documentation. ## Requirements -It is recommended to use the latest version of PHPUnit. At the time of this -writing we are running version 8.5.13. Support for this has been built into the -**composer.json** file that ships with CodeIgniter and can easily be installed +It is recommended to use the latest version of PHPUnit. At the time of this +writing we are running version 8.5.13. Support for this has been built into the +**composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. > composer install @@ -27,10 +27,10 @@ for code coverage to be calculated successfully. ## Setting Up -A number of the tests use a running database. -In order to set up the database edit the details for the `tests` group in +A number of the tests use a running database. +In order to set up the database edit the details for the `tests` group in **phpunit.xml**. Make sure that you provide a database engine that is currently running -on your machine. More details on a test database setup are in the +on your machine. More details on a test database setup are in the *Docs>>Testing>>Testing Your Database* section of the documentation. ## Running the tests @@ -39,24 +39,24 @@ The entire test suite can be run by simply typing one command-line command from > ./phpunit -You can limit tests to those within a single test directory by specifying the -directory name after phpunit. +You can limit tests to those within a single test directory by specifying the +directory name after phpunit. > ./phpunit app/Models ## Generating Code Coverage -To generate coverage information, including HTML reports you can view in your browser, -you can use the following command: +To generate coverage information, including HTML reports you can view in your browser, +you can use the following command: > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m -This runs all of the tests again collecting information about how many lines, -functions, and files are tested. It also reports the percentage of the code that is covered by tests. -It is collected in two formats: a simple text file that provides an overview as well -as a comprehensive collection of HTML files that show the status of every line of code in the project. +This runs all of the tests again collecting information about how many lines, +functions, and files are tested. It also reports the percentage of the code that is covered by tests. +It is collected in two formats: a simple text file that provides an overview as well +as a comprehensive collection of HTML files that show the status of every line of code in the project. -The text file can be found at **tests/coverage.txt**. +The text file can be found at **tests/coverage.txt**. The HTML files can be viewed by opening **tests/coverage/index.html** in your favorite browser. ## PHPUnit XML Configuration @@ -67,7 +67,7 @@ do not have your own configuration file in the project root. The normal practice would be to copy ``phpunit.xml.dist`` to ``phpunit.xml`` (which is git ignored), and to tailor it as you see fit. -For instance, you might wish to exclude database tests, or automatically generate +For instance, you might wish to exclude database tests, or automatically generate HTML code coverage reports. ## Test Cases diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md index 9d20661afecd..8ef6b2ac80f7 100644 --- a/admin/starter/tests/README.md +++ b/admin/starter/tests/README.md @@ -1,8 +1,8 @@ # Running Application Tests -This is the quick-start to CodeIgniter testing. Its intent is to describe what -it takes to set up your application and get it ready to run unit tests. -It is not intended to be a full description of the test features that you can +This is the quick-start to CodeIgniter testing. Its intent is to describe what +it takes to set up your application and get it ready to run unit tests. +It is not intended to be a full description of the test features that you can use to test your application. Those details can be found in the documentation. ## Resources @@ -12,9 +12,9 @@ use to test your application. Those details can be found in the documentation. ## Requirements -It is recommended to use the latest version of PHPUnit. At the time of this -writing we are running version 9.x. Support for this has been built into the -**composer.json** file that ships with CodeIgniter and can easily be installed +It is recommended to use the latest version of PHPUnit. At the time of this +writing we are running version 9.x. Support for this has been built into the +**composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. > composer install @@ -28,14 +28,14 @@ for code coverage to be calculated successfully. ## Setting Up -A number of the tests use a running database. -In order to set up the database edit the details for the `tests` group in -**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine +A number of the tests use a running database. +In order to set up the database edit the details for the `tests` group in +**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine that is currently running on your machine. More details on a test database setup are in the [Testing Your Database](https://codeigniter4.github.io/userguide/testing/database.html) section of the documentation. -If you want to run the tests without using live database you can -exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml** - +If you want to run the tests without using live database you can +exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml** - call it **phpunit.xml** - and comment out the named "database". This will make the tests run quite a bit faster. @@ -49,24 +49,24 @@ If you are using Windows, use the following command. > vendor\bin\phpunit -You can limit tests to those within a single test directory by specifying the -directory name after phpunit. +You can limit tests to those within a single test directory by specifying the +directory name after phpunit. > ./phpunit app/Models ## Generating Code Coverage -To generate coverage information, including HTML reports you can view in your browser, -you can use the following command: +To generate coverage information, including HTML reports you can view in your browser, +you can use the following command: > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m -This runs all of the tests again collecting information about how many lines, -functions, and files are tested. It also reports the percentage of the code that is covered by tests. -It is collected in two formats: a simple text file that provides an overview as well -as a comprehensive collection of HTML files that show the status of every line of code in the project. +This runs all of the tests again collecting information about how many lines, +functions, and files are tested. It also reports the percentage of the code that is covered by tests. +It is collected in two formats: a simple text file that provides an overview as well +as a comprehensive collection of HTML files that show the status of every line of code in the project. -The text file can be found at **tests/coverage.txt**. +The text file can be found at **tests/coverage.txt**. The HTML files can be viewed by opening **tests/coverage/index.html** in your favorite browser. ## PHPUnit XML Configuration @@ -77,7 +77,7 @@ do not have your own configuration file in the project root. The normal practice would be to copy ``phpunit.xml.dist`` to ``phpunit.xml`` (which is git ignored), and to tailor it as you see fit. -For instance, you might wish to exclude database tests, or automatically generate +For instance, you might wish to exclude database tests, or automatically generate HTML code coverage reports. ## Test Cases diff --git a/tests/README.md b/tests/README.md index 40755f1b65c6..d13679915593 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,15 +1,15 @@ # Running System Tests -This is the quick-start to CodeIgniter testing. Its intent is to describe what -it takes to set up your system and get it ready to run unit tests. -It is not intended to be a full description of the test features that you can -use to test your application. Those details can be found in the documentation. +This is the quick-start to CodeIgniter testing. Its intent is to describe what +it takes to set up your system and get it ready to run unit tests. +It is not intended to be a full description of the test features that you can +use to test your application. Those details can be found in the documentation. ## Requirements -It is recommended to use the latest version of PHPUnit. At the time of this -writing we are running version 9.x. Support for this has been built into the -**composer.json** file that ships with CodeIgniter and can easily be installed +It is recommended to use the latest version of PHPUnit. At the time of this +writing we are running version 9.x. Support for this has been built into the +**composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. > composer install @@ -23,14 +23,14 @@ for code coverage to be calculated successfully. After installing `XDebug`, you ## Setting Up -A number of the tests use a running database. -In order to set up the database edit the details for the `tests` group in -**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine -that is currently running on your machine. More details on a test database setup are in the +A number of the tests use a running database. +In order to set up the database edit the details for the `tests` group in +**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine +that is currently running on your machine. More details on a test database setup are in the [Testing Your Database](https://codeigniter4.github.io/CodeIgniter4/testing/database.html) section of the documentation. -If you want to run the tests without using live database you can -exclude `@DatabaseLive` group. Or make a copy of **phpunit.dist.xml** - +If you want to run the tests without using live database you can +exclude `@DatabaseLive` group. Or make a copy of **phpunit.dist.xml** - call it **phpunit.xml** - and comment out the `` named `Database`. This will make the tests run quite a bit faster. @@ -44,7 +44,7 @@ If you are using Windows, use the following command. > vendor\bin\phpunit -You can limit tests to those within a single test directory by specifying the +You can limit tests to those within a single test directory by specifying the directory name after phpunit. All core tests are stored under **tests/system**. > ./phpunit tests/system/HTTP/ @@ -59,17 +59,17 @@ You can run the tests without running the live database and the live cache tests ## Generating Code Coverage -To generate coverage information, including HTML reports you can view in your browser, -you can use the following command: +To generate coverage information, including HTML reports you can view in your browser, +you can use the following command: > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m -This runs all of the tests again collecting information about how many lines, -functions, and files are tested. It also reports the percentage of the code that is covered by tests. -It is collected in two formats: a simple text file that provides an overview as well -as a comprehensive collection of HTML files that show the status of every line of code in the project. +This runs all of the tests again collecting information about how many lines, +functions, and files are tested. It also reports the percentage of the code that is covered by tests. +It is collected in two formats: a simple text file that provides an overview as well +as a comprehensive collection of HTML files that show the status of every line of code in the project. -The text file can be found at **tests/coverage.txt**. +The text file can be found at **tests/coverage.txt**. The HTML files can be viewed by opening **tests/coverage/index.html** in your favorite browser. ## PHPUnit XML Configuration @@ -80,5 +80,5 @@ do not have your own configuration file in the project root. The normal practice would be to copy ``phpunit.xml.dist`` to ``phpunit.xml`` (which is git ignored), and to tailor it as you see fit. -For instance, you might wish to exclude database tests, or automatically generate +For instance, you might wish to exclude database tests, or automatically generate HTML code coverage reports. From d19912336e32bc34d0a727f648da06d995728b9b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 08:37:18 +0900 Subject: [PATCH 0858/8282] docs: update command style --- admin/module/tests/README.md | 19 +++++++++++++++---- admin/starter/tests/README.md | 24 ++++++++++++++++++------ tests/README.md | 32 ++++++++++++++++++++++++-------- 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/admin/module/tests/README.md b/admin/module/tests/README.md index a56c5f04420f..0a1512c01317 100644 --- a/admin/module/tests/README.md +++ b/admin/module/tests/README.md @@ -16,11 +16,15 @@ writing we are running version 8.5.13. Support for this has been built into the **composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. - > composer install +```console +> composer install +``` If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. - > ln -s ./vendor/bin/phpunit ./phpunit +```console +> ln -s ./vendor/bin/phpunit ./phpunit +``` You also need to install [XDebug](https://xdebug.org/index.php) in order for code coverage to be calculated successfully. @@ -37,12 +41,16 @@ on your machine. More details on a test database setup are in the The entire test suite can be run by simply typing one command-line command from the main directory. - > ./phpunit +```console +> ./phpunit +``` You can limit tests to those within a single test directory by specifying the directory name after phpunit. - > ./phpunit app/Models +```console +> ./phpunit app/Models +``` ## Generating Code Coverage @@ -50,6 +58,9 @@ To generate coverage information, including HTML reports you can view in your br you can use the following command: > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +```console +> ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +``` This runs all of the tests again collecting information about how many lines, functions, and files are tested. It also reports the percentage of the code that is covered by tests. diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md index 8ef6b2ac80f7..f6a1f665e6ac 100644 --- a/admin/starter/tests/README.md +++ b/admin/starter/tests/README.md @@ -17,11 +17,15 @@ writing we are running version 9.x. Support for this has been built into the **composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. - > composer install +```console +> composer install +``` If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. - > ln -s ./vendor/bin/phpunit ./phpunit +```console +> ln -s ./vendor/bin/phpunit ./phpunit +``` You also need to install [XDebug](https://xdebug.org/index.php) in order for code coverage to be calculated successfully. @@ -43,23 +47,31 @@ the tests run quite a bit faster. The entire test suite can be run by simply typing one command-line command from the main directory. - > ./phpunit +```console +> ./phpunit +``` If you are using Windows, use the following command. - > vendor\bin\phpunit +```console +> vendor\bin\phpunit +``` You can limit tests to those within a single test directory by specifying the directory name after phpunit. - > ./phpunit app/Models +```console +> ./phpunit app/Models +``` ## Generating Code Coverage To generate coverage information, including HTML reports you can view in your browser, you can use the following command: - > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +```console +> ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +``` This runs all of the tests again collecting information about how many lines, functions, and files are tested. It also reports the percentage of the code that is covered by tests. diff --git a/tests/README.md b/tests/README.md index d13679915593..b64c2e9ed712 100644 --- a/tests/README.md +++ b/tests/README.md @@ -12,11 +12,15 @@ writing we are running version 9.x. Support for this has been built into the **composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. - > composer install +```console +> composer install +``` If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. - > ln -s ./vendor/bin/phpunit ./phpunit +```console +> ln -s ./vendor/bin/phpunit ./phpunit +``` You also need to install [XDebug](https://xdebug.org/docs/install) in order for code coverage to be calculated successfully. After installing `XDebug`, you must add `xdebug.mode=coverage` in the **php.ini** file to enable code coverage. @@ -38,31 +42,43 @@ the tests run quite a bit faster. The entire test suite can be run by simply typing one command-line command from the main directory. - > ./phpunit +```console +> ./phpunit +``` If you are using Windows, use the following command. - > vendor\bin\phpunit +```console +> vendor\bin\phpunit +``` You can limit tests to those within a single test directory by specifying the directory name after phpunit. All core tests are stored under **tests/system**. - > ./phpunit tests/system/HTTP/ +```console +> ./phpunit tests/system/HTTP/ +``` Individual tests can be run by including the relative path to the test file. - > ./phpunit tests/system/HTTP/RequestTest.php +```console +> ./phpunit tests/system/HTTP/RequestTest.php +``` You can run the tests without running the live database and the live cache tests. - > ./phpunit --exclude-group DatabaseLive,CacheLive +```console +> ./phpunit --exclude-group DatabaseLive,CacheLive +``` ## Generating Code Coverage To generate coverage information, including HTML reports you can view in your browser, you can use the following command: - > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +```console +> ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m +``` This runs all of the tests again collecting information about how many lines, functions, and files are tested. It also reports the percentage of the code that is covered by tests. From 8fe0acad8f8eaf8ffdbd67b176ea818422842397 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 08:46:38 +0900 Subject: [PATCH 0859/8282] docs: update test/README --- admin/module/tests/README.md | 26 +++++++++++++++++--------- admin/starter/tests/README.md | 17 +++++++---------- tests/README.md | 13 ++++++++++--- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/admin/module/tests/README.md b/admin/module/tests/README.md index 0a1512c01317..5645f7828e01 100644 --- a/admin/module/tests/README.md +++ b/admin/module/tests/README.md @@ -6,13 +6,15 @@ It is not intended to be a full description of the test features that you can use to test your module. Those details can be found in the documentation. ## Resources + * [CodeIgniter 4 User Guide on Testing](https://codeigniter4.github.io/userguide/testing/index.html) -* [PHPUnit docs](https://phpunit.readthedocs.io/en/8.5/index.html) +* [PHPUnit docs](https://phpunit.de/documentation.html) +* [Any tutorials on Unit testing in CI4?](https://forum.codeigniter.com/showthread.php?tid=81830) ## Requirements It is recommended to use the latest version of PHPUnit. At the time of this -writing we are running version 8.5.13. Support for this has been built into the +writing we are running version 9.x. Support for this has been built into the **composer.json** file that ships with CodeIgniter and can easily be installed via [Composer](https://getcomposer.org/) if you don't already have it installed globally. @@ -20,22 +22,23 @@ via [Composer](https://getcomposer.org/) if you don't already have it installed > composer install ``` -If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. +If running under macOS or Linux, you can create a symbolic link to make running tests a touch nicer. ```console > ln -s ./vendor/bin/phpunit ./phpunit ``` -You also need to install [XDebug](https://xdebug.org/index.php) in order -for code coverage to be calculated successfully. +You also need to install [XDebug](https://xdebug.org/docs/install) in order +for code coverage to be calculated successfully. After installing `XDebug`, you must add `xdebug.mode=coverage` in the **php.ini** file to enable code coverage. ## Setting Up A number of the tests use a running database. In order to set up the database edit the details for the `tests` group in -**phpunit.xml**. Make sure that you provide a database engine that is currently running -on your machine. More details on a test database setup are in the -*Docs>>Testing>>Testing Your Database* section of the documentation. +**phpunit.xml**. +Make sure that you provide a database engine that is currently running on your machine. +More details on a test database setup are in the +[Testing Your Database](https://codeigniter4.github.io/userguide/testing/database.html) section of the documentation. ## Running the tests @@ -45,6 +48,12 @@ The entire test suite can be run by simply typing one command-line command from > ./phpunit ``` +If you are using Windows, use the following command. + +```console +> vendor\bin\phpunit +``` + You can limit tests to those within a single test directory by specifying the directory name after phpunit. @@ -57,7 +66,6 @@ directory name after phpunit. To generate coverage information, including HTML reports you can view in your browser, you can use the following command: - > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m ```console > ./phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m ``` diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md index f6a1f665e6ac..473d0f8c140e 100644 --- a/admin/starter/tests/README.md +++ b/admin/starter/tests/README.md @@ -9,6 +9,7 @@ use to test your application. Those details can be found in the documentation. * [CodeIgniter 4 User Guide on Testing](https://codeigniter4.github.io/userguide/testing/index.html) * [PHPUnit docs](https://phpunit.de/documentation.html) +* [Any tutorials on Unit testing in CI4?](https://forum.codeigniter.com/showthread.php?tid=81830) ## Requirements @@ -21,28 +22,24 @@ via [Composer](https://getcomposer.org/) if you don't already have it installed > composer install ``` -If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. +If running under macOS or Linux, you can create a symbolic link to make running tests a touch nicer. ```console > ln -s ./vendor/bin/phpunit ./phpunit ``` -You also need to install [XDebug](https://xdebug.org/index.php) in order -for code coverage to be calculated successfully. +You also need to install [XDebug](https://xdebug.org/docs/install) in order +for code coverage to be calculated successfully. After installing `XDebug`, you must add `xdebug.mode=coverage` in the **php.ini** file to enable code coverage. ## Setting Up A number of the tests use a running database. In order to set up the database edit the details for the `tests` group in -**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine -that is currently running on your machine. More details on a test database setup are in the +**app/Config/Database.php** or **phpunit.xml**. +Make sure that you provide a database engine that is currently running on your machine. +More details on a test database setup are in the [Testing Your Database](https://codeigniter4.github.io/userguide/testing/database.html) section of the documentation. -If you want to run the tests without using live database you can -exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml** - -call it **phpunit.xml** - and comment out the named "database". This will make -the tests run quite a bit faster. - ## Running the tests The entire test suite can be run by simply typing one command-line command from the main directory. diff --git a/tests/README.md b/tests/README.md index b64c2e9ed712..5a7ddbbbed72 100644 --- a/tests/README.md +++ b/tests/README.md @@ -5,6 +5,12 @@ it takes to set up your system and get it ready to run unit tests. It is not intended to be a full description of the test features that you can use to test your application. Those details can be found in the documentation. +## Resources + +* [CodeIgniter 4 User Guide on Testing](https://codeigniter4.github.io/userguide/testing/index.html) +* [PHPUnit docs](https://phpunit.de/documentation.html) +* [Any tutorials on Unit testing in CI4?](https://forum.codeigniter.com/showthread.php?tid=81830) + ## Requirements It is recommended to use the latest version of PHPUnit. At the time of this @@ -16,7 +22,7 @@ via [Composer](https://getcomposer.org/) if you don't already have it installed > composer install ``` -If running under OS X or Linux, you can create a symbolic link to make running tests a touch nicer. +If running under macOS or Linux, you can create a symbolic link to make running tests a touch nicer. ```console > ln -s ./vendor/bin/phpunit ./phpunit @@ -29,8 +35,9 @@ for code coverage to be calculated successfully. After installing `XDebug`, you A number of the tests use a running database. In order to set up the database edit the details for the `tests` group in -**app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine -that is currently running on your machine. More details on a test database setup are in the +**app/Config/Database.php** or **phpunit.xml**. +Make sure that you provide a database engine that is currently running on your machine. +More details on a test database setup are in the [Testing Your Database](https://codeigniter4.github.io/CodeIgniter4/testing/database.html) section of the documentation. If you want to run the tests without using live database you can From d5787a96ea28a337e78917df6249f0f555988784 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 17:39:12 +0900 Subject: [PATCH 0860/8282] config: remove unnecessay env XDEBUG_MODE It does not work. See https://github.com/codeigniter4/CodeIgniter4/pull/6274#discussion_r923086225 --- phpunit.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6965a686f8e2..741cd106e080 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -70,7 +70,6 @@ - From 5834996df25becb9f7aedb331ac8fe4a9d0b940d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 17:40:40 +0900 Subject: [PATCH 0861/8282] config: use space for indentation Now we use 4 space indentation for XML --- admin/module/phpunit.xml.dist | 108 ++++++++++++++++----------------- admin/starter/phpunit.xml.dist | 108 ++++++++++++++++----------------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/admin/module/phpunit.xml.dist b/admin/module/phpunit.xml.dist index 39d1dd2dde54..60c32ae056e7 100644 --- a/admin/module/phpunit.xml.dist +++ b/admin/module/phpunit.xml.dist @@ -1,57 +1,57 @@ - - - ./src - - - ./src/Views - ./src/Config/Routes.php - - - - - - - - - - - ./tests - - - - - - - - - - - - - - - - - - + bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php" + backupGlobals="false" + colors="true" + convertErrorsToExceptions="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + stopOnError="false" + stopOnFailure="false" + stopOnIncomplete="false" + stopOnSkipped="false" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"> + + + ./src + + + ./src/Views + ./src/Config/Routes.php + + + + + + + + + + + ./tests + + + + + + + + + + + + + + + + + + diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index df6a6259f73e..62a473a733c4 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -1,57 +1,57 @@ - - - ./app - - - ./app/Views - ./app/Config/Routes.php - - - - - - - - - - - ./tests - - - - - - - - - - - - - - - - - - + bootstrap="vendor/codeigniter4/framework/system/Test/bootstrap.php" + backupGlobals="false" + colors="true" + convertErrorsToExceptions="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + stopOnError="false" + stopOnFailure="false" + stopOnIncomplete="false" + stopOnSkipped="false" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"> + + + ./app + + + ./app/Views + ./app/Config/Routes.php + + + + + + + + + + + ./tests + + + + + + + + + + + + + + + + + + From c8fda0f091741fba4a183da5f34b9df54143fa45 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Jul 2022 20:08:47 +0900 Subject: [PATCH 0862/8282] docs: fix wrong dir Co-authored-by: MGatner --- admin/module/tests/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/module/tests/README.md b/admin/module/tests/README.md index 5645f7828e01..be12d4c954c4 100644 --- a/admin/module/tests/README.md +++ b/admin/module/tests/README.md @@ -58,7 +58,7 @@ You can limit tests to those within a single test directory by specifying the directory name after phpunit. ```console -> ./phpunit app/Models +> ./phpunit tests/Models ``` ## Generating Code Coverage From 9489646ee85d8e237f57552eaca913a7e90d6345 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 19 Jul 2022 17:50:36 +0900 Subject: [PATCH 0863/8282] docs: add link to the forum thread for Unit Testing --- contributing/pull_request.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index d0a200aedbcf..628d5593da5a 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -55,6 +55,8 @@ You can check the coding style violations: ### Unit Testing +If you are not familiar with Unit Testing, see [the forum thread](https://forum.codeigniter.com/showthread.php?tid=81830). + Unit testing is expected for all CodeIgniter components. We use PHPUnit, and run unit tests using GitHub Actions for each PR submitted or changed. From 938a57608ea6454355c67d5b9764d8c1c96c2ff1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 19 Jul 2022 18:05:09 +0900 Subject: [PATCH 0864/8282] fix: spark routes show 404 error when using regex --- system/Commands/Utilities/Routes.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index c8fc46bf3876..5562e9eb8e9f 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -18,6 +18,7 @@ use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollector as AutoRouteCollectorImproved; use CodeIgniter\Commands\Utilities\Routes\FilterCollector; use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator; +use CodeIgniter\Exceptions\PageNotFoundException; use Config\Services; /** @@ -99,7 +100,15 @@ public function run(array $params) foreach ($routes as $route => $handler) { if (is_string($handler) || $handler instanceof Closure) { $sampleUri = $uriGenerator->get($route); - $filters = $filterCollector->get($method, $sampleUri); + + try { + $filters = $filterCollector->get($method, $sampleUri); + } catch (PageNotFoundException $e) { + $filters = [ + 'before' => [''], + 'after' => [''], + ]; + } $tbody[] = [ strtoupper($method), From d89bca7392ad9ba15850dc0bfe0bc2e23f655ffd Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 19 Jul 2022 19:09:15 +0900 Subject: [PATCH 0865/8282] fix: try/catch to FilterFilder::find() --- system/Commands/Utilities/Routes.php | 11 +---------- system/Commands/Utilities/Routes/FilterFinder.php | 6 ++++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index 5562e9eb8e9f..c8fc46bf3876 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -18,7 +18,6 @@ use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollector as AutoRouteCollectorImproved; use CodeIgniter\Commands\Utilities\Routes\FilterCollector; use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator; -use CodeIgniter\Exceptions\PageNotFoundException; use Config\Services; /** @@ -100,15 +99,7 @@ public function run(array $params) foreach ($routes as $route => $handler) { if (is_string($handler) || $handler instanceof Closure) { $sampleUri = $uriGenerator->get($route); - - try { - $filters = $filterCollector->get($method, $sampleUri); - } catch (PageNotFoundException $e) { - $filters = [ - 'before' => [''], - 'after' => [''], - ]; - } + $filters = $filterCollector->get($method, $sampleUri); $tbody[] = [ strtoupper($method), diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php index f36ddd9e362d..0f25eebf47f1 100644 --- a/system/Commands/Utilities/Routes/FilterFinder.php +++ b/system/Commands/Utilities/Routes/FilterFinder.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Filters\Filters; use CodeIgniter\Router\Exceptions\RedirectException; use CodeIgniter\Router\Router; @@ -67,6 +68,11 @@ public function find(string $uri): array 'before' => [], 'after' => [], ]; + } catch (PageNotFoundException $e) { + return [ + 'before' => [''], + 'after' => [''], + ]; } } } From ca73c0fcb6d6475252167f4891ee4d67f584167a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 11:30:16 +0900 Subject: [PATCH 0866/8282] docs: add/fix PHPDocs --- system/CodeIgniter.php | 10 +++++----- system/HTTP/DownloadResponse.php | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 35589102a2ca..8dd8f0eef1b3 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -21,7 +21,6 @@ use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Request; -use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use CodeIgniter\Router\Exceptions\RedirectException; @@ -298,10 +297,9 @@ protected function initializeKint() * tries to route the response, loads the controller and generally * makes all of the pieces work together. * - * @throws Exception * @throws RedirectException * - * @return bool|mixed|RequestInterface|ResponseInterface|void + * @return ResponseInterface|void */ public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false) { @@ -409,7 +407,7 @@ private function isWeb(): bool * @throws PageNotFoundException * @throws RedirectException * - * @return mixed|RequestInterface|ResponseInterface + * @return ResponseInterface */ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false) { @@ -641,7 +639,7 @@ protected function forceSecureAccess($duration = 31_536_000) * * @throws Exception * - * @return bool|ResponseInterface + * @return false|ResponseInterface */ public function displayCache(Cache $config) { @@ -1069,6 +1067,8 @@ public function spoofRequestMethod() /** * Sends the output of this request back to the client. * This is what they've been waiting for! + * + * @return void */ protected function sendResponse() { diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php index abd666fbca52..04ad8b80167e 100644 --- a/system/HTTP/DownloadResponse.php +++ b/system/HTTP/DownloadResponse.php @@ -247,6 +247,8 @@ public function setCache(array $options = []) /** * {@inheritDoc} * + * @return $this + * * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send() */ public function send() From 6e733b07b1f8f48b6aebd499a65a8cd226659dbf Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 11:32:17 +0900 Subject: [PATCH 0867/8282] refactor: do not return void return method --- system/CodeIgniter.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 8dd8f0eef1b3..2bce4ba10d00 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -319,7 +319,9 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon if ($this->request instanceof IncomingRequest && strtolower($this->request->getMethod()) === 'cli') { $this->response->setStatusCode(405)->setBody('Method Not Allowed'); - return $this->sendResponse(); + $this->sendResponse(); + + return; } Events::trigger('pre_system'); From f19169d8fdaddf0158baafb280a9d89163a134bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 11:54:12 +0900 Subject: [PATCH 0868/8282] fix: page cache saves Response before running after filters Response headers added by after filters will not be sent. Response body changes by after filters will be lost. --- system/CodeIgniter.php | 30 ++++++++++------ tests/system/CodeIgniterTest.php | 62 ++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 2bce4ba10d00..4504307b6cd2 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -475,6 +475,9 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // so it can be used with the output. $this->gatherOutput($cacheConfig, $returned); + // After filter debug toolbar requires 'total_execution'. + $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); + // Never run filters when running through Spark cli if (! $this->isSparked()) { $filters->setResponse($this->response); @@ -496,6 +499,17 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache $this->response = $response; } + // Cache it without the performance metrics replaced + // so that we can have live speed updates along the way. + // Must be run after filters to preserve the Response headers. + if (static::$cacheTTL > 0) { + $this->cachePage($cacheConfig); + } + + // Update the performance metrics + $output = $this->displayPerformanceMetrics($this->response->getBody()); + $this->response->setBody($output); + // Save our current URI as the previous URI in the session // for safer, more accurate use with `previous_url()` helper function. $this->storePreviousURL(current_url(true)); @@ -664,7 +678,8 @@ public function displayCache(Cache $config) $this->response->setHeader($name, $value); } - $output = $this->displayPerformanceMetrics($output); + $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); + $output = $this->displayPerformanceMetrics($output); $this->response->setBody($output); return $this->response; @@ -734,8 +749,6 @@ protected function generateCacheName(Cache $config): string */ public function displayPerformanceMetrics(string $output): string { - $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); - return str_replace('{elapsed_time}', (string) $this->totalTime, $output); } @@ -956,7 +969,10 @@ protected function display404errors(PageNotFoundException $e) * Gathers the script output from the buffer, replaces some execution * time tag in the output and displays the debug toolbar, if required. * + * @param Cache|null $cacheConfig Deprecated. No longer used. * @param ResponseInterface|string|null $returned + * + * @deprecated $cacheConfig is deprecated. */ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null) { @@ -992,14 +1008,6 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null) $this->output .= $returned; } - // Cache it without the performance metrics replaced - // so that we can have live speed updates along the way. - if (static::$cacheTTL > 0) { - $this->cachePage($cacheConfig); - } - - $this->output = $this->displayPerformanceMetrics($this->output); - $this->response->setBody($this->output); } diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 29d511d2a9d3..642539eb545f 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -15,8 +15,10 @@ use CodeIgniter\HTTP\Response; use CodeIgniter\Router\RouteCollection; use CodeIgniter\Test\CIUnitTestCase; +use CodeIgniter\Test\Filters\CITestStreamFilter; use CodeIgniter\Test\Mock\MockCodeIgniter; use Config\App; +use Config\Filters; use Config\Modules; use Tests\Support\Filters\Customfilter; @@ -531,4 +533,64 @@ public function testSpoofRequestMethodCannotUseGET() $this->assertSame('post', Services::request()->getMethod()); } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/6281 + */ + public function testPageCacheSendSecureHeaders() + { + // Suppress command() output + CITestStreamFilter::$buffer = ''; + $outputStreamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter'); + $errorStreamFilter = stream_filter_append(STDERR, 'CITestStreamFilter'); + + // Clear Page cache + command('cache:clear'); + + $_SERVER['REQUEST_URI'] = '/test'; + + $routes = Services::routes(); + $routes->add('test', static function () { + CodeIgniter::cache(3600); + + $response = Services::response(); + $string = 'This is a test page. Elapsed time: {elapsed_time}'; + + return $response->setBody($string); + }); + $router = Services::router($routes, Services::request()); + Services::injectMock('router', $router); + + /** @var Filters $filterConfig */ + $filterConfig = config('Filters'); + $filterConfig->globals['after'] = ['secureheaders']; + Services::filters($filterConfig); + + // The first response to be cached. + ob_start(); + $this->codeigniter->useSafeOutput(true)->run(); + $output = ob_get_clean(); + + $this->assertStringContainsString('This is a test page', $output); + $response = Services::response(); + $headers = $response->headers(); + $this->assertArrayHasKey('X-Frame-Options', $headers); + + // The second response from the Page cache. + ob_start(); + $this->codeigniter->useSafeOutput(true)->run(); + $output = ob_get_clean(); + + $this->assertStringContainsString('This is a test page', $output); + $response = Services::response(); + $headers = $response->headers(); + $this->assertArrayHasKey('X-Frame-Options', $headers); + + // Clear Page cache + command('cache:clear'); + + // Remove stream fliters + stream_filter_remove($outputStreamFilter); + stream_filter_remove($errorStreamFilter); + } } From 9b5a12478cbb9d76b302a86d5110564ef2e7a96b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 12:00:20 +0900 Subject: [PATCH 0869/8282] refactor: initialize static::$cacheTTL --- system/CodeIgniter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 4504307b6cd2..c6f06d881050 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -307,6 +307,8 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon throw new LogicException('Context must be set before run() is called. If you are upgrading from 4.1.x, you need to merge `public/index.php` and `spark` file from `vendor/codeigniter4/framework`.'); } + static::$cacheTTL = 0; + $this->startBenchmark(); $this->getRequestObject(); From 2814d57a646ca6bd6dd1657b634df72ced477ad2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 17:17:42 +0900 Subject: [PATCH 0870/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.2.2.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.2.rst b/user_guide_src/source/changelogs/v4.2.2.rst index eb457750e7c5..b05192efe1f6 100644 --- a/user_guide_src/source/changelogs/v4.2.2.rst +++ b/user_guide_src/source/changelogs/v4.2.2.rst @@ -15,6 +15,7 @@ BREAKING - Now ``Services::request()`` returns ``IncomingRequest`` or ``CLIRequest``. - The method signature of ``CodeIgniter\Debug\Exceptions::__construct()`` has been changed. The ``IncomingRequest`` typehint on the ``$request`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP. - The method signature of ``BaseBuilder.php::insert()`` and ``BaseBuilder.php::update()`` have been changed. The ``?array`` typehint on the ``$set`` parameter was removed. +- A bug that caused pages to be cached before after filters were executed when using page caching has been fixed. Adding response headers or changing the response body in after filters now caches them correctly. Enhancements ************ @@ -33,6 +34,7 @@ Deprecations ************ - The parameters of ``Services::request()`` are deprecated. +- The first parameter ``$cacheConfig`` of ``CodeIgniter::gatherOutput()`` is deprecated. Bugs Fixed ********** From f47842faf66e9acc1420ad6f086d4abdfe6e4318 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Jul 2022 17:18:01 +0900 Subject: [PATCH 0871/8282] docs: fix @var --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index c6f06d881050..bd1a2cd3154f 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -54,7 +54,7 @@ class CodeIgniter /** * App startup time. * - * @var mixed + * @var float|null */ protected $startTime; From 91f6f1c1348995fe1956edddd0ddedbf46309daa Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 10:28:14 +0900 Subject: [PATCH 0872/8282] docs: add upgrade guide --- user_guide_src/source/incoming/filters.rst | 4 ++++ user_guide_src/source/installation/upgrade_422.rst | 11 +++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 3 files changed, 16 insertions(+) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 7fdbef70d3be..b0fda865fe66 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -50,6 +50,8 @@ If a ``Response`` instance is returned, the Response will be sent back to the cl This can be useful for implementing rate limiting for APIs. See :doc:`Throttler ` for an example. +.. _after-filters: + After Filters ============= @@ -169,6 +171,8 @@ This filter prohibits user input data (``$_GET``, ``$_POST``, ``$_COOKIE``, ``ph - invalid UTF-8 characters - control characters except line break and tab code +.. _secureheaders: + SecureHeaders ============= diff --git a/user_guide_src/source/installation/upgrade_422.rst b/user_guide_src/source/installation/upgrade_422.rst index b16b52675d4a..82a388ce8c4a 100644 --- a/user_guide_src/source/installation/upgrade_422.rst +++ b/user_guide_src/source/installation/upgrade_422.rst @@ -19,6 +19,17 @@ Mandatory File Changes Breaking Changes **************** +Web Page Caching Bug Fix +======================== + +- :doc:`../general/caching` now caches the Response data after :ref:`after-filters` are executed. +- For example, if you enables :ref:`secureheaders`, the Response headers are now sent when the page comes from the cache. + +.. important:: If you have written **code based on the bug** that changes to the Response in the after filters are not cached, **sensitive information could be cached and compromised**. If this is the case, change your code to disable caching of the page. + +Others +====== + - The method ``Forge::createTable()`` no longer executes a ``CREATE TABLE IF NOT EXISTS``. If table is not found in ``$db->tableExists($table)`` then ``CREATE TABLE`` is executed. - The second parameter ``$ifNotExists`` of ``Forge::_createTable()`` is deprecated. It is no longer used and will be removed in a future release. diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 3570419e19c2..0a2d5a975968 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -12,6 +12,7 @@ upgrading from. .. toctree:: :titlesonly: + upgrade_422 upgrade_421 upgrade_420 upgrade_418 From 9469097132b825abd6fa1e734cec8b797c79b1bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 11:28:48 +0900 Subject: [PATCH 0873/8282] feat: add spark filter:check command --- system/Commands/Utilities/FilterCheck.php | 127 ++++++++++++++++++++++ tests/system/Commands/FilterCheckTest.php | 60 ++++++++++ 2 files changed, 187 insertions(+) create mode 100644 system/Commands/Utilities/FilterCheck.php create mode 100644 tests/system/Commands/FilterCheckTest.php diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php new file mode 100644 index 000000000000..9f991b4e424c --- /dev/null +++ b/system/Commands/Utilities/FilterCheck.php @@ -0,0 +1,127 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Commands\Utilities; + +use CodeIgniter\CLI\BaseCommand; +use CodeIgniter\CLI\CLI; +use CodeIgniter\Commands\Utilities\Routes\FilterCollector; +use Config\Services; + +/** + * Check filters for a route. + */ +class FilterCheck extends BaseCommand +{ + /** + * The group the command is lumped under + * when listing commands. + * + * @var string + */ + protected $group = 'CodeIgniter'; + + /** + * The Command's name + * + * @var string + */ + protected $name = 'filter:check'; + + /** + * the Command's short description + * + * @var string + */ + protected $description = 'Check filters for a route.'; + + /** + * the Command's usage + * + * @var string + */ + protected $usage = 'filter:check '; + + /** + * the Command's Arguments + * + * @var array + */ + protected $arguments = [ + 'method' => 'The HTTP method. get, post, put, etc.', + 'route' => 'The route (URI path) to check filtes.', + ]; + + /** + * the Command's Options + * + * @var array + */ + protected $options = []; + + /** + * @return int exit code + */ + public function run(array $params) + { + if (count($params) !== 2) { + CLI::error('You must specify a HTTP verb and a route.', 'light_gray', 'red'); + CLI::write(' Usage: ' . $this->usage); + CLI::write('Example: filter:check get /'); + CLI::write(' filter:check put products/1'); + + return EXIT_ERROR; + } + + $method = strtolower($params[0]); + $route = $params[1]; + + // Load Routes + $routes = Services::routes(); + require APPPATH . 'Config/Routes.php'; + $routes->getRoutes('*'); // Triggers discovery + + $filterCollector = new FilterCollector(); + + $filters = $filterCollector->get($method, $route); + + // PageNotFoundException + if ($filters['before'] === ['']) { + CLI::error( + "Can't find a route: " . + CLI::color( + '"' . strtoupper($method) . ' ' . $route . '"', + 'black' + ), + ); + + return EXIT_ERROR; + } + + $tbody[] = [ + strtoupper($method), + $route, + implode(' ', $filters['before']), + implode(' ', $filters['after']), + ]; + + $thead = [ + 'Method', + 'Route', + 'Before Filters', + 'After Filters', + ]; + + CLI::table($tbody, $thead); + + return EXIT_SUCCESS; + } +} diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php new file mode 100644 index 000000000000..8e08a67bf40b --- /dev/null +++ b/tests/system/Commands/FilterCheckTest.php @@ -0,0 +1,60 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Commands; + +use CodeIgniter\Test\CIUnitTestCase; +use CodeIgniter\Test\StreamFilterTrait; + +/** + * @internal + */ +final class FilterCheckTest extends CIUnitTestCase +{ + use StreamFilterTrait; + + protected function setUp(): void + { + $this->resetServices(); + parent::setUp(); + } + + protected function tearDown(): void + { + $this->resetServices(); + parent::tearDown(); + } + + protected function getBuffer() + { + return $this->getStreamFilterBuffer(); + } + + public function testFilterCheckDefinedRoute() + { + command('filter:check get /'); + + $this->assertStringContainsString( + '|GET|/||toolbar|', + str_replace(' ', '', $this->getBuffer()) + ); + } + + public function testFilterCheckInvalidRoute() + { + command('filter:check put product/123'); + + $this->assertStringContainsString( + 'Can\'t find a route: "PUT product/123"', + str_replace(["\033[0m", "\033[0;31m", "\033[0;30m"], '', $this->getBuffer()) + ); + } +} From cb3b9f792cccf760996bd0440494ad5b4b414823 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 13:54:41 +0900 Subject: [PATCH 0874/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.2.0.rst | 2 +- user_guide_src/source/changelogs/v4.3.0.rst | 1 + user_guide_src/source/incoming/filters.rst | 25 +++++++++++++++++++-- user_guide_src/source/incoming/routing.rst | 4 ++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst index 2270c38e3f1b..adb81d77ab6d 100644 --- a/user_guide_src/source/changelogs/v4.2.0.rst +++ b/user_guide_src/source/changelogs/v4.2.0.rst @@ -113,7 +113,7 @@ Commands - ``spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc`` - Or you can see metadata like the column type, max length of a table. - ``spark db:table my_table --metadata`` -- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing `. +- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing `. Others ====== diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 3f8385767308..c511bd2b5683 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -39,6 +39,7 @@ Enhancements - Added methods ``replace()``, ``addLineAfter()`` and ``addLineBefore()`` to modify files in Publisher. See :ref:`Publisher ` for details. - The call handler for Spark commands from the ``CodeIgniter\CodeIgniter`` class has been extracted. This will reduce the cost of console calls. - SQLite ``BaseConnection::getIndexData()`` now can return pseudo index named ``PRIMARY`` for `AUTOINCREMENT` column, and each returned index data has ``type`` property. +- Added ``spark filter:check`` command to check the filters for a route. See :ref:`Controller Filters ` for the details. Changes ******* diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 7fdbef70d3be..482b58d480ce 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -150,8 +150,29 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen Confirming Filters ****************** -You can see the routes and filters by the ``spark routes`` command. -See :ref:`URI Routing `. +CodeIgniter has the following :doc:`command ` to check the filters for a route. + +.. _spark-filter-check: + +filter:check +============ + +Check the filters for the route ``/`` with **GET** method:: + + > php spark filter:check get / + +The output is like the following: + +.. code-block:: none + + +--------+-------+----------------+---------------+ + | Method | Route | Before Filters | After Filters | + +--------+-------+----------------+---------------+ + | GET | / | | toolbar | + +--------+-------+----------------+---------------+ + +You can also see the routes and filters by the ``spark routes`` command. +See :ref:`URI Routing `. **************** Provided Filters diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 10b9946c20fe..03d6ee8625cc 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -713,7 +713,7 @@ Confirming Routes CodeIgniter has the following :doc:`command ` to display all routes. -.. _spark-routes: +.. _routing-spark-routes: routes ====== @@ -756,4 +756,4 @@ The *Method* will be like ``GET(auto)``. ``/..`` in the *Route* column indicates .. note:: When auto-routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``. -.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly. +.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. If you want to check filters for a route, you can use :ref:`spark filter:check ` command. From 8bc589a8ab860efac65a4812fd2949f803cca0d8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 14:55:49 +0900 Subject: [PATCH 0875/8282] docs: decorate db column names --- user_guide_src/source/models/entities.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst index d2c99c8623b6..473194d3b80b 100644 --- a/user_guide_src/source/models/entities.rst +++ b/user_guide_src/source/models/entities.rst @@ -144,9 +144,9 @@ As an example, imagine you have the simplified User Entity that is used througho .. literalinclude:: entities/008.php Your boss comes to you and says that no one uses usernames anymore, so you're switching to just use emails for login. -But they do want to personalize the application a bit, so they want you to change the name field to represent a user's +But they do want to personalize the application a bit, so they want you to change the ``name`` field to represent a user's full name now, not their username like it does currently. To keep things tidy and ensure things continue making sense -in the database you whip up a migration to rename the `name` field to `full_name` for clarity. +in the database you whip up a migration to rename the ``name`` field to ``full_name`` for clarity. Ignoring how contrived this example is, we now have two choices on how to fix the User class. We could modify the class property from ``$name`` to ``$full_name``, but that would require changes throughout the application. Instead, we can From abe670ef583515a0f812f7e65468ab8f9aed382f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 15:14:33 +0900 Subject: [PATCH 0876/8282] docs: improve code comments --- user_guide_src/source/models/entities/009.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/models/entities/009.php b/user_guide_src/source/models/entities/009.php index 411961833749..772cb6509d38 100644 --- a/user_guide_src/source/models/entities/009.php +++ b/user_guide_src/source/models/entities/009.php @@ -8,7 +8,7 @@ class User extends Entity { protected $attributes = [ 'id' => null, - 'full_name' => null, // In the $attributes, the key is the column name + 'full_name' => null, // In the $attributes, the key is the db column name 'email' => null, 'password' => null, 'created_at' => null, @@ -16,6 +16,7 @@ class User extends Entity ]; protected $datamap = [ + // property_name => db_column_name 'name' => 'full_name', ]; } From f422f3b3a83e29e0ac34e55161d18b590957e320 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 15:15:58 +0900 Subject: [PATCH 0877/8282] docs: update PHPDocs --- system/Entity/Entity.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 7c451f646ea5..73fe16d791cc 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -146,7 +146,7 @@ public function fill(?array $data = null) * __get() magic method so will have any casts, etc applied to them. * * @param bool $onlyChanged If true, only return values that have changed since object creation - * @param bool $cast If true, properties will be casted. + * @param bool $cast If true, properties will be cast. * @param bool $recursive If true, inner entities will be casted as array as well. */ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array @@ -287,7 +287,7 @@ public function setAttributes(array $data) * Checks the datamap to see if this property name is being mapped, * and returns the db column name, if any, or the original property name. * - * @return string + * @return string db column name */ protected function mapProperty(string $key) { From 9c8d05ee8bd81d24e37a491bcae3ddc1aec8de02 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 15:16:36 +0900 Subject: [PATCH 0878/8282] fix: hasChanged() returns wrong result to mapped property --- system/Entity/Entity.php | 2 ++ tests/system/Entity/EntityTest.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 73fe16d791cc..06f962328759 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -256,6 +256,8 @@ public function hasChanged(?string $key = null): bool return $this->original !== $this->attributes; } + $key = $this->mapProperty($key); + // Key doesn't exist in either if (! array_key_exists($key, $this->original) && ! array_key_exists($key, $this->attributes)) { return false; diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index d88f509694f7..2838aa02269e 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -929,6 +929,24 @@ public function testHasChangedNoChange() $this->assertFalse($entity->hasChanged('default')); } + public function testHasChangedMappedNoChange() + { + $entity = $this->getEntity(); + + $entity->createdAt = null; + + $this->assertFalse($entity->hasChanged('createdAt')); + } + + public function testHasChangedMappedChanged() + { + $entity = $this->getEntity(); + + $entity->createdAt = '2022-11-11 11:11:11'; + + $this->assertTrue($entity->hasChanged('createdAt')); + } + public function testHasChangedWholeEntity() { $entity = $this->getEntity(); From c48ed132fc0573897c8797fdb96c2926dbd2df1b Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 15:29:40 +0900 Subject: [PATCH 0879/8282] docs: add note for setter and getter with data mapping --- user_guide_src/source/models/entities.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst index 473194d3b80b..55187ae7a0ad 100644 --- a/user_guide_src/source/models/entities.rst +++ b/user_guide_src/source/models/entities.rst @@ -164,6 +164,10 @@ through the original ``$user->full_name``, also, as this is needed for the model to the database. However, ``unset()`` and ``isset()`` only work on the mapped property, ``$user->name``, not on the database column name, ``$user->full_name``. +.. note:: When you use Data Mapping, you must define ``set*()`` and ``get*()`` method + for the database column name. In this example, you must define ``setFullName()`` and + ``getFullName()``. + Mutators ======== From 77347707c69446e8adb9b50a9e69cfba88fa7ada Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 15:30:12 +0900 Subject: [PATCH 0880/8282] docs: fix comment --- system/Entity/Entity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 06f962328759..39adf0661215 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -482,7 +482,7 @@ public function __get(string $key) // Convert to CamelCase for the method $method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key))); - // if a set* method exists for this key, + // if a get* method exists for this key, // use that method to insert this value. if (method_exists($this, $method)) { $result = $this->{$method}(); From 30a45fa842414817242a5f5a6354ad06174dafb0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 22 Jul 2022 09:50:33 +0900 Subject: [PATCH 0881/8282] fix: parameter checking --- system/Commands/Utilities/FilterCheck.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php index 9f991b4e424c..0731f28a30b3 100644 --- a/system/Commands/Utilities/FilterCheck.php +++ b/system/Commands/Utilities/FilterCheck.php @@ -72,7 +72,7 @@ class FilterCheck extends BaseCommand */ public function run(array $params) { - if (count($params) !== 2) { + if (! isset($params[0], $params[1])) { CLI::error('You must specify a HTTP verb and a route.', 'light_gray', 'red'); CLI::write(' Usage: ' . $this->usage); CLI::write('Example: filter:check get /'); From a3178b22f6c5d307662666f8bcf73fb53e5c6176 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 22 Jul 2022 09:52:13 +0900 Subject: [PATCH 0882/8282] fix: output color --- system/Commands/Utilities/FilterCheck.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php index 0731f28a30b3..7469ce1444c2 100644 --- a/system/Commands/Utilities/FilterCheck.php +++ b/system/Commands/Utilities/FilterCheck.php @@ -73,7 +73,7 @@ class FilterCheck extends BaseCommand public function run(array $params) { if (! isset($params[0], $params[1])) { - CLI::error('You must specify a HTTP verb and a route.', 'light_gray', 'red'); + CLI::error('You must specify a HTTP verb and a route.'); CLI::write(' Usage: ' . $this->usage); CLI::write('Example: filter:check get /'); CLI::write(' filter:check put products/1'); @@ -99,7 +99,8 @@ public function run(array $params) "Can't find a route: " . CLI::color( '"' . strtoupper($method) . ' ' . $route . '"', - 'black' + 'black', + 'light_gray' ), ); From 724f9c758e0b30b30f9a4d9ce9825980932b1527 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 22 Jul 2022 10:31:47 +0900 Subject: [PATCH 0883/8282] test: fix test case --- tests/system/Commands/FilterCheckTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php index 8e08a67bf40b..d5bd14e5f534 100644 --- a/tests/system/Commands/FilterCheckTest.php +++ b/tests/system/Commands/FilterCheckTest.php @@ -54,7 +54,11 @@ public function testFilterCheckInvalidRoute() $this->assertStringContainsString( 'Can\'t find a route: "PUT product/123"', - str_replace(["\033[0m", "\033[0;31m", "\033[0;30m"], '', $this->getBuffer()) + str_replace( + ["\033[0m", "\033[1;31m", "\033[0;30m", "\033[47m"], + '', + $this->getBuffer() + ) ); } } From 010a5cffcf47638807b7c6a962a56a079abb6b98 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 22 Jul 2022 10:43:04 +0900 Subject: [PATCH 0884/8282] docs: fix PHPDoc types --- system/Entity/Cast/BaseCast.php | 12 ++++++------ system/Entity/Cast/CastInterface.php | 12 ++++++------ system/Entity/Cast/DatetimeCast.php | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/system/Entity/Cast/BaseCast.php b/system/Entity/Cast/BaseCast.php index c79dfc5f56b4..bfb156da3e53 100644 --- a/system/Entity/Cast/BaseCast.php +++ b/system/Entity/Cast/BaseCast.php @@ -19,10 +19,10 @@ abstract class BaseCast implements CastInterface /** * Get * - * @param mixed $value Data - * @param array $params Additional param + * @param array|bool|float|int|object|string|null $value Data + * @param array $params Additional param * - * @return mixed + * @return array|bool|float|int|object|string|null */ public static function get($value, array $params = []) { @@ -32,10 +32,10 @@ public static function get($value, array $params = []) /** * Set * - * @param mixed $value Data - * @param array $params Additional param + * @param array|bool|float|int|object|string|null $value Data + * @param array $params Additional param * - * @return mixed + * @return array|bool|float|int|object|string|null */ public static function set($value, array $params = []) { diff --git a/system/Entity/Cast/CastInterface.php b/system/Entity/Cast/CastInterface.php index e4a36384dba0..c1dcf1c40ead 100644 --- a/system/Entity/Cast/CastInterface.php +++ b/system/Entity/Cast/CastInterface.php @@ -19,20 +19,20 @@ interface CastInterface /** * Get * - * @param mixed $value Data - * @param array $params Additional param + * @param array|bool|float|int|object|string|null $value Data + * @param array $params Additional param * - * @return mixed + * @return array|bool|float|int|object|string|null */ public static function get($value, array $params = []); /** * Set * - * @param mixed $value Data - * @param array $params Additional param + * @param array|bool|float|int|object|string|null $value Data + * @param array $params Additional param * - * @return mixed + * @return array|bool|float|int|object|string|null */ public static function set($value, array $params = []); } diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php index 99f425a410be..41af062cfe2b 100644 --- a/system/Entity/Cast/DatetimeCast.php +++ b/system/Entity/Cast/DatetimeCast.php @@ -24,6 +24,8 @@ class DatetimeCast extends BaseCast * {@inheritDoc} * * @throws Exception + * + * @return Time */ public static function get($value, array $params = []) { From fa8c0f794d8d82d83560d3849fe8c86db7671ace Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 19 Jul 2022 15:54:46 +0900 Subject: [PATCH 0885/8282] feat: add compatibility with CI3 Encryption --- app/Config/Encryption.php | 24 +++++++ phpstan-baseline.neon.dist | 4 -- system/Encryption/Handlers/OpenSSLHandler.php | 64 ++++++++++++++++--- tests/system/Encryption/EncryptionTest.php | 17 +++++ 4 files changed, 95 insertions(+), 14 deletions(-) diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php index 388b1fa01942..e37b4e2a14ec 100644 --- a/app/Config/Encryption.php +++ b/app/Config/Encryption.php @@ -56,4 +56,28 @@ class Encryption extends BaseConfig * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'. */ public string $digest = 'SHA512'; + + /** + * Whether the cipher-text should be raw. If set to false, then it will be base64 encoded. + * This setting is only used by OpenSSLHandler. + * + * Set to false for CI3 Encryption compatibility. + */ + public bool $rawData = true; + + /** + * Encryption key info. + * This setting is only used by OpenSSLHandler. + * + * Set to 'encryption' for CI3 Encryption compatibility. + */ + public string $encryptKeyInfo = ''; + + /** + * Authentication key info. + * This setting is only used by OpenSSLHandler. + * + * Set to 'authentication' for CI3 Encryption compatibility. + */ + public string $authKeyInfo = ''; } diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 1de32c6e210e..629b312f1488 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -684,7 +684,3 @@ parameters: message: "#^Property Config\\\\View\\:\\:\\$plugins \\(array\\) on left side of \\?\\? is not nullable\\.$#" count: 1 path: system/View/Parser.php - - - - message: "#^Binary operation \"/\" between string and 8 results in an error\\.$#" - path: system/Encryption/Handlers/OpenSSLHandler.php diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php index dac36dc71dc7..8324b36718ea 100644 --- a/system/Encryption/Handlers/OpenSSLHandler.php +++ b/system/Encryption/Handlers/OpenSSLHandler.php @@ -25,6 +25,18 @@ class OpenSSLHandler extends BaseHandler */ protected $digest = 'SHA512'; + /** + * List of supported HMAC algorithms + * + * @var array [name => digest size] + */ + protected array $digestSize = [ + 'SHA224' => 28, + 'SHA256' => 32, + 'SHA384' => 48, + 'SHA512' => 64, + ]; + /** * Cipher to use * @@ -39,6 +51,27 @@ class OpenSSLHandler extends BaseHandler */ protected $key = ''; + /** + * Whether the cipher-text should be raw. If set to false, then it will be base64 encoded. + */ + protected bool $rawData = true; + + /** + * Encryption key info. + * This setting is only used by OpenSSLHandler. + * + * Set to 'encryption' for CI3 Encryption compatibility. + */ + public string $encryptKeyInfo = ''; + + /** + * Authentication key info. + * This setting is only used by OpenSSLHandler. + * + * Set to 'authentication' for CI3 Encryption compatibility. + */ + public string $authKeyInfo = ''; + /** * {@inheritDoc} */ @@ -54,20 +87,23 @@ public function encrypt($data, $params = null) } // derive a secret key - $secret = \hash_hkdf($this->digest, $this->key); + $encryptKey = \hash_hkdf($this->digest, $this->key, 0, $this->encryptKeyInfo); // basic encryption $iv = ($ivSize = \openssl_cipher_iv_length($this->cipher)) ? \openssl_random_pseudo_bytes($ivSize) : null; - $data = \openssl_encrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv); + $data = \openssl_encrypt($data, $this->cipher, $encryptKey, OPENSSL_RAW_DATA, $iv); if ($data === false) { throw EncryptionException::forEncryptionFailed(); } - $result = $iv . $data; + $result = $this->rawData ? $iv . $data : base64_encode($iv . $data); + + // derive a secret key + $authKey = \hash_hkdf($this->digest, $this->key, 0, $this->authKeyInfo); - $hmacKey = \hash_hmac($this->digest, $result, $secret, true); + $hmacKey = \hash_hmac($this->digest, $result, $authKey, $this->rawData); return $hmacKey . $result; } @@ -87,17 +123,22 @@ public function decrypt($data, $params = null) } // derive a secret key - $secret = \hash_hkdf($this->digest, $this->key); + $authKey = \hash_hkdf($this->digest, $this->key, 0, $this->authKeyInfo); + + $hmacLength = $this->rawData + ? $this->digestSize[$this->digest] + : $this->digestSize[$this->digest] * 2; - $hmacLength = self::substr($this->digest, 3) / 8; - $hmacKey = self::substr($data, 0, $hmacLength); - $data = self::substr($data, $hmacLength); - $hmacCalc = \hash_hmac($this->digest, $data, $secret, true); + $hmacKey = self::substr($data, 0, $hmacLength); + $data = self::substr($data, $hmacLength); + $hmacCalc = \hash_hmac($this->digest, $data, $authKey, $this->rawData); if (! hash_equals($hmacKey, $hmacCalc)) { throw EncryptionException::forAuthenticationFailed(); } + $data = $this->rawData ? $data : base64_decode($data, true); + if ($ivSize = \openssl_cipher_iv_length($this->cipher)) { $iv = self::substr($data, 0, $ivSize); $data = self::substr($data, $ivSize); @@ -105,6 +146,9 @@ public function decrypt($data, $params = null) $iv = null; } - return \openssl_decrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv); + // derive a secret key + $encryptKey = \hash_hkdf($this->digest, $this->key, 0, $this->encryptKeyInfo); + + return \openssl_decrypt($data, $this->cipher, $encryptKey, OPENSSL_RAW_DATA, $iv); } } diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index 95a69d35f0b9..f935210136c9 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -148,4 +148,21 @@ public function testMagicGetMissing() { $this->assertNull($this->encryption->bogus); } + + public function testDecryptEncryptedDataByCI3() + { + $config = new EncryptionConfig(); + $config->driver = 'OpenSSL'; + $config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); + $config->rawData = false; + $config->encryptKeyInfo = 'encryption'; + $config->authKeyInfo = 'authentication'; + $encrypter = Services::encrypter($config, false); + + $encrypted = 'f5eeb3f056b2dc5e8119b4a5f5ba793d724b9ca2d1ca23ab89bc72e51863f8da233a83ccb48d5daf3d6905d61f357877aaad32c8bc7a7c5e48f3268d2ba362b9UTw2A7U4CB9vb+6izrDzJHAdz1hAutIt2Ex2C2FqamJAXc8Z8RQor9UvaWy2'; + $decrypted = $encrypter->decrypt($encrypted); + + $expected = 'This is a plain-text message.'; + $this->assertSame($expected, $decrypted); + } } From 96cf2ea3ec7ff0819fe2767acddcb31cd938c685 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 10:59:05 +0900 Subject: [PATCH 0886/8282] docs: fix title underlines --- .../source/installation/upgrade_encryption.rst | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst index a4d8a74ce659..8191f8e6eacf 100644 --- a/user_guide_src/source/installation/upgrade_encryption.rst +++ b/user_guide_src/source/installation/upgrade_encryption.rst @@ -6,29 +6,31 @@ Upgrade Encryption :depth: 2 Documentations -============== +************** - `Encryption Library Documentation CodeIgniter 3.X `_ - :doc:`Encryption Service Documentation CodeIgniter 4.X ` What has been changed -===================== +********************* + - The support for ``MCrypt`` has been dropped, as that has been deprecated as of PHP 7.2. Upgrade Guide -============= +************* + 1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from **application/config/config.php** to ``public $key = 'abc123';`` in **app/Config/Encryption.php**. 2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = service('encrypter');`` and change the methods for encryption and decrypting like in the following code example. Code Example -============ +************ CodeIgniter Version 3.x ------------------------- +======================= .. literalinclude:: upgrade_encryption/ci3sample/001.php CodeIgniter Version 4.x ------------------------ +======================= .. literalinclude:: upgrade_encryption/001.php From b006c2b61c36b4106feb1a7fcc05f66e6c0bf157 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 10:59:40 +0900 Subject: [PATCH 0887/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + .../installation/upgrade_encryption.rst | 3 +- .../source/libraries/encryption.rst | 29 ++++++++++++++----- .../source/libraries/encryption/013.php | 14 +++++++++ 4 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 user_guide_src/source/libraries/encryption/013.php diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index c511bd2b5683..9c62bb05c150 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -40,6 +40,7 @@ Enhancements - The call handler for Spark commands from the ``CodeIgniter\CodeIgniter`` class has been extracted. This will reduce the cost of console calls. - SQLite ``BaseConnection::getIndexData()`` now can return pseudo index named ``PRIMARY`` for `AUTOINCREMENT` column, and each returned index data has ``type`` property. - Added ``spark filter:check`` command to check the filters for a route. See :ref:`Controller Filters ` for the details. +- Now **Encryption** can decrypt data encrypted with CI3's Encryption. See :ref:`encryption-compatible-with-ci3`. Changes ******* diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst index 8191f8e6eacf..247c546582ea 100644 --- a/user_guide_src/source/installation/upgrade_encryption.rst +++ b/user_guide_src/source/installation/upgrade_encryption.rst @@ -20,7 +20,8 @@ Upgrade Guide ************* 1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from **application/config/config.php** to ``public $key = 'abc123';`` in **app/Config/Encryption.php**. -2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = service('encrypter');`` and change the methods for encryption and decrypting like in the following code example. +2. If you need to decrypt data encrypted with CI3's Encryption, configure settings to maintain compatibility. See :ref:`encryption-compatible-with-ci3`. +3. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = service('encrypter');`` and change the methods for encryption and decrypting like in the following code example. Code Example ************ diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index f707bcc0be7c..b77863152167 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -61,14 +61,17 @@ Configuring the Library The example above uses the configuration settings found in **app/Config/Encryption.php**. -========== ==================================================== -Option Possible values (default in parentheses) -========== ==================================================== -key Encryption key starter -driver Preferred handler, e.g., OpenSSL or Sodium (``OpenSSL``) -blockSize Padding length in bytes for SodiumHandler (``16``) -digest Message digest algorithm (``SHA512``) -========== ==================================================== +============== ======================================================== +Option Possible values (default in parentheses) +============== ======================================================== +key Encryption key starter +driver Preferred handler, e.g., OpenSSL or Sodium (``OpenSSL``) +blockSize Padding length in bytes for SodiumHandler (``16``) +digest Message digest algorithm (``SHA512``) +encryptKeyInfo Encryption key info (``''``). This is only used by OpenSSLHandler. +authKeyInfo Authentication key info (``''``). This is only used by OpenSSLHandler. +rawData Whether the cipher-text should be raw (``true``). This is only used by OpenSSLHandler. +============== ======================================================== You can replace the config file's settings by passing a configuration object of your own to the ``Services`` call. The ``$config`` variable must be @@ -76,6 +79,16 @@ an instance of the ``Config\Encryption`` class. .. literalinclude:: encryption/003.php +.. _encryption-compatible-with-ci3: + +Configuration to Maintain Compatibility with CI3 +------------------------------------------------ + +Since v4.3.0, you can decrypt data encrypted with CI3's Encryption. +If you need to decrypt such data, use the following settings to maintain compatibility. + +.. literalinclude:: encryption/013.php + Default Behavior ================ diff --git a/user_guide_src/source/libraries/encryption/013.php b/user_guide_src/source/libraries/encryption/013.php new file mode 100644 index 000000000000..badfb04fdcc8 --- /dev/null +++ b/user_guide_src/source/libraries/encryption/013.php @@ -0,0 +1,14 @@ +driver = 'OpenSSL'; +// Your CI3's encryption_key +$config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); +$config->rawData = false; +$config->encryptKeyInfo = 'encryption'; +$config->authKeyInfo = 'authentication'; + +$encrypter = Services::encrypter($config, false); From 435451babb6a66166d4f1fad697634796cb528a5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 17:30:34 +0900 Subject: [PATCH 0888/8282] docs: add Supported HMAC Authentication Algorithms From CI3 docs. --- .../source/libraries/encryption.rst | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index b77863152167..25db2f0c2cb5 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -89,6 +89,30 @@ If you need to decrypt such data, use the following settings to maintain compati .. literalinclude:: encryption/013.php +Supported HMAC Authentication Algorithms +---------------------------------------- + +For HMAC message authentication, the Encryption library supports +usage of the SHA-2 family of algorithms: + +=========== ==================== ============================ +Algorithm Raw length (bytes) Hex-encoded length (bytes) +=========== ==================== ============================ +sha512 64 128 +sha384 48 96 +sha256 32 64 +sha224 28 56 +=========== ==================== ============================ + +The reason for not including other popular algorithms, such as +MD5 or SHA1 is that they are no longer considered secure enough +and as such, we don't want to encourage their usage. +If you absolutely need to use them, it is easy to do so via PHP's +native `hash_hmac() `_ function. + +Stronger algorithms of course will be added in the future as they +appear and become widely available. + Default Behavior ================ From d323c0eb8c0f890ff15b80b9e7ff4c1ccc660fcb Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 17:31:18 +0900 Subject: [PATCH 0889/8282] docs: change TOC depth to 3 --- user_guide_src/source/libraries/encryption.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index 25db2f0c2cb5..3cab1d65567f 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -32,7 +32,7 @@ A more comprehensive package like `Halite ` .. contents:: :local: - :depth: 2 + :depth: 3 .. _usage: From a65fc7dce132aa0f838869dce4d25a1c25013126 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 21 Jul 2022 17:32:54 +0900 Subject: [PATCH 0890/8282] docs: make algorithm upper case --- user_guide_src/source/libraries/encryption.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index 3cab1d65567f..1e90da575393 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -98,10 +98,10 @@ usage of the SHA-2 family of algorithms: =========== ==================== ============================ Algorithm Raw length (bytes) Hex-encoded length (bytes) =========== ==================== ============================ -sha512 64 128 -sha384 48 96 -sha256 32 64 -sha224 28 56 +SHA512 64 128 +SHA384 48 96 +SHA256 32 64 +SHA224 28 56 =========== ==================== ============================ The reason for not including other popular algorithms, such as From 23fe28de29a972265a11cf1de309231bffe4bb27 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 22 Jul 2022 10:15:02 +0900 Subject: [PATCH 0891/8282] test: add test to decrypt data encrypted by CI v4.2.0. --- tests/system/Encryption/EncryptionTest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index f935210136c9..202772ad4bdc 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -165,4 +165,18 @@ public function testDecryptEncryptedDataByCI3() $expected = 'This is a plain-text message.'; $this->assertSame($expected, $decrypted); } + + public function testDecryptEncryptedDataByCI42() + { + $config = new EncryptionConfig(); + $config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); + $encrypter = Services::encrypter($config, false); + + // Encrypted message by CI v4.2.0. + $encrypted = base64_decode('UB9PC3QfQIoLY5+/GU8BUQnfhEcCml6i4Sve6k0f8r6Id6IzlbkvMhfWf5E2lBH5+OTWuv5MUoTBQWv9Pd46ua07QsqS6/vHaW3rCg6cpLM/8d2IZE/VO+uXeaU6XHO5mJ8ehGKg96JITvKjxA==', true); + $decrypted = $encrypter->decrypt($encrypted); + + $expected = 'This is a plain-text message.'; + $this->assertSame($expected, $decrypted); + } } From 7875a2ce4cc13e9dcac69228440390ff949f230f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 06:12:45 +0900 Subject: [PATCH 0892/8282] docs: fix typo Co-authored-by: MGatner --- user_guide_src/source/installation/upgrade_422.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_422.rst b/user_guide_src/source/installation/upgrade_422.rst index 82a388ce8c4a..84c690064faf 100644 --- a/user_guide_src/source/installation/upgrade_422.rst +++ b/user_guide_src/source/installation/upgrade_422.rst @@ -23,7 +23,7 @@ Web Page Caching Bug Fix ======================== - :doc:`../general/caching` now caches the Response data after :ref:`after-filters` are executed. -- For example, if you enables :ref:`secureheaders`, the Response headers are now sent when the page comes from the cache. +- For example, if you enable :ref:`secureheaders`, the Response headers are now sent when the page comes from the cache. .. important:: If you have written **code based on the bug** that changes to the Response in the after filters are not cached, **sensitive information could be cached and compromised**. If this is the case, change your code to disable caching of the page. From e0964ed3cbebdf837195a451b2165d212486f5e7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 06:12:55 +0900 Subject: [PATCH 0893/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/installation/upgrade_422.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_422.rst b/user_guide_src/source/installation/upgrade_422.rst index 84c690064faf..c5c11a221673 100644 --- a/user_guide_src/source/installation/upgrade_422.rst +++ b/user_guide_src/source/installation/upgrade_422.rst @@ -25,7 +25,7 @@ Web Page Caching Bug Fix - :doc:`../general/caching` now caches the Response data after :ref:`after-filters` are executed. - For example, if you enable :ref:`secureheaders`, the Response headers are now sent when the page comes from the cache. -.. important:: If you have written **code based on the bug** that changes to the Response in the after filters are not cached, **sensitive information could be cached and compromised**. If this is the case, change your code to disable caching of the page. +.. important:: If you have written **code based on this bug** that assumes changes to the Response in "after" filters are not cached then **sensitive information could be cached and compromised**. If this is the case, change your code to disable caching of the page. Others ====== From cfd1b44c0cef1ee3c047987ca4fc771aae64452e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 07:42:09 +0900 Subject: [PATCH 0894/8282] refactor: replace magic numbers with constants --- system/Database/Exceptions/DatabaseException.php | 2 +- system/Exceptions/CastException.php | 4 ++-- system/Exceptions/ConfigException.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php index a2b3b7637ce7..13f58dc12954 100644 --- a/system/Database/Exceptions/DatabaseException.php +++ b/system/Database/Exceptions/DatabaseException.php @@ -20,5 +20,5 @@ class DatabaseException extends Error implements ExceptionInterface * * @var int */ - protected $code = 8; + protected $code = EXIT_DATABASE; } diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php index 5e41631536c7..06511f73907f 100644 --- a/system/Exceptions/CastException.php +++ b/system/Exceptions/CastException.php @@ -23,11 +23,11 @@ class CastException extends CriticalError use DebugTraceableTrait; /** - * Error code + * Exit status code * * @var int */ - protected $code = 3; + protected $code = EXIT_CONFIG; public static function forInvalidJsonFormatException(int $error) { diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php index 41ae4959e594..ced8afc6e04f 100644 --- a/system/Exceptions/ConfigException.php +++ b/system/Exceptions/ConfigException.php @@ -19,11 +19,11 @@ class ConfigException extends CriticalError use DebugTraceableTrait; /** - * Error code + * Exit status code * * @var int */ - protected $code = 3; + protected $code = EXIT_CONFIG; public static function forDisabledMigrations() { From 876194eeb7ea03820431854530acd37ad3c279d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 07:44:20 +0900 Subject: [PATCH 0895/8282] docs: update comments --- system/Exceptions/PageNotFoundException.php | 2 +- system/Router/Exceptions/RedirectException.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php index 2a773f1785dc..531df0e48f11 100644 --- a/system/Exceptions/PageNotFoundException.php +++ b/system/Exceptions/PageNotFoundException.php @@ -19,7 +19,7 @@ class PageNotFoundException extends OutOfBoundsException implements ExceptionInt use DebugTraceableTrait; /** - * Error code + * HTTP status code * * @var int */ diff --git a/system/Router/Exceptions/RedirectException.php b/system/Router/Exceptions/RedirectException.php index b2456f367676..d5a1616b481b 100644 --- a/system/Router/Exceptions/RedirectException.php +++ b/system/Router/Exceptions/RedirectException.php @@ -19,7 +19,7 @@ class RedirectException extends Exception { /** - * Status code for redirects + * HTTP status code for redirects * * @var int */ From 56e3af04ee0e9b67da86f6b78e8651d81ae73f14 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 07:52:00 +0900 Subject: [PATCH 0896/8282] test: replace magic numbers with constants --- tests/system/Debug/ExceptionsTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 8bd4f01e0925..2c1227cba008 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -57,9 +57,9 @@ public function testDetermineCodes(): void { $determineCodes = $this->getPrivateMethodInvoker($this->exception, 'determineCodes'); - $this->assertSame([500, 9], $determineCodes(new RuntimeException('This.'))); - $this->assertSame([500, 1], $determineCodes(new RuntimeException('That.', 600))); - $this->assertSame([404, 1], $determineCodes(new RuntimeException('There.', 404))); + $this->assertSame([500, EXIT__AUTO_MIN], $determineCodes(new RuntimeException('This.'))); + $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('That.', 600))); + $this->assertSame([404, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404))); } public function testRenderBacktrace(): void From e52c06f30dace76e54f3dd961b84afda445d01b7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 07:52:19 +0900 Subject: [PATCH 0897/8282] test: add assertions --- tests/system/Debug/ExceptionsTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 2c1227cba008..3ef643c831e3 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -11,6 +11,9 @@ namespace CodeIgniter\Debug; +use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Entity\Exceptions\CastException; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; @@ -60,6 +63,13 @@ public function testDetermineCodes(): void $this->assertSame([500, EXIT__AUTO_MIN], $determineCodes(new RuntimeException('This.'))); $this->assertSame([500, EXIT_ERROR], $determineCodes(new RuntimeException('That.', 600))); $this->assertSame([404, EXIT_ERROR], $determineCodes(new RuntimeException('There.', 404))); + $this->assertSame([167, EXIT_ERROR], $determineCodes(new RuntimeException('This.', 167))); + // @TODO This exit code should be EXIT_CONFIG. + $this->assertSame([500, 12], $determineCodes(new ConfigException('This.'))); + // @TODO This exit code should be EXIT_CONFIG. + $this->assertSame([500, 9], $determineCodes(new CastException('This.'))); + // @TODO This exit code should be EXIT_DATABASE. + $this->assertSame([500, 17], $determineCodes(new DatabaseException('This.'))); } public function testRenderBacktrace(): void From 7900de26bc66d7702cea195e4958c976032d1f94 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 23 Jul 2022 08:01:05 +0900 Subject: [PATCH 0898/8282] docs: add @TODO --- system/Entity/Exceptions/CastException.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php index 2cda4d72238d..224bbdc7eb68 100644 --- a/system/Entity/Exceptions/CastException.php +++ b/system/Entity/Exceptions/CastException.php @@ -15,6 +15,10 @@ /** * CastException is thrown for invalid cast initialization and management. + * + * @TODO CodeIgniter\Exceptions\CastException is deprecated and this class is used. + * CodeIgniter\Exceptions\CastException has the property $code = EXIT_CONFIG, + * but this class does not have the code. */ class CastException extends FrameworkException { From baa8ed58a75e3a97587105d6d2e482021e3192f0 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Sat, 23 Jul 2022 15:06:34 +0200 Subject: [PATCH 0899/8282] add language strings to error_404.php --- app/Views/errors/html/error_404.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index f81717fdd0f5..952010c0367a 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -2,7 +2,7 @@ - 404 Page Not Found + <?= lang('Errors.404pageNotFound') ?> -
      -

      +
      -

      +

      + +

      From d398c18735ef991db6b71ad7530368cfc0ab6c50 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Sat, 23 Jul 2022 15:36:53 +0200 Subject: [PATCH 0902/8282] do not show error message twice before this PR it shows: 404 - Page Not Found Page Not Found because $messages is always set (as I have seen) After PR: 404 Page Not Found --- app/Views/errors/html/error_404.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index bd8380c630dd..3176f1eef567 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -11,7 +11,7 @@

      -

      +

      404

      From c79225e7d88ef9748866bd6d411fcba4ae707b43 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 24 Jul 2022 07:08:34 +0900 Subject: [PATCH 0903/8282] fix: unable to add more than one file to FileCollection constructor --- system/Files/FileCollection.php | 4 +++- tests/system/Files/FileCollectionTest.php | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php index 853c15c07ae1..20b208fded43 100644 --- a/system/Files/FileCollection.php +++ b/system/Files/FileCollection.php @@ -178,7 +178,9 @@ public function add($paths, bool $recursive = true) // Test for a directory self::resolveDirectory($path); } catch (FileException $e) { - return $this->addFile($path); + $this->addFile($path); + + continue; } $this->addDirectory($path, $recursive); diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php index ced5b38873d2..7936cc2e62da 100644 --- a/tests/system/Files/FileCollectionTest.php +++ b/tests/system/Files/FileCollectionTest.php @@ -178,7 +178,24 @@ public function testAddStringDirectoryRecursive() $this->assertSame($expected, $files->get()); } - public function testAddArray() + public function testAddArrayFiles() + { + $files = new FileCollection(); + + $expected = [ + $this->directory . 'apple.php', + SUPPORTPATH . 'Files/baker/banana.php', + ]; + + $files->add([ + $this->directory . 'apple.php', + SUPPORTPATH . 'Files/baker/banana.php', + ]); + + $this->assertSame($expected, $files->get()); + } + + public function testAddArrayDirectoryAndFile() { $files = new FileCollection(); @@ -190,7 +207,7 @@ public function testAddArray() ]; $files->add([ - SUPPORTPATH . 'Files/able', + SUPPORTPATH . 'Files/able', // directory SUPPORTPATH . 'Files/baker/banana.php', ]); From 38c8cbf47fbb428f1a514a23b92d4a4ca011d761 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 24 Jul 2022 07:33:22 +0900 Subject: [PATCH 0904/8282] fix: Security::derandomize() may cause hex2bin() error --- system/Security/Security.php | 20 ++++++++++++++++--- .../SecurityCSRFSessionRandomizeTokenTest.php | 15 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 3adb7bf68857..a85fb732945b 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -21,6 +21,8 @@ use Config\Cookie as CookieConfig; use Config\Security as SecurityConfig; use Config\Services; +use ErrorException; +use InvalidArgumentException; use LogicException; /** @@ -278,8 +280,13 @@ public function verify(RequestInterface $request) } $postedToken = $this->getPostedToken($request); - $token = ($postedToken !== null && $this->tokenRandomize) - ? $this->derandomize($postedToken) : $postedToken; + + try { + $token = ($postedToken !== null && $this->tokenRandomize) + ? $this->derandomize($postedToken) : $postedToken; + } catch (InvalidArgumentException $e) { + $token = null; + } // Do the tokens match? if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) { @@ -359,13 +366,20 @@ protected function randomize(string $hash): string /** * Derandomize the token. + * + * @throws InvalidArgumentException "hex2bin(): Hexadecimal input string must have an even length" */ protected function derandomize(string $token): string { $key = substr($token, -static::CSRF_HASH_BYTES * 2); $value = substr($token, 0, static::CSRF_HASH_BYTES * 2); - return bin2hex(hex2bin($value) ^ hex2bin($key)); + try { + return bin2hex(hex2bin($value) ^ hex2bin($key)); + } catch (ErrorException $e) { + // "hex2bin(): Hexadecimal input string must have an even length" + throw new InvalidArgumentException($e->getMessage()); + } } /** diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index dca549685757..ddf4f6b42ce4 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -141,6 +141,21 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $security->verify($request); } + public function testCSRFVerifyPostInvalidToken() + { + $this->expectException(SecurityException::class); + $this->expectExceptionMessage('The action you requested is not allowed.'); + + $_SERVER['REQUEST_METHOD'] = 'POST'; + $_POST['csrf_test_name'] = '!'; + + $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); + + $security = new Security(new MockAppConfig()); + + $security->verify($request); + } + public function testCSRFVerifyPostReturnsSelfOnMatch() { $_SERVER['REQUEST_METHOD'] = 'POST'; From 8c550a6d476f3556d5afddf10f1ac25eab9be264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:03:55 +0000 Subject: [PATCH 0905/8282] chore(deps-dev): update rector/rector requirement from 0.13.8 to 0.13.9 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.13.8...0.13.9) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8ad8b1e91a9f..ae0d7b86410d 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpstan/phpstan": "^1.7.1", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.13.8" + "rector/rector": "0.13.9" }, "suggest": { "ext-fileinfo": "Improves mime type detection for files" From bb4f10a8826d1333bd66c8aa7066ddd2a9dcf96e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 26 Jul 2022 10:27:21 +0900 Subject: [PATCH 0906/8282] docs: change order of Installation page Troubleshooting is better to be next to Running Your App. --- user_guide_src/source/installation/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst index 243dd1a5b314..b271d296d9fc 100644 --- a/user_guide_src/source/installation/index.rst +++ b/user_guide_src/source/installation/index.rst @@ -26,7 +26,7 @@ However you choose to install and run CodeIgniter4, the installing_composer installing_manual running + troubleshooting ../changelogs/index upgrading - troubleshooting repositories From df6f0414c228be06ab4b01274d56f0c78b13bc66 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 26 Jul 2022 10:28:48 +0900 Subject: [PATCH 0907/8282] docs: add TOC --- user_guide_src/source/installation/troubleshooting.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst index 071f4cf9d5ce..8ffe659f82dc 100644 --- a/user_guide_src/source/installation/troubleshooting.rst +++ b/user_guide_src/source/installation/troubleshooting.rst @@ -4,6 +4,10 @@ Troubleshooting Here are some common installation problems, and suggested workarounds. +.. contents:: + :local: + :depth: 2 + How do I know if my install is working? --------------------------------------- From 7d92064cbe4239c2ccd4677b2c771bf02d6bb55a Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 26 Jul 2022 10:51:20 +0900 Subject: [PATCH 0908/8282] docs: add links to other pages for Web server configuration --- .../source/general/environments.rst | 5 +++++ user_guide_src/source/general/urls.rst | 4 ++++ .../source/installation/running.rst | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index 28426182cad8..33359425fd0b 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -41,6 +41,8 @@ The simplest method to set the variable is in your :doc:`.env file php spark env production +.. _environment-apache: + Apache ------ @@ -51,6 +53,9 @@ config using `SetEnv SetEnv CI_ENVIRONMENT development + +.. _environment-nginx: + nginx ----- diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index 56a57fcc51a6..ec8ce76c15af 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -60,6 +60,8 @@ By default, the **index.php** file will be included in your URLs:: If your server supports rewriting URLs you can easily remove this file with URL rewriting. This is handled differently by different servers, but we will show examples for the two most common web servers here. +.. _urls-remove-index-php-apache: + Apache Web Server ----------------- @@ -81,6 +83,8 @@ request for your index.php file. .. note:: Make sure to also exclude from the above rules any assets that you might need to be accessible from the outside world. +.. _urls-remove-index-php-nginx: + NGINX ----- diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 9d53658257c8..b2ba72d4cd7f 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -99,6 +99,11 @@ in the "AllowOverride" setting:: Require all granted +Removing the index.php +---------------------- + +See :ref:`CodeIgniter URLs `. + Virtual Hosting --------------- @@ -195,6 +200,11 @@ Be sure to specify options and permissions for the CodeIgniter public directory +Setting Environment +------------------- + +See :ref:`Handling Multiple Environments `. + Testing ------- @@ -204,9 +214,13 @@ Apache needs to be restarted whenever you change its configuration. Hosting with Nginx ================== + Nginx is the second most widely used HTTP server for web hosting. Here you can find an example configuration using PHP 7.3 FPM (unix sockets) under Ubuntu Server. +default.conf +------------ + This configuration enables URLs without "index.php" in them and using CodeIgniter's "404 - File Not Found" for URLs ending with ".php". .. code-block:: nginx @@ -241,6 +255,11 @@ This configuration enables URLs without "index.php" in them and using CodeIgnite } } +Setting Environment +------------------- + +See :ref:`Handling Multiple Environments `. + Hosting with Vagrant ==================== From ff677bab02234cd53ef983fa1f7e3c94491f2a20 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 26 Jul 2022 19:28:02 +0700 Subject: [PATCH 0909/8282] set phpstan config --- rector.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rector.php b/rector.php index 5ee5b69f7243..660b086aeb63 100644 --- a/rector.php +++ b/rector.php @@ -71,6 +71,8 @@ __DIR__ . '/system/Test/bootstrap.php', ]); + $rectorConfig->phpstanConfig(__DIR__ . '/phpstan.neon.dist'); + // is there a file you need to skip? $rectorConfig->skip([ __DIR__ . '/app/Views', From f45cce00ed0583697fa246b8c8c2919f4489e992 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 26 Jul 2022 19:41:17 +0700 Subject: [PATCH 0910/8282] skip RemoveAlwaysTrueIfConditionRector --- rector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rector.php b/rector.php index 660b086aeb63..8f43cf312e1d 100644 --- a/rector.php +++ b/rector.php @@ -29,6 +29,7 @@ use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; +use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; @@ -129,6 +130,8 @@ GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', ], + + RemoveAlwaysTrueIfConditionRector::class, ]); // auto import fully qualified class names From 3d71f975227cc6be43aa1fc221b2cda893b57aa0 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 26 Jul 2022 19:45:19 +0700 Subject: [PATCH 0911/8282] skip on RemoveDeadZeroAndOneOperationRector --- rector.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rector.php b/rector.php index 8f43cf312e1d..bdda1e466b71 100644 --- a/rector.php +++ b/rector.php @@ -32,6 +32,7 @@ use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; +use Rector\DeadCode\Rector\Plus\RemoveDeadZeroAndOneOperationRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector; use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector; @@ -131,7 +132,11 @@ __DIR__ . '/tests/system/Email/EmailTest.php', ], + // buggy on read based on @var on property RemoveAlwaysTrueIfConditionRector::class, + + // buggy on string * int + RemoveDeadZeroAndOneOperationRector::class, ]); // auto import fully qualified class names From 652ca943503556f64ac4b004f63a0fb0ff558b0d Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Tue, 26 Jul 2022 14:51:43 +0200 Subject: [PATCH 0912/8282] remove unnessesary type tag Per HTML5 spec, typically there is no need to specify a type when including CSS and JavaScript files as text/css and text/javascript are their respective defaults. --- app/Views/errors/html/error_exception.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index 77e963b2920a..8387f0adb06f 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -6,11 +6,11 @@ <?= esc($title) ?> - - From b0f9a7e9aebfa4cf7be05001e9a6df9dff7feb06 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 27 Jul 2022 10:11:29 +0900 Subject: [PATCH 0913/8282] docs: improve Form Validation Tutorial - make view filenames lowercase - add routes - use BaseController instead of Controller - do not show validation errors when showing the form first - show input data when validation errors - use $helpers - remove loading URL helper --- .../source/libraries/validation.rst | 55 +++++++++++++------ .../source/libraries/validation/001.php | 20 +++++-- .../source/libraries/validation/002.php | 12 ++-- .../source/libraries/validation/039.php | 8 +++ 4 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 user_guide_src/source/libraries/validation/039.php diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 5710687ee1fd..6b50b7331e7f 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -62,7 +62,7 @@ example. The Form ======== -Using a text editor, create a form called **Signup.php**. In it, place this +Using a text editor, create a form called **signup.php**. In it, place this code and save it to your **app/Views/** folder:: @@ -75,21 +75,21 @@ code and save it to your **app/Views/** folder:: -

      Username
      - +
      Username
      + -
      Password
      - +
      Password
      + -
      Password Confirm
      - +
      Password Confirm
      + -
      Email Address
      - +
      Email Address
      + -
      +
      - + @@ -97,7 +97,7 @@ code and save it to your **app/Views/** folder:: The Success Page ================ -Using a text editor, create a form called **Success.php**. In it, place +Using a text editor, create a form called **success.php**. In it, place this code and save it to your **app/Views/** folder:: @@ -121,6 +121,14 @@ this code and save it to your **app/Controllers/** folder: .. literalinclude:: validation/001.php +The Routes +========== + +Then add routes for the controller in **app/Config/Routes.php**: + +.. literalinclude:: validation/039.php + :lines: 2- + Try it! ======= @@ -142,11 +150,15 @@ the **Validation class** inside. See :ref:`controllers-validating-data`. Explanation =========== -You'll notice several things about the above pages: +You'll notice several things about the above pages. -The form (**Signup.php**) is a standard web form with a couple of exceptions: +signup.php +---------- -#. It uses a :doc:`form helper ` to create the form opening. Technically, this +The form (**signup.php**) is a standard web form with a couple of exceptions: + +#. It uses a :doc:`form helper ` to create the form opening + and closing. Technically, this isn't necessary. You could create the form using standard HTML. However, the benefit of using the helper is that it generates the action URL for you, based on the URL in your config file. This makes @@ -159,9 +171,15 @@ The form (**Signup.php**) is a standard web form with a couple of exceptions: This function will return any error messages sent back by the validator. If there are no messages it returns an empty string. -The controller (**Form.php**) has one method: ``index()``. This method -uses the Controller-provided ``validate()`` method and loads the form helper and URL -helper used by your view files. It also runs the validation routine. +Form.php +-------- + +The controller (**Form.php**) has one property: ``$helpers``. +It loads the form helper used by your view files. + +The controller has one method: ``index()``. This method returns +the **signup** view to show the form when a non-POST request comes. Otherwise, it +uses the Controller-provided ``validate()`` method. It also runs the validation routine. Based on whether the validation was successful it either presents the form or the success page. @@ -171,6 +189,7 @@ Add Validation Rules Then add validation rules in the controller (**Form.php**): .. literalinclude:: validation/002.php + :lines: 2- If you submit the form you should see the success page or the form with error messages. diff --git a/user_guide_src/source/libraries/validation/001.php b/user_guide_src/source/libraries/validation/001.php index 41d51f1b8a25..b5e8a6f13812 100644 --- a/user_guide_src/source/libraries/validation/001.php +++ b/user_guide_src/source/libraries/validation/001.php @@ -2,20 +2,28 @@ namespace App\Controllers; -use CodeIgniter\Controller; +use Config\Services; -class Form extends Controller +class Form extends BaseController { + protected $helpers = ['form']; + public function index() { - helper(['form', 'url']); + if (strtolower($this->request->getMethod()) !== 'post') { + return view('signup', [ + 'validation' => Services::validation(), + ]); + } + + $rules = []; - if (! $this->validate([])) { - return view('Signup', [ + if (! $this->validate($rules)) { + return view('signup', [ 'validation' => $this->validator, ]); } - return view('Success'); + return view('success'); } } diff --git a/user_guide_src/source/libraries/validation/002.php b/user_guide_src/source/libraries/validation/002.php index 30b845e20701..d1eeff19c329 100644 --- a/user_guide_src/source/libraries/validation/002.php +++ b/user_guide_src/source/libraries/validation/002.php @@ -1,10 +1,12 @@ validate([ +// ... + +$rules = [ 'username' => 'required', 'password' => 'required|min_length[10]', 'passconf' => 'required|matches[password]', - 'email' => 'required|valid_email', -])) { - // ... -} + 'email' => 'required|valid_email', +]; + +// ... diff --git a/user_guide_src/source/libraries/validation/039.php b/user_guide_src/source/libraries/validation/039.php new file mode 100644 index 000000000000..041e8a782240 --- /dev/null +++ b/user_guide_src/source/libraries/validation/039.php @@ -0,0 +1,8 @@ +get('form', 'Form::index'); +$routes->post('form', 'Form::index'); + +// ... From bbf9daa4f4b9e87428bea9e16c41940fd3f4018e Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Wed, 27 Jul 2022 15:54:28 +0700 Subject: [PATCH 0914/8282] - make method promptByMultipleKey() in class CLI - make a test for the method - write the method in user guide --- system/CLI/CLI.php | 87 +++++++++++++++++++ tests/system/CLI/CLITest.php | 15 ++++ user_guide_src/source/cli/cli_library.rst | 9 ++ user_guide_src/source/cli/cli_library/023.php | 17 ++++ 4 files changed, 128 insertions(+) create mode 100644 user_guide_src/source/cli/cli_library/023.php diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 7a5030314948..158d3c07a5dc 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -301,6 +301,93 @@ public static function promptByKey($text, array $options, $validation = null): s return static::prompt(PHP_EOL . array_shift($text), array_keys($options), $validation); } + /** + * * This method is the same as promptByKey(), but this method supports multiple value. + * + * @param string $text Output "field" text or an one or two value array where the first value is the text before listing the options + * and the second value the text before asking to select one option. Provide empty string to omit + * @param array $options A list of options (array(key => description)), the first option will be the default value + * + * @return array The selected key and value of $options + * + */ + public static function promptByMultipleKey($text, array $options) + { + if (is_string($text)) { + $text = [$text]; + } elseif (!is_array($text)) { + throw new InvalidArgumentException('$text can only be string'); + } + + if (is_array($options) && $options) { + $opts = $options; + $extraOutputDefault = static::color('0', 'green'); + + unset($opts[0]); + + if (empty($opts)) { + $extraOutput = $extraOutputDefault; + } else { + $optsKey = []; + foreach (array_keys($opts) as $key) { + $optsKey[] = $key; + } + $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']'; + } + + $default = 0; + } else { + throw new InvalidArgumentException('$options can only be array'); + } + + if ($line = array_shift($text)) { + CLI::newLine(); + CLI::write($line); + } + + // +2 for the square brackets around the key + $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2; + + foreach ($options as $key => $description) { + $name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' '); + CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4)); + } + static::fwrite(STDOUT, (trim(strval(intval($text))) ? ' ' : '') . $extraOutput . ': '); + $input = trim(static::input()) ?: $default; + + // search alphabetic character + // return the prompt again if it is true because the key of $options is number + if (preg_match_all('/[a-zA-Z]/i', trim($input))) { + static::error('Please select correctly'); + return $input = static::promptByMultipleKey($line, $options); + } + + // separate input by comma and convert all to an int[] + $inputToArray = array_map(fn ($value) => intval($value), explode(',', $input)); + + // find max from key of $options + $maxOptions = array_key_last($options); + // find max from input + $maxInput = max($inputToArray); + // if max from $options less than max from input + // it is mean user tried to access null value in $options + if ($maxOptions < $maxInput) { + static::error('Please select correctly'); + return $input = static::promptByMultipleKey($line, $options); + } + + $input = []; + foreach ($options as $key => $description) { + foreach ($inputToArray as $inputKey) { + if ($key === $inputKey) { + $input[$key] = $description; + } + } + } + + return $input; + } + /** * Validate one prompt "field" at a time * diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index da4524ae47a8..37acba9b0258 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -525,4 +525,19 @@ public function testStrlen() $this->assertSame(7, CLI::strlen(CLI::color('success', 'green'))); $this->assertSame(0, CLI::strlen(null)); } + + public function testPromptByMultipleKey() + { + $options = ['one', 'two', 'three']; + CLI::promptByMultipleKey('Is this a question?', $options); + + $expected = '' . PHP_EOL . 'Is this a question?' . PHP_EOL; + foreach ($options as $key => $description) { + $name = str_pad(' [' . $key . '] ', 7, ' '); + $expected .= '' . CLI::color($name, 'green') . CLI::wrap($description, 125, 7) . PHP_EOL; + } + $expected .= '[' . CLI::color('0', 'green') . ', 1, 2]: '; + + $this->assertSame($expected, $this->getStreamFilterBuffer()); + } } diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index 29bc6b252f88..66ba890c8a3c 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -66,6 +66,15 @@ Named keys are also possible: Finally, you can pass :ref:`validation ` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options. +promptByMultipleKey() +============= + +This method is the same as ``promptByKey()``, but it supports multiple value. + +.. literalinclude:: cli_library/023.php + +.. important:: The method ``promptByMultipleKey()``, unlike ``promptByKey()``, does not support named keys or validation. + Providing Feedback ****************** diff --git a/user_guide_src/source/cli/cli_library/023.php b/user_guide_src/source/cli/cli_library/023.php new file mode 100644 index 000000000000..e44edba36755 --- /dev/null +++ b/user_guide_src/source/cli/cli_library/023.php @@ -0,0 +1,17 @@ + "Playing game", + * [2] => "Badminton" + * ] + */ From f7ffeccd22e7f03ac405a1e4c3624a88cb64a58c Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Wed, 27 Jul 2022 17:44:36 +0700 Subject: [PATCH 0915/8282] - add the method in docs upgrading v4.3.0 - fix title urderline in user guide --- user_guide_src/source/changelogs/v4.3.0.rst | 6 ++++++ user_guide_src/source/cli/cli_library.rst | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 9c62bb05c150..0dccc2ca83c0 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -32,6 +32,12 @@ Others Enhancements ************ +CLI +=== +- Added methods ``CLI::promptByMultipleKey()`` to support multiple value in input, unlike ``promptByKey()``. See :ref:`prompt-by-multiple-key` for details. + +Others +====== - Added the ``StreamFilterTrait`` to make it easier to work with capturing data from STDOUT and STDERR streams. See :ref:`testing-overview-stream-filters`. - Added before and after events to ``BaseModel::insertBatch()`` and ``BaseModel::updateBatch()`` methods. See :ref:`model-events-callbacks`. - Added ``Model::allowEmptyInserts()`` method to insert empty data. See :ref:`Using CodeIgniter's Model ` diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index 66ba890c8a3c..6d0466883fe8 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -66,8 +66,10 @@ Named keys are also possible: Finally, you can pass :ref:`validation ` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options. +.. _prompt-by-multiple-key: + promptByMultipleKey() -============= +===================== This method is the same as ``promptByKey()``, but it supports multiple value. From 45834977793d64a80907b5d513e1096df3161d9c Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Wed, 27 Jul 2022 18:01:03 +0700 Subject: [PATCH 0916/8282] run CS-fix --- system/CLI/CLI.php | 19 +++++++++++-------- tests/system/CLI/CLITest.php | 1 + user_guide_src/source/cli/cli_library/023.php | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 158d3c07a5dc..de97fa431b54 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -304,18 +304,17 @@ public static function promptByKey($text, array $options, $validation = null): s /** * * This method is the same as promptByKey(), but this method supports multiple value. * - * @param string $text Output "field" text or an one or two value array where the first value is the text before listing the options - * and the second value the text before asking to select one option. Provide empty string to omit - * @param array $options A list of options (array(key => description)), the first option will be the default value + * @param string $text Output "field" text or an one or two value array where the first value is the text before listing the options + * and the second value the text before asking to select one option. Provide empty string to omit + * @param array $options A list of options (array(key => description)), the first option will be the default value * * @return array The selected key and value of $options - * */ public static function promptByMultipleKey($text, array $options) { if (is_string($text)) { $text = [$text]; - } elseif (!is_array($text)) { + } elseif (! is_array($text)) { throw new InvalidArgumentException('$text can only be string'); } @@ -329,10 +328,11 @@ public static function promptByMultipleKey($text, array $options) $extraOutput = $extraOutputDefault; } else { $optsKey = []; + foreach (array_keys($opts) as $key) { $optsKey[] = $key; } - $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']'; + $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']'; } $default = 0; @@ -352,18 +352,19 @@ public static function promptByMultipleKey($text, array $options) $name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' '); CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4)); } - static::fwrite(STDOUT, (trim(strval(intval($text))) ? ' ' : '') . $extraOutput . ': '); + static::fwrite(STDOUT, (trim((string) ((int) $text)) ? ' ' : '') . $extraOutput . ': '); $input = trim(static::input()) ?: $default; // search alphabetic character // return the prompt again if it is true because the key of $options is number if (preg_match_all('/[a-zA-Z]/i', trim($input))) { static::error('Please select correctly'); + return $input = static::promptByMultipleKey($line, $options); } // separate input by comma and convert all to an int[] - $inputToArray = array_map(fn ($value) => intval($value), explode(',', $input)); + $inputToArray = array_map(static fn ($value) => (int) $value, explode(',', $input)); // find max from key of $options $maxOptions = array_key_last($options); @@ -373,10 +374,12 @@ public static function promptByMultipleKey($text, array $options) // it is mean user tried to access null value in $options if ($maxOptions < $maxInput) { static::error('Please select correctly'); + return $input = static::promptByMultipleKey($line, $options); } $input = []; + foreach ($options as $key => $description) { foreach ($inputToArray as $inputKey) { if ($key === $inputKey) { diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 37acba9b0258..160091f4ec94 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -532,6 +532,7 @@ public function testPromptByMultipleKey() CLI::promptByMultipleKey('Is this a question?', $options); $expected = '' . PHP_EOL . 'Is this a question?' . PHP_EOL; + foreach ($options as $key => $description) { $name = str_pad(' [' . $key . '] ', 7, ' '); $expected .= '' . CLI::color($name, 'green') . CLI::wrap($description, 125, 7) . PHP_EOL; diff --git a/user_guide_src/source/cli/cli_library/023.php b/user_guide_src/source/cli/cli_library/023.php index e44edba36755..1d4a06437494 100644 --- a/user_guide_src/source/cli/cli_library/023.php +++ b/user_guide_src/source/cli/cli_library/023.php @@ -8,7 +8,7 @@ * [2] Badminton * * [0, 1, 2]: - * + * * if your answer is '0,2', the return is the key and the value of the options : * [ * [0] => "Playing game", From ba24cd2a4f9d929ba64d60ef6220c5ac0e0e71a4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 28 Jul 2022 06:09:48 +0900 Subject: [PATCH 0917/8282] docs: add note for redirect() --- user_guide_src/source/general/common_functions.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index c73b8f72bf37..ed6a88a7e6bb 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -298,6 +298,12 @@ Miscellaneous Functions .. php:function:: redirect(string $route) :param string $route: The reverse-routed or named route to redirect the user to. + :rtype: RedirectResponse + + .. important:: When you use this function, an instance of ``RedirectResponse`` must be returned + in the method of the :doc:`Controller <../incoming/controllers>` or + the :doc:`Controller Filter <../incoming/filters>`. If you forget to return it, + no redirection will occur. Returns a RedirectResponse instance allowing you to easily create redirects: From c9d52f73625b02d6f1c80abb3c08d32381f0d92e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 28 Jul 2022 06:50:30 +0900 Subject: [PATCH 0918/8282] docs: fix wrong explanation --- user_guide_src/source/tutorial/static_pages.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 6fde0a671da7..00a384e3a9fb 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -183,18 +183,19 @@ controller you made above produces... +---------------------------------+-----------------------------------------------------------------+ | URL | Will show | +=================================+=================================================================+ + | localhost:8080/ | the CodeIgniter "welcome" page. the results from the ``index()``| + | | method in the ``Home`` controller. | + +---------------------------------+-----------------------------------------------------------------+ | localhost:8080/pages | the results from the ``index()`` method inside our ``Pages`` | | | controller, which is to display the CodeIgniter "welcome" page. | +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view | the "home" page that you made above, because it is the default | - | | "page" parameter to the ``view()`` method. | - +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/home | show the "home" page that you made above, because we explicitly | - | | asked for it. | + | localhost:8080/home | show the "home" page that you made above, because we explicitly | + | | asked for it. the results from the ``view()`` method inside our | + | | ``Pages`` controller. | +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/about | the "about" page that you made above, because we explicitly | + | localhost:8080/about | the "about" page that you made above, because we explicitly | | | asked for it. | +---------------------------------+-----------------------------------------------------------------+ - | localhost:8080/pages/view/shop | a "404 - File Not Found" error page, because there is no | + | localhost:8080/shop | a "404 - File Not Found" error page, because there is no | | | **app/Views/pages/shop.php**. | +---------------------------------+-----------------------------------------------------------------+ From dbf3962cc98f8b0cf90cff328e3c2996f291da74 Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Thu, 28 Jul 2022 18:22:54 +0700 Subject: [PATCH 0919/8282] resolve grammar(?) --- system/CLI/CLI.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index de97fa431b54..80969b75a81e 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -302,7 +302,7 @@ public static function promptByKey($text, array $options, $validation = null): s } /** - * * This method is the same as promptByKey(), but this method supports multiple value. + * * This method is the same as promptByKey(), but this method supports multiple keys, separated by commas. * * @param string $text Output "field" text or an one or two value array where the first value is the text before listing the options * and the second value the text before asking to select one option. Provide empty string to omit @@ -310,7 +310,7 @@ public static function promptByKey($text, array $options, $validation = null): s * * @return array The selected key and value of $options */ - public static function promptByMultipleKey($text, array $options) + public static function promptByMultipleKeys($text, array $options) { if (is_string($text)) { $text = [$text]; @@ -360,7 +360,7 @@ public static function promptByMultipleKey($text, array $options) if (preg_match_all('/[a-zA-Z]/i', trim($input))) { static::error('Please select correctly'); - return $input = static::promptByMultipleKey($line, $options); + return $input = static::promptByMultipleKeys($line, $options); } // separate input by comma and convert all to an int[] @@ -375,7 +375,7 @@ public static function promptByMultipleKey($text, array $options) if ($maxOptions < $maxInput) { static::error('Please select correctly'); - return $input = static::promptByMultipleKey($line, $options); + return $input = static::promptByMultipleKeys($line, $options); } $input = []; From 60f878dcc30f4cc19b553aff627368aa2f73d378 Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Thu, 28 Jul 2022 19:48:53 +0700 Subject: [PATCH 0920/8282] change method name in unit test --- tests/system/CLI/CLITest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 160091f4ec94..7478ce18f2bc 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -526,10 +526,10 @@ public function testStrlen() $this->assertSame(0, CLI::strlen(null)); } - public function testPromptByMultipleKey() + public function testPromptByMultipleKeys() { $options = ['one', 'two', 'three']; - CLI::promptByMultipleKey('Is this a question?', $options); + CLI::promptByMultipleKeys('Is this a question?', $options); $expected = '' . PHP_EOL . 'Is this a question?' . PHP_EOL; From 54c8cbd4be120556d10305435b71dd4a2a343ecb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 07:46:11 +0900 Subject: [PATCH 0921/8282] docs: add initialization of $db in sample code --- user_guide_src/source/database/metadata/001.php | 2 ++ user_guide_src/source/database/metadata/002.php | 2 ++ user_guide_src/source/database/metadata/003.php | 2 ++ user_guide_src/source/database/metadata/004.php | 2 ++ user_guide_src/source/database/metadata/005.php | 2 ++ user_guide_src/source/database/metadata/006.php | 2 ++ user_guide_src/source/database/metadata/007.php | 2 ++ user_guide_src/source/database/metadata/008.php | 2 ++ user_guide_src/source/database/metadata/009.php | 2 ++ 9 files changed, 18 insertions(+) diff --git a/user_guide_src/source/database/metadata/001.php b/user_guide_src/source/database/metadata/001.php index a4d50427b93a..195b3882135d 100644 --- a/user_guide_src/source/database/metadata/001.php +++ b/user_guide_src/source/database/metadata/001.php @@ -1,5 +1,7 @@ listTables(); foreach ($tables as $table) { diff --git a/user_guide_src/source/database/metadata/002.php b/user_guide_src/source/database/metadata/002.php index 5198eaff081b..5385acb407db 100644 --- a/user_guide_src/source/database/metadata/002.php +++ b/user_guide_src/source/database/metadata/002.php @@ -1,5 +1,7 @@ tableExists('table_name')) { // some code... } diff --git a/user_guide_src/source/database/metadata/003.php b/user_guide_src/source/database/metadata/003.php index 64e708bbeda7..0450be53058c 100644 --- a/user_guide_src/source/database/metadata/003.php +++ b/user_guide_src/source/database/metadata/003.php @@ -1,5 +1,7 @@ getFieldNames('table_name'); foreach ($fields as $field) { diff --git a/user_guide_src/source/database/metadata/004.php b/user_guide_src/source/database/metadata/004.php index a9d866b42d06..317e8fc3dad4 100644 --- a/user_guide_src/source/database/metadata/004.php +++ b/user_guide_src/source/database/metadata/004.php @@ -1,5 +1,7 @@ query('SELECT * FROM some_table'); foreach ($query->getFieldNames() as $field) { diff --git a/user_guide_src/source/database/metadata/005.php b/user_guide_src/source/database/metadata/005.php index 14d6b49b4fe6..fdb7e9eb1c32 100644 --- a/user_guide_src/source/database/metadata/005.php +++ b/user_guide_src/source/database/metadata/005.php @@ -1,5 +1,7 @@ fieldExists('field_name', 'table_name')) { // some code... } diff --git a/user_guide_src/source/database/metadata/006.php b/user_guide_src/source/database/metadata/006.php index c7a05c9d152b..3f57499ec4ef 100644 --- a/user_guide_src/source/database/metadata/006.php +++ b/user_guide_src/source/database/metadata/006.php @@ -1,5 +1,7 @@ getFieldData('table_name'); foreach ($fields as $field) { diff --git a/user_guide_src/source/database/metadata/007.php b/user_guide_src/source/database/metadata/007.php index 2c68fc14b5f4..8df43756facb 100644 --- a/user_guide_src/source/database/metadata/007.php +++ b/user_guide_src/source/database/metadata/007.php @@ -1,4 +1,6 @@ query('YOUR QUERY'); $fields = $query->fieldData(); diff --git a/user_guide_src/source/database/metadata/008.php b/user_guide_src/source/database/metadata/008.php index 7014fb11fe1a..5b3e158149bf 100644 --- a/user_guide_src/source/database/metadata/008.php +++ b/user_guide_src/source/database/metadata/008.php @@ -1,5 +1,7 @@ getIndexData('table_name'); foreach ($keys as $key) { diff --git a/user_guide_src/source/database/metadata/009.php b/user_guide_src/source/database/metadata/009.php index c46169afab22..c4878c5186b2 100644 --- a/user_guide_src/source/database/metadata/009.php +++ b/user_guide_src/source/database/metadata/009.php @@ -1,5 +1,7 @@ getForeignKeyData('table_name'); foreach ($keys as $key) { From dd86ad05c03ab7ffdc780795401ff0970f2a10d4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 07:46:44 +0900 Subject: [PATCH 0922/8282] docs: fix wrong method name --- user_guide_src/source/database/metadata/007.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/metadata/007.php b/user_guide_src/source/database/metadata/007.php index 8df43756facb..d0ec9021bc9a 100644 --- a/user_guide_src/source/database/metadata/007.php +++ b/user_guide_src/source/database/metadata/007.php @@ -3,4 +3,4 @@ $db = db_connect(); $query = $db->query('YOUR QUERY'); -$fields = $query->fieldData(); +$fields = $query->getFieldData(); From a122ee686c0d5a3ee59621337c9ab299beb3f0cc Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 10:25:15 +0900 Subject: [PATCH 0923/8282] docs: fix how to define namespaces There is no real use case for `'Acme' => ROOTPATH . 'acme'`. Acme is a vendor namespace, but a module needs a module namespace for Auto-Discovery. --- user_guide_src/source/general/modules.rst | 11 +++-------- user_guide_src/source/general/modules/001.php | 2 +- user_guide_src/source/general/modules/003.php | 16 ---------------- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 user_guide_src/source/general/modules/003.php diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index fe71bd006f72..22cfe2cdca30 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -30,11 +30,11 @@ directory in the main project root:: /tests /writable -Open **app/Config/Autoload.php** and add the **Acme** namespace to the ``psr4`` array property: +Open **app/Config/Autoload.php** and add the ``Acme\Blog`` namespace to the ``psr4`` array property: .. literalinclude:: modules/001.php -Now that this is set up, we can access any file within the **acme** folder through the ``Acme`` namespace. This alone +Now that this is set up, we can access any file within the **acme/Blog** folder through the ``Acme\Blog`` namespace. This alone takes care of 80% of what is needed for modules to work, so you should be sure to familiarize yourself with namespaces and become comfortable with their use. Several file types will be scanned for automatically through all defined namespaces - a crucial ingredient for working with modules. @@ -90,12 +90,7 @@ This is configured in the file **app/Config/Modules.php**. The auto-discovery system works by scanning for particular directories and files within psr4 namespaces that have been defined in **Config/Autoload.php**. -To make auto-discovery work for our **Blog** namespace, we need to make one small adjustment. -**Acme** needs to be changed to **Acme\\Blog** because each "module" within the namespace needs to be fully defined. - -.. literalinclude:: modules/003.php - -Once your module folder path is defined, the discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**. +The discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**. Enable/Disable Discover ======================= diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php index 4ced75497590..1f93e213359f 100644 --- a/user_guide_src/source/general/modules/001.php +++ b/user_guide_src/source/general/modules/001.php @@ -9,7 +9,7 @@ class Autoload extends AutoloadConfig public $psr4 = [ APP_NAMESPACE => APPPATH, // For custom namespace 'Config' => APPPATH . 'Config', - 'Acme' => ROOTPATH . 'acme', + 'Acme\Blog' => ROOTPATH . 'acme/Blog', ]; // ... diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php deleted file mode 100644 index 93601b2f1d66..000000000000 --- a/user_guide_src/source/general/modules/003.php +++ /dev/null @@ -1,16 +0,0 @@ - APPPATH, // For custom namespace - 'Config' => APPPATH . 'Config', - 'Acme\Blog' => ROOTPATH . 'acme/Blog', // Change - ]; - - // ... -} From 1613476d45943a1f15fc1a1f7346f55e172a208d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 10:28:53 +0900 Subject: [PATCH 0924/8282] docs: fix text decoration --- user_guide_src/source/general/modules.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 22cfe2cdca30..18b0f1c70ce6 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -95,13 +95,13 @@ The discovery process would look for discoverable items on that path and should, Enable/Disable Discover ======================= -You can turn on or off all auto-discovery in the system with the **$enabled** class variable. False will disable +You can turn on or off all auto-discovery in the system with the ``$enabled`` class variable. False will disable all discovery, optimizing performance, but negating the special capabilities of your modules. Specify Discovery Items ======================= -With the **$aliases** option, you can specify which items are automatically discovered. If the item is not +With the ``$aliases`` option, you can specify which items are automatically discovered. If the item is not present, then no auto-discovery will happen for that item, but the others in the array will still be discovered. Discovery and Composer @@ -168,12 +168,12 @@ with the ``new`` command: .. literalinclude:: modules/008.php -Config files are automatically discovered whenever using the **config()** function that is always available. +Config files are automatically discovered whenever using the ``config()`` function that is always available. .. note:: We don't recommend you use the same short classname in modules. Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`. -.. note:: **config()** finds the file in **app/Config/** when there is a class with the same shortname, +.. note:: ``config()`` finds the file in **app/Config/** when there is a class with the same shortname, even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``. This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-options` for more information. From ae7893285279bb6415f757cdf8ca2bda82e61ec2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 18:54:10 +0900 Subject: [PATCH 0925/8282] docs: update docs on imagick extentsion --- system/Images/Handlers/ImageMagickHandler.php | 6 ------ user_guide_src/source/libraries/images.rst | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php index 5e0bafe00841..a1482db7d49a 100644 --- a/system/Images/Handlers/ImageMagickHandler.php +++ b/system/Images/Handlers/ImageMagickHandler.php @@ -19,12 +19,6 @@ /** * Class ImageMagickHandler * - * To make this library as compatible as possible with the broadest - * number of installations, we do not use the Imagick extension, - * but simply use the command line version. - * - * hmm - the width & height accessors at the end use the imagick extension. - * * FIXME - This needs conversion & unit testing, to use the imagick extension */ class ImageMagickHandler extends BaseHandler diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst index 1e4f85692467..8c4ed8c7b711 100644 --- a/user_guide_src/source/libraries/images.rst +++ b/user_guide_src/source/libraries/images.rst @@ -39,9 +39,7 @@ The available Handlers are as follows: If using the ImageMagick library, you must set the path to the library on your server in **app/Config/Images.php**. -.. note:: The ImageMagick handler does NOT require the imagick extension to be - loaded on the server. As long as your script can access the library - and can run ``exec()`` on the server, it should work. +.. note:: The ImageMagick handler requires the imagick extension. ******************* Processing an Image From 01a58d6500ce428646394f3d477ce7628d0d339a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 24 Jul 2022 11:15:05 +0900 Subject: [PATCH 0926/8282] refactor: loading Config/Routes.php --- system/CodeIgniter.php | 3 ++- system/Commands/Utilities/FilterCheck.php | 3 +-- system/Commands/Utilities/Routes.php | 4 ++-- system/Router/RouteCollection.php | 18 ++++++++++++++++++ system/Test/FeatureTestCase.php | 8 ++------ system/Test/FeatureTestTrait.php | 8 ++------ system/Test/FilterTestTrait.php | 4 ++-- system/Test/bootstrap.php | 9 ++------- 8 files changed, 31 insertions(+), 26 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index fd59c1417ff3..fb6885a37d25 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -730,7 +730,8 @@ public function displayPerformanceMetrics(string $output): string protected function tryToRouteIt(?RouteCollectionInterface $routes = null) { if ($routes === null) { - require APPPATH . 'Config/Routes.php'; + $routes = Services::routes(); + $routes->loadRoutes(); } // $routes is defined in Config/Routes.php diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php index 7469ce1444c2..ecf2a65fc673 100644 --- a/system/Commands/Utilities/FilterCheck.php +++ b/system/Commands/Utilities/FilterCheck.php @@ -86,8 +86,7 @@ public function run(array $params) // Load Routes $routes = Services::routes(); - require APPPATH . 'Config/Routes.php'; - $routes->getRoutes('*'); // Triggers discovery + $routes->loadRoutes(); $filterCollector = new FilterCollector(); diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index c62e11df6d3f..95f8def6d8b1 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -75,8 +75,8 @@ class Routes extends BaseCommand */ public function run(array $params) { - $routes = Services::routes(true); - require APPPATH . 'Config/Routes.php'; + $routes = Services::routes(); + $routes->loadRoutes(); $collection = $routes; $methods = [ diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index ffc6ea95b2c5..63e5b5423de8 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1393,6 +1393,7 @@ public function resetRoutes() } $this->prioritizeDetected = false; + $this->didDiscover = false; } /** @@ -1490,4 +1491,21 @@ public function shouldUseSupportedLocalesOnly(): bool { return $this->useSupportedLocalesOnly; } + + /** + * Loads main routes file and discover routes. + * + * Loads only once unless reset. + */ + public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php'): void + { + if ($this->didDiscover) { + return; + } + + $routes = $this; + require $routesFile; + + $this->discoverRoutes(); + } } diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php index dc0c65b4a8b7..d47eb73046e4 100644 --- a/system/Test/FeatureTestCase.php +++ b/system/Test/FeatureTestCase.php @@ -176,12 +176,8 @@ public function call(string $method, string $path, ?array $params = null) // Initialize the RouteCollection if (! $routes = $this->routes) { - require APPPATH . 'Config/Routes.php'; - - /** - * @var RouteCollection $routes - */ - $routes->getRoutes('*'); + $routes = Services::routes(); + $routes->loadRoutes(); } $routes->setHTTPVerb($method); diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 790de784e237..59bca1a5adc6 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -166,12 +166,8 @@ public function call(string $method, string $path, ?array $params = null) // Initialize the RouteCollection if (! $routes = $this->routes) { - require APPPATH . 'Config/Routes.php'; - - /** - * @var RouteCollection $routes - */ - $routes->getRoutes('*'); + $routes = Services::routes(); + $routes->loadRoutes(); } $routes->setHTTPVerb($method); diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php index 1407a67b0a64..4a60a6e91f16 100644 --- a/system/Test/FilterTestTrait.php +++ b/system/Test/FilterTestTrait.php @@ -104,9 +104,9 @@ protected function setUpFilterTestTrait(): void if ($this->collection === null) { // Load the RouteCollection from Config to gather App route info // (creates $routes using the Service as a starting point) - require APPPATH . 'Config/Routes.php'; + $routes = Services::routes(); + $routes->loadRoutes(); - $routes->getRoutes('*'); // Triggers discovery $this->collection = $routes; } diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 6b0068f04670..976f21dc4895 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -10,7 +10,6 @@ */ use CodeIgniter\Config\DotEnv; -use CodeIgniter\Router\RouteCollection; use Config\Autoload; use Config\Modules; use Config\Paths; @@ -93,9 +92,5 @@ // Always load the URL helper, it should be used in most of apps. helper('url'); -require_once APPPATH . 'Config/Routes.php'; - -/** - * @var RouteCollection $routes - */ -$routes->getRoutes('*'); +$routes = Services::routes(); +$routes->loadRoutes(); From 125deacd2eb672e39aa73b1642056d52a6f1fe30 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 24 Jul 2022 20:22:41 +0900 Subject: [PATCH 0927/8282] refactor: now you can write Services::routes()->loadRoutes() --- system/CodeIgniter.php | 3 +-- system/Commands/Utilities/FilterCheck.php | 3 +-- system/Commands/Utilities/Routes.php | 5 +---- system/Router/RouteCollection.php | 8 ++++++-- system/Test/FeatureTestCase.php | 3 +-- system/Test/FeatureTestTrait.php | 3 +-- system/Test/FilterTestTrait.php | 7 +------ system/Test/bootstrap.php | 3 +-- 8 files changed, 13 insertions(+), 22 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index fb6885a37d25..36a9dabc1d07 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -730,8 +730,7 @@ public function displayPerformanceMetrics(string $output): string protected function tryToRouteIt(?RouteCollectionInterface $routes = null) { if ($routes === null) { - $routes = Services::routes(); - $routes->loadRoutes(); + $routes = Services::routes()->loadRoutes(); } // $routes is defined in Config/Routes.php diff --git a/system/Commands/Utilities/FilterCheck.php b/system/Commands/Utilities/FilterCheck.php index ecf2a65fc673..15f66e97a8a7 100644 --- a/system/Commands/Utilities/FilterCheck.php +++ b/system/Commands/Utilities/FilterCheck.php @@ -85,8 +85,7 @@ public function run(array $params) $route = $params[1]; // Load Routes - $routes = Services::routes(); - $routes->loadRoutes(); + Services::routes()->loadRoutes(); $filterCollector = new FilterCollector(); diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index 95f8def6d8b1..8f8b5188e570 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -75,10 +75,7 @@ class Routes extends BaseCommand */ public function run(array $params) { - $routes = Services::routes(); - $routes->loadRoutes(); - - $collection = $routes; + $collection = Services::routes()->loadRoutes(); $methods = [ 'get', 'head', diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 63e5b5423de8..fc97bbc5cb50 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1496,16 +1496,20 @@ public function shouldUseSupportedLocalesOnly(): bool * Loads main routes file and discover routes. * * Loads only once unless reset. + * + * @return $this */ - public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php'): void + public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php') { if ($this->didDiscover) { - return; + return $this; } $routes = $this; require $routesFile; $this->discoverRoutes(); + + return $this; } } diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php index d47eb73046e4..bf79d69d3c51 100644 --- a/system/Test/FeatureTestCase.php +++ b/system/Test/FeatureTestCase.php @@ -176,8 +176,7 @@ public function call(string $method, string $path, ?array $params = null) // Initialize the RouteCollection if (! $routes = $this->routes) { - $routes = Services::routes(); - $routes->loadRoutes(); + $routes = Services::routes()->loadRoutes(); } $routes->setHTTPVerb($method); diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 59bca1a5adc6..e61c53001b85 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -166,8 +166,7 @@ public function call(string $method, string $path, ?array $params = null) // Initialize the RouteCollection if (! $routes = $this->routes) { - $routes = Services::routes(); - $routes->loadRoutes(); + $routes = Services::routes()->loadRoutes(); } $routes->setHTTPVerb($method); diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php index 4a60a6e91f16..465648f4f6b3 100644 --- a/system/Test/FilterTestTrait.php +++ b/system/Test/FilterTestTrait.php @@ -102,12 +102,7 @@ protected function setUpFilterTestTrait(): void $this->filters ??= new Filters($this->filtersConfig, $this->request, $this->response); if ($this->collection === null) { - // Load the RouteCollection from Config to gather App route info - // (creates $routes using the Service as a starting point) - $routes = Services::routes(); - $routes->loadRoutes(); - - $this->collection = $routes; + $this->collection = Services::routes()->loadRoutes(); } $this->doneFilterSetUp = true; diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 976f21dc4895..5eeaae6071ab 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -92,5 +92,4 @@ // Always load the URL helper, it should be used in most of apps. helper('url'); -$routes = Services::routes(); -$routes->loadRoutes(); +Services::routes()->loadRoutes(); From 4288efe22046a6ef81b51a5767e03e45dc4795d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 24 Jul 2022 20:27:28 +0900 Subject: [PATCH 0928/8282] refactor: change the method order loadRoutes() and discoverRoutes() are initialization. --- system/Router/RouteCollection.php | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index fc97bbc5cb50..34989d54a171 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -239,6 +239,62 @@ public function __construct(FileLocator $locator, Modules $moduleConfig) $this->httpHost = Services::request()->getServer('HTTP_HOST'); } + /** + * Loads main routes file and discover routes. + * + * Loads only once unless reset. + * + * @return $this + */ + public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php') + { + if ($this->didDiscover) { + return $this; + } + + $routes = $this; + require $routesFile; + + $this->discoverRoutes(); + + return $this; + } + + /** + * Will attempt to discover any additional routes, either through + * the local PSR4 namespaces, or through selected Composer packages. + */ + protected function discoverRoutes() + { + if ($this->didDiscover) { + return; + } + + // We need this var in local scope + // so route files can access it. + $routes = $this; + + if ($this->moduleConfig->shouldDiscover('routes')) { + $files = $this->fileLocator->search('Config/Routes.php'); + + $excludes = [ + APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php', + SYSTEMPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php', + ]; + + foreach ($files as $file) { + // Don't include our main file again... + if (in_array($file, $excludes, true)) { + continue; + } + + include $file; + } + } + + $this->didDiscover = true; + } + /** * Registers a new constraint with the system. Constraints are used * by the routes as placeholders for regular expressions to make defining @@ -362,41 +418,6 @@ public function get404Override() return $this->override404; } - /** - * Will attempt to discover any additional routes, either through - * the local PSR4 namespaces, or through selected Composer packages. - */ - protected function discoverRoutes() - { - if ($this->didDiscover) { - return; - } - - // We need this var in local scope - // so route files can access it. - $routes = $this; - - if ($this->moduleConfig->shouldDiscover('routes')) { - $files = $this->fileLocator->search('Config/Routes.php'); - - $excludes = [ - APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php', - SYSTEMPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php', - ]; - - foreach ($files as $file) { - // Don't include our main file again... - if (in_array($file, $excludes, true)) { - continue; - } - - include $file; - } - } - - $this->didDiscover = true; - } - /** * Sets the default constraint to be used in the system. Typically * for use with the 'resource' method. @@ -1491,25 +1512,4 @@ public function shouldUseSupportedLocalesOnly(): bool { return $this->useSupportedLocalesOnly; } - - /** - * Loads main routes file and discover routes. - * - * Loads only once unless reset. - * - * @return $this - */ - public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php') - { - if ($this->didDiscover) { - return $this; - } - - $routes = $this; - require $routesFile; - - $this->discoverRoutes(); - - return $this; - } } From 04cbdf1e811e00cd78dbdb4abbb666b0d191a8a0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Jul 2022 19:50:59 +0900 Subject: [PATCH 0929/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 9c62bb05c150..959f9baaf5f0 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -28,6 +28,7 @@ Others - The ``spark`` file has been changed due to a change in the processing of Spark commands. - ``InvalidArgumentException`` that is a kind of ``LogicException`` in ``BaseBuilder::_whereIn()`` is not suppressed by the configuration. Previously if ``CI_DEBUG`` was false, the exception was suppressed. +- ``RouteCollection::resetRoutes()`` resets Auto-Discovery of Routes. Previously once discovered, RouteCollection never discover Routes files again even if ``RouteCollection::resetRoutes()`` is called. Enhancements ************ From c07de8eabb8c3a0c604ce0252e715a6f5a426d8b Mon Sep 17 00:00:00 2001 From: Rival Arya Date: Fri, 29 Jul 2022 17:58:38 +0700 Subject: [PATCH 0930/8282] - refactor code - delete unit test for promptByMultipleKeys because #6076 - change method name in docs and changelog --- system/CLI/CLI.php | 106 +++++++++--------- tests/system/CLI/CLITest.php | 15 --- user_guide_src/source/changelogs/v4.3.0.rst | 2 +- user_guide_src/source/cli/cli_library.rst | 4 +- user_guide_src/source/cli/cli_library/023.php | 2 +- 5 files changed, 58 insertions(+), 71 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 80969b75a81e..7a67f4998d6b 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -282,21 +282,13 @@ public static function promptByKey($text, array $options, $validation = null): s throw new InvalidArgumentException('$text can only be of type string|array'); } - if (! $options) { - throw new InvalidArgumentException('No options to select from were provided'); - } + CLI::isZeroOptions($options); if ($line = array_shift($text)) { CLI::write($line); } - // +2 for the square brackets around the key - $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2; - - foreach ($options as $key => $description) { - $name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' '); - CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4)); - } + CLI::printKeysAndValues($options); return static::prompt(PHP_EOL . array_shift($text), array_keys($options), $validation); } @@ -308,59 +300,38 @@ public static function promptByKey($text, array $options, $validation = null): s * and the second value the text before asking to select one option. Provide empty string to omit * @param array $options A list of options (array(key => description)), the first option will be the default value * - * @return array The selected key and value of $options + * @return array The selected key(s) and value(s) of $options */ public static function promptByMultipleKeys($text, array $options) { - if (is_string($text)) { - $text = [$text]; - } elseif (! is_array($text)) { - throw new InvalidArgumentException('$text can only be string'); - } - - if (is_array($options) && $options) { - $opts = $options; - $extraOutputDefault = static::color('0', 'green'); + CLI::isZeroOptions($options); - unset($opts[0]); - - if (empty($opts)) { - $extraOutput = $extraOutputDefault; - } else { - $optsKey = []; - - foreach (array_keys($opts) as $key) { - $optsKey[] = $key; - } - $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']'; - } + $extraOutputDefault = static::color('0', 'green'); + $opts = $options; + unset($opts[0]); - $default = 0; + if (empty($opts)) { + $extraOutput = $extraOutputDefault; } else { - throw new InvalidArgumentException('$options can only be array'); - } - - if ($line = array_shift($text)) { - CLI::newLine(); - CLI::write($line); + $optsKey = []; + foreach (array_keys($opts) as $key) { + $optsKey[] = $key; + } + $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']'; } - // +2 for the square brackets around the key - $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2; - - foreach ($options as $key => $description) { - $name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' '); - CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4)); - } + CLI::newLine(); + CLI::write($text); + CLI::printKeysAndValues($options); static::fwrite(STDOUT, (trim((string) ((int) $text)) ? ' ' : '') . $extraOutput . ': '); - $input = trim(static::input()) ?: $default; + $input = trim(static::input()) ?: 0; // 0 is default - // search alphabetic character + // search alphabetic character in $input // return the prompt again if it is true because the key of $options is number if (preg_match_all('/[a-zA-Z]/i', trim($input))) { static::error('Please select correctly'); - return $input = static::promptByMultipleKeys($line, $options); + return static::promptByMultipleKeys($text, $options); } // separate input by comma and convert all to an int[] @@ -369,17 +340,16 @@ public static function promptByMultipleKeys($text, array $options) // find max from key of $options $maxOptions = array_key_last($options); // find max from input - $maxInput = max($inputToArray); + $maxInput = max($inputToArray); // if max from $options less than max from input // it is mean user tried to access null value in $options if ($maxOptions < $maxInput) { static::error('Please select correctly'); - return $input = static::promptByMultipleKeys($line, $options); + return static::promptByMultipleKeys($text, $options); } $input = []; - foreach ($options as $key => $description) { foreach ($inputToArray as $inputKey) { if ($key === $inputKey) { @@ -391,6 +361,38 @@ public static function promptByMultipleKeys($text, array $options) return $input; } + //-------------------------------------------------------------------- + // Utility for promptBy... + //-------------------------------------------------------------------- + + /** + * Validation for $options in promptByKey() and promptByMultipleKeys(). Return an error if $options is an empty array. + */ + private static function isZeroOptions(array $options) : void + { + if(!$options){ + throw new InvalidArgumentException('No options to select from were provided'); + } + } + + /** + * Print each key and value one by one + */ + private static function printKeysAndValues(array $options) : void + { + // +2 for the square brackets around the key + $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2; + + foreach ($options as $key => $description) { + $name = str_pad(' [' . $key . '] ', $keyMaxLength + 4, ' '); + CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4)); + } + } + + //-------------------------------------------------------------------- + // End Utility for promptBy... + //-------------------------------------------------------------------- + /** * Validate one prompt "field" at a time * diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 7478ce18f2bc..e2b6857c5053 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -526,19 +526,4 @@ public function testStrlen() $this->assertSame(0, CLI::strlen(null)); } - public function testPromptByMultipleKeys() - { - $options = ['one', 'two', 'three']; - CLI::promptByMultipleKeys('Is this a question?', $options); - - $expected = '' . PHP_EOL . 'Is this a question?' . PHP_EOL; - - foreach ($options as $key => $description) { - $name = str_pad(' [' . $key . '] ', 7, ' '); - $expected .= '' . CLI::color($name, 'green') . CLI::wrap($description, 125, 7) . PHP_EOL; - } - $expected .= '[' . CLI::color('0', 'green') . ', 1, 2]: '; - - $this->assertSame($expected, $this->getStreamFilterBuffer()); - } } diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 0dccc2ca83c0..fe6d688af1ae 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -34,7 +34,7 @@ Enhancements CLI === -- Added methods ``CLI::promptByMultipleKey()`` to support multiple value in input, unlike ``promptByKey()``. See :ref:`prompt-by-multiple-key` for details. +- Added methods ``CLI::promptByMultipleKeys()`` to support multiple value in input, unlike ``promptByKey()``. See :ref:`prompt-by-multiple-keys` for details. Others ====== diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst index 6d0466883fe8..b68d412e4dac 100644 --- a/user_guide_src/source/cli/cli_library.rst +++ b/user_guide_src/source/cli/cli_library.rst @@ -66,9 +66,9 @@ Named keys are also possible: Finally, you can pass :ref:`validation ` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options. -.. _prompt-by-multiple-key: +.. _prompt-by-multiple-keys: -promptByMultipleKey() +promptByMultipleKeys() ===================== This method is the same as ``promptByKey()``, but it supports multiple value. diff --git a/user_guide_src/source/cli/cli_library/023.php b/user_guide_src/source/cli/cli_library/023.php index 1d4a06437494..44a80fe4881e 100644 --- a/user_guide_src/source/cli/cli_library/023.php +++ b/user_guide_src/source/cli/cli_library/023.php @@ -1,6 +1,6 @@ Date: Sat, 30 Jul 2022 06:47:08 +0900 Subject: [PATCH 0931/8282] chore: remove Vagrantfile.dist It moved to devkit. --- .gitattributes | 1 - Vagrantfile.dist | 203 ----------------------------------------------- 2 files changed, 204 deletions(-) delete mode 100644 Vagrantfile.dist diff --git a/.gitattributes b/.gitattributes index e81e6ce3a031..074fc2cccc8a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ contributing/ export-ignore .nojekyll export-ignore export-ignore CODE_OF_CONDUCT.md export-ignore CONTRIBUTING.md export-ignore -Vagrantfile.dist export-ignore # They don't want our test files tests/AutoReview/ export-ignore diff --git a/Vagrantfile.dist b/Vagrantfile.dist deleted file mode 100644 index e85393ff8588..000000000000 --- a/Vagrantfile.dist +++ /dev/null @@ -1,203 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# https://github.com/hashicorp/vagrant/issues/9442#issuecomment-374785457 -unless Vagrant::DEFAULT_SERVER_URL.frozen? - Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') -end - -Vagrant.configure("2") do |config| - # VM Box - config.vm.box = "ubuntu/bionic64" - # Automatic box update checking - config.vm.box_check_update = true - - # CodeIgniter virtual host - config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1" - # Code Coverage virtual host - config.vm.network "forwarded_port", guest: 81, host: 8081, host_ip: "127.0.0.1" - # User Guide virtual host - config.vm.network "forwarded_port", guest: 82, host: 8082, host_ip: "127.0.0.1" - # MySQL server - #config.vm.network "forwarded_port", guest: 3306, host: 3307, host_ip: "127.0.0.1" - # PostgreSQL server - #config.vm.network "forwarded_port", guest: 5432, host: 5433, host_ip: "127.0.0.1" - # Memcached server - #config.vm.network "forwarded_port", guest: 11211, host: 11212, host_ip: "127.0.0.1" - # Redis server - #config.vm.network "forwarded_port", guest: 6379, host: 6380, host_ip: "127.0.0.1" - - # Add "192.168.10.10 ${VIRTUALHOST}" in your host file to access by domain - #config.vm.network "private_network", ip: "192.168.10.10" - - # Same path set in the $CODEIGNITER_PATH Provision - # "virtualbox" type allow auto-sync host to guest and guest to host - # but chmod does not work... tests will fail. - # Default rsync__args except "--copy-links", to allow phpunit correctly works by symlink - config.vm.synced_folder ".", "/var/www/codeigniter", type: "rsync", rsync__args: ["--verbose", "--archive", "--delete", "-z"] - - # Provider-specific configuration - config.vm.provider "virtualbox" do |vb| - # Display the VirtualBox GUI when booting the machine - vb.gui = false - # Customize the amount of memory on the VM: - vb.memory = "1024" - end - - # Provision - config.vm.provision "shell", inline: <<-SHELL - MYSQL_ROOT_PASS="password" - PGSQL_ROOT_PASS="password" - VIRTUALHOST="localhost" - CODEIGNITER_PATH="/var/www/codeigniter" - PHP_VERSION=7.4 - PGSQL_VERSION=10 - #APT_PROXY="192.168.10.1:3142" - - grep -q "127.0.0.1 ${VIRTUALHOST}" /etc/hosts || echo "127.0.0.1 ${VIRTUALHOST}" >> /etc/hosts - - # Creates a swap file if necessary - RAM=`awk '/MemTotal/ {print $2}' /proc/meminfo` - if [ $RAM -lt 1000000 ] && [ ! -f /swap/swapfile ]; then - echo "================================================================================" - echo "Adding swap" - echo "================================================================================" - echo "This process may take a few minutes. Please wait..." - mkdir /swap - dd if=/dev/zero of=/swap/swapfile bs=1024 count=1000000 - chmod 600 /swap/swapfile - mkswap /swap/swapfile - swapon /swap/swapfile - echo "/swap/swapfile swap swap defaults 0 0" >> /etc/fstab - echo "Done." - fi - - # Prepare to use APT Proxy - if [ ! -z $APT_PROXY ]; then - if [ ! -f /etc/apt/sources.list-origin ]; then - cp /etc/apt/sources.list /etc/apt/sources.list-origin - fi - sed -i "s/archive.ubuntu.com/${APT_PROXY}/" /etc/apt/sources.list - sed -i "s/security.ubuntu.com/${APT_PROXY}/" /etc/apt/sources.list - fi - - export DEBIAN_FRONTEND=noninteractive - - echo "================================================================================" - echo "Updating and Installing Required Packages" - echo "================================================================================" - - add-apt-repository ppa:ondrej/php - - apt-get update - - debconf-set-selections <<< "mysql-server mysql-server/root_password password ${MYSQL_ROOT_PASS}" - debconf-set-selections <<< "mysql-server mysql-server/root_password_again password ${MYSQL_ROOT_PASS}" - - apt-get install -y \ - php$PHP_VERSION apache2 composer \ - php-intl php-mbstring php-xml php-zip php-xdebug \ - php-mysql mysql-server mysql-client \ - php-pgsql postgresql-$PGSQL_VERSION \ - php-sqlite3 sqlite3 \ - php-memcached memcached \ - php-redis redis-server \ - php-curl curl \ - php-gd php-imagick \ - python-pip - - pip install sphinx sphinxcontrib-phpdomain - - apt-get autoclean - - echo "================================================================================" - echo "Preparing User Guide" - echo "================================================================================" - - cd "${CODEIGNITER_PATH}/user_guide_src/cilexer" - python setup.py install - cd .. - make html - - echo "================================================================================" - echo "Configuring Databases" - echo "================================================================================" - - sed -i "s/^bind-address/#bind-address/" /etc/mysql/mysql.conf.d/mysqld.cnf - mysql -e "CREATE DATABASE IF NOT EXISTS codeigniter COLLATE 'utf8_general_ci'; - UPDATE mysql.user SET Host='%' WHERE user='root'; - GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; - FLUSH PRIVILEGES;" -uroot -p$MYSQL_ROOT_PASS - systemctl restart mysql - - sed -i "s/^#listen_addresses = 'localhost'/listen_addresses = '*'/" /etc/postgresql/$PGSQL_VERSION/main/postgresql.conf - grep -q "host all root all md5" /etc/postgresql/$PGSQL_VERSION/main/pg_hba.conf || echo "host all root all md5" >> /etc/postgresql/$PGSQL_VERSION/main/pg_hba.conf - sudo -u postgres psql -tc "SELECT 1 FROM pg_roles WHERE rolname='root'" | grep -q 1 || sudo -u postgres psql -c "CREATE ROLE root WITH SUPERUSER CREATEDB CREATEROLE INHERIT LOGIN" - sudo -u postgres psql -c "ALTER ROLE root WITH PASSWORD '${PGSQL_ROOT_PASS}'" - sudo -u postgres psql -tc "SELECT 1 FROM pg_database WHERE datname='codeigniter'" | grep -q 1 ||sudo -u postgres psql -c "CREATE DATABASE codeigniter" - sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE codeigniter TO root" - systemctl restart postgresql - - echo "================================================================================" - echo "Configuring Memcached and Redis" - echo "================================================================================" - - sed -i "s/^bind 127.0.0.1/#bind 127.0.0.1/" /etc/redis/redis.conf - sed -i "s/^protected-mode yes/protected-mode no/" /etc/redis/redis.conf - sed -i "s/^-l 127.0.0.1/#-l 127.0.0.1/" /etc/memcached.conf - systemctl restart redis - systemctl restart memcached - - echo "================================================================================" - echo "Configuring Virtual Hosts" - echo "================================================================================" - - mkdir -p "${CODEIGNITER_PATH}/build/coverage-html" - mkdir -p "${CODEIGNITER_PATH}/public" - mkdir -p "${CODEIGNITER_PATH}/user_guide_src/build/html" - mkdir -p "${CODEIGNITER_PATH}/writable/apache" - chown -R vagrant:vagrant $CODEIGNITER_PATH - - # Creates a symlink in the user home - if [ ! -d /home/vagrant/codeigniter ]; then - ln -s $CODEIGNITER_PATH /home/vagrant/codeigniter - fi - - sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=vagrant/" /etc/apache2/envvars - sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=vagrant/" /etc/apache2/envvars - grep -q "Listen 81" /etc/apache2/ports.conf || sed -i "s/^Listen 80/Listen 80\\nListen 81\\nListen 82/" /etc/apache2/ports.conf - sed -i "s/^display_errors = Off/display_errors = On/" /etc/php/7.4/apache2/php.ini - sed -i "s/^display_startup_errors = Off/display_startup_errors = On/" /etc/php/7.4/apache2/php.ini - - echo "ServerName ${VIRTUALHOST} - - DirectoryIndex index.html index.php - Options All - AllowOverride All - - - ServerAdmin vagrant@localhost - DocumentRoot ${CODEIGNITER_PATH}/public - ErrorLog ${CODEIGNITER_PATH}/writable/apache/error.log - CustomLog ${CODEIGNITER_PATH}/writable/apache/custom.log combined - - - DocumentRoot ${CODEIGNITER_PATH}/build/coverage-html - - - DocumentRoot ${CODEIGNITER_PATH}/user_guide_src/build/html - -" > /etc/apache2/sites-available/codeigniter.conf - - a2enmod rewrite - a2dissite 000-default.conf - a2ensite codeigniter.conf - systemctl restart apache2 - - echo "================================================================================" - echo "Services Status" - echo "================================================================================" - service --status-all - - SHELL -end From d90c803c6b74c7ba82f2891d05111742212c2a78 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 30 Jul 2022 06:52:28 +0900 Subject: [PATCH 0932/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.2.2.rst | 1 + user_guide_src/source/installation/upgrading.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.2.rst b/user_guide_src/source/changelogs/v4.2.2.rst index eb457750e7c5..ffc55080d5db 100644 --- a/user_guide_src/source/changelogs/v4.2.2.rst +++ b/user_guide_src/source/changelogs/v4.2.2.rst @@ -28,6 +28,7 @@ Changes - Fixed: Validation of fields with a leading asterisk (wildcard). - Now ``CLIRequest::isCLI()`` always returns true. - Now ``IncommingRequest::isCLI()`` always returns false. +- **Vagrantfile.dist** has been moved to `CodeIgniter DevKit `_. Deprecations ************ diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 3570419e19c2..0a2d5a975968 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -12,6 +12,7 @@ upgrading from. .. toctree:: :titlesonly: + upgrade_422 upgrade_421 upgrade_420 upgrade_418 From 75e32a071edf11fe8522c1c12727a50da16f0e23 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 30 Jul 2022 07:16:59 +0900 Subject: [PATCH 0933/8282] docs: remove about Vagrant --- .../source/installation/running.rst | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index b2ba72d4cd7f..70ed23d22f4c 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -260,40 +260,6 @@ Setting Environment See :ref:`Handling Multiple Environments `. -Hosting with Vagrant -==================== - -Virtualization is an effective way to test your webapp in the environment you -plan to deploy on, even if you develop on a different one. -Even if you are using the same platform for both, virtualization provides an -isolated environment for testing. - -The codebase comes with a ``VagrantFile.dist``, that can be copied to ``VagrantFile`` -and tailored for your system, for instance enabling access to specific database or caching engines. - -Setting Up ----------- - -It assumes that you have installed `VirtualBox `_ and -`Vagrant `_ -for your platform. - -The Vagrant configuration file assumes you have set up a `ubuntu/bionic64 Vagrant box -`_ on your system:: - - vagrant box add ubuntu/bionic64 - -Testing -------- - -Once set up, you can then launch your webapp inside a VM, with the command:: - - vagrant up - -Your webapp will be accessible at ``http://localhost:8080``, with the code coverage -report for your build at ``http://localhost:8081`` and the user guide for -it at ``http://localhost:8082``. - Bootstrapping the App ===================== From e1995a762d29900f92226611c10bb8b82c3dfaab Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Sat, 30 Jul 2022 13:06:07 +0200 Subject: [PATCH 0934/8282] Undo style changes, translation only. --- app/Views/errors/html/error_404.php | 69 ++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index 3176f1eef567..fc4bdf055629 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -5,15 +5,74 @@ <?= lang('Errors.404pageNotFound') ?> -
      +
      +

      404

      -

      404

      - -

      +

      From 5dead758ca25f337c249db628dab0425bcdbcae9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 30 Jul 2022 22:46:07 +0900 Subject: [PATCH 0935/8282] docs: improve Whoops page explanation --- .../source/installation/troubleshooting.rst | 7 ++++--- user_guide_src/source/tutorial/index.rst | 11 +++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst index 8ffe659f82dc..a1fb26961696 100644 --- a/user_guide_src/source/installation/troubleshooting.rst +++ b/user_guide_src/source/installation/troubleshooting.rst @@ -68,10 +68,11 @@ That is a sign that you are in production mode and have hit an unrecoverable error, which we don't want to show to the viewer of the webapp, for better security. -You can see the error in the debug toolbar display by setting your environment to -"development" (in **.env**), and reloading the page. +You can see the error in the log file. See `CodeIgniter Error Logs`_ below. -Don't forget to reset the environment to "production" once you fix the problem! +If it is not on the production server, you should set your environment to +"development" (in **.env**). See :ref:`setting-development-mode` for the detail. +After that, reload the page. You will see the error and the back trace. CodeIgniter Error Logs ---------------------- diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst index e940ec849057..83a58aa61c5c 100644 --- a/user_guide_src/source/tutorial/index.rst +++ b/user_guide_src/source/tutorial/index.rst @@ -53,6 +53,9 @@ Enjoy your exploration of the CodeIgniter framework. Getting Up and Running ********************** +Installing CodeIgnier +===================== + You can download a release manually from the site, but for this tutorial we will use the recommended way and install the AppStarter package through Composer. From your command line type the following:: @@ -62,6 +65,11 @@ From your command line type the following:: This creates a new folder, **ci-news**, which contains your application code, with CodeIgniter installed in the vendor folder. +.. _setting-development-mode: + +Setting Development Mode +======================== + By default, CodeIgniter starts up in production mode. This is a safety feature to keep your site a bit more secure in case settings are messed up once it is live. So first let's fix that. Copy or rename the ``env`` file to ``.env``. Open it up. @@ -74,6 +82,9 @@ out. So uncomment the line with ``CI_ENVIRONMENT`` on it, and change ``productio CI_ENVIRONMENT = development +Running Development Server +========================== + With that out of the way it's time to view your application in a browser. You can serve it through any server of your choice, Apache, Nginx, etc, but CodeIgniter comes with a simple command that takes advantage of PHP's built-in server to get From 33f507dc7dffbf6e2a5000148e27bf393f9c986e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 30 Jul 2022 22:46:47 +0900 Subject: [PATCH 0936/8282] docs: improve Initial Configuration --- user_guide_src/source/general/environments.rst | 2 ++ user_guide_src/source/installation/running.rst | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index 33359425fd0b..bac1f4c394cb 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -13,6 +13,8 @@ tools loaded that you don't in production environments, etc. :local: :depth: 2 +.. _environment-constant: + The ENVIRONMENT Constant ======================== diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index b2ba72d4cd7f..12244932cc40 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -17,19 +17,19 @@ Initial Configuration & Set Up #. Open the **app/Config/App.php** file with a text editor and set your base URL. If you need more flexibility, the baseURL may - be set within the **.env** file as ``app.baseURL="http://example.com/"``. + be set within the **.env** file as ``app.baseURL = 'http://example.com/'``. (Always use a trailing slash on your base URL!) #. If you intend to use a database, open the **app/Config/Database.php** file with a text editor and set your database settings. Alternately, these could be set in your **.env** file. - -One additional measure to take in production environments is to disable -PHP error reporting and any other development-only functionality. In -CodeIgniter, this can be done by setting the ``ENVIRONMENT`` constant, which -is more fully described on the :doc:`environments page `. -By default, the application will run using the "production" environment. To -take advantage of the debugging tools provided, you should set the environment -to "development". +#. If it is not on the production server, set ``CI_ENVIRONMENT`` to ``development`` + in **.env** file to take advantage of the debugging tools provided. See + :ref:`setting-development-mode` for the detail. + +.. important:: In production environments, you should disable error display and + any other development-only functionality. In CodeIgniter, this can be done + by setting the environment to "production". By default, the application will + run using the "production" environment. See also :ref:`environment-constant`. .. note:: If you will be running your site using a web server (e.g., Apache or Nginx), you will need to modify the permissions for the ``writable`` folder inside From 61b169603f188e99fe8698e63f96a61a27878e10 Mon Sep 17 00:00:00 2001 From: fcosrno Date: Sat, 30 Jul 2022 12:26:23 -0400 Subject: [PATCH 0937/8282] fix: use env() instead of $_SERVER in detectEnvironment() --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 5468133b81c3..d48e6c3fb07c 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -528,7 +528,7 @@ protected function detectEnvironment() { // Make sure ENVIRONMENT isn't already set by other means. if (! defined('ENVIRONMENT')) { - define('ENVIRONMENT', getenv('CI_ENVIRONMENT') ?? 'production'); + define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production')); } } From 898c756f0754ba18b4113849277d0faa03a6cc11 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 13:40:56 +0900 Subject: [PATCH 0938/8282] test: add tests for Token Randomization in Cookie CSRF --- .../SecurityCSRFCookieRandomizeTokenTest.php | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php new file mode 100644 index 000000000000..e4345ebec15c --- /dev/null +++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php @@ -0,0 +1,88 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Security; + +use CodeIgniter\Config\Factories; +use CodeIgniter\Cookie\Cookie; +use CodeIgniter\HTTP\IncomingRequest; +use CodeIgniter\HTTP\URI; +use CodeIgniter\HTTP\UserAgent; +use CodeIgniter\Test\CIUnitTestCase; +use CodeIgniter\Test\Mock\MockAppConfig; +use CodeIgniter\Test\Mock\MockSecurity; +use Config\Security as SecurityConfig; + +/** + * @internal + */ +final class SecurityCSRFCookieRandomizeTokenTest extends CIUnitTestCase +{ + /** + * @var string CSRF protection hash + */ + private string $hash = '8b9218a55906f9dcc1dc263dce7f005a'; + + /** + * @var string CSRF randomized token + */ + private string $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1'; + + protected function setUp(): void + { + parent::setUp(); + + $_COOKIE = []; + + $config = new SecurityConfig(); + $config->csrfProtection = Security::CSRF_PROTECTION_COOKIE; + $config->tokenRandomize = true; + Factories::injectMock('config', 'Security', $config); + + // Set Cookie value + $security = new MockSecurity(new MockAppConfig()); + $_COOKIE[$security->getCookieName()] = $this->hash; + + $this->resetServices(); + } + + public function testTokenIsReadFromCookie() + { + $security = new MockSecurity(new MockAppConfig()); + + $this->assertSame( + $this->randomizedToken, + $security->getHash() + ); + } + + public function testCSRFVerifySetNewCookie() + { + $_SERVER['REQUEST_METHOD'] = 'POST'; + $_POST['foo'] = 'bar'; + $_POST['csrf_test_name'] = $this->randomizedToken; + + $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); + + $security = new Security(new MockAppConfig()); + + $this->assertInstanceOf(Security::class, $security->verify($request)); + $this->assertLogged('info', 'CSRF token verified.'); + $this->assertCount(1, $_POST); + + /** @var Cookie $cookie */ + $cookie = $this->getPrivateProperty($security, 'cookie'); + $newHash = $cookie->getValue(); + + $this->assertNotSame($this->hash, $newHash); + $this->assertSame(32, strlen($newHash)); + } +} From 4466c88de8918c81e2c18e86a46125c2f8decb75 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 09:42:44 +0900 Subject: [PATCH 0939/8282] test: fix setUp() When Security depends on Request, we need to reset it. --- tests/system/Security/SecurityTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index 160e35b17cb6..62d0afc92be6 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -36,7 +36,7 @@ protected function setUp(): void $_COOKIE = []; - Factories::reset(); + $this->resetServices(); } public function testBasicConfigIsSaved() From 333290dfeaab338b7976a63728cfd8ea27910ae7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 15:56:11 +0900 Subject: [PATCH 0940/8282] refactor: remove $_COOKIE --- system/Security/Security.php | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index a85fb732945b..c0da7551ce52 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -154,6 +154,11 @@ class Security implements SecurityInterface */ private ?Session $session = null; + /** + * CSRF Hash in Cookie + */ + private ?string $hashInCookie = null; + /** * Constructor. * @@ -192,7 +197,8 @@ public function __construct(App $config) $this->configureSession(); } - $this->request = Services::request(); + $this->request = Services::request(); + $this->hashInCookie = $this->request->getCookie($this->cookieName); $this->generateHash(); } @@ -308,7 +314,7 @@ public function verify(RequestInterface $request) if ($this->regenerate) { $this->hash = null; if ($this->isCSRFCookie()) { - unset($_COOKIE[$this->cookieName]); + $this->hashInCookie = null; } else { // Session based CSRF protection $this->session->remove($this->tokenName); @@ -504,7 +510,7 @@ protected function generateHash(): string // sub-pages causing this feature to fail if ($this->isCSRFCookie()) { if ($this->isHashInCookie()) { - return $this->hash = $_COOKIE[$this->cookieName]; + return $this->hash = $this->hashInCookie; } } elseif ($this->session->has($this->tokenName)) { // Session based CSRF protection @@ -526,9 +532,14 @@ protected function generateHash(): string private function isHashInCookie(): bool { - return isset($_COOKIE[$this->cookieName]) - && is_string($_COOKIE[$this->cookieName]) - && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1; + if ($this->hashInCookie === null) { + return false; + } + + $length = static::CSRF_HASH_BYTES * 2; + $pattern = '#^[0-9a-f]{' . $length . '}$#iS'; + + return preg_match($pattern, $this->hashInCookie) === 1; } private function saveHashInCookie(): void From 06f4cebe358aec51440d2c02b831f36d69bea85b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 15:58:43 +0900 Subject: [PATCH 0941/8282] refactor: move `if` --- system/Security/Security.php | 44 +++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index c0da7551ce52..5ec843ae416a 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -200,7 +200,9 @@ public function __construct(App $config) $this->request = Services::request(); $this->hashInCookie = $this->request->getCookie($this->cookieName); - $this->generateHash(); + if ($this->hash === null) { + $this->generateHash(); + } } private function isCSRFCookie(): bool @@ -321,7 +323,9 @@ public function verify(RequestInterface $request) } } - $this->generateHash(); + if ($this->hash === null) { + $this->generateHash(); + } log_message('info', 'CSRF token verified.'); @@ -503,28 +507,26 @@ public function sanitizeFilename(string $str, bool $relativePath = false): strin */ protected function generateHash(): string { - if ($this->hash === null) { - // If the cookie exists we will use its value. - // We don't necessarily want to regenerate it with - // each page load since a page could contain embedded - // sub-pages causing this feature to fail - if ($this->isCSRFCookie()) { - if ($this->isHashInCookie()) { - return $this->hash = $this->hashInCookie; - } - } elseif ($this->session->has($this->tokenName)) { - // Session based CSRF protection - return $this->hash = $this->session->get($this->tokenName); + // If the cookie exists we will use its value. + // We don't necessarily want to regenerate it with + // each page load since a page could contain embedded + // sub-pages causing this feature to fail + if ($this->isCSRFCookie()) { + if ($this->isHashInCookie()) { + return $this->hash = $this->hashInCookie; } + } elseif ($this->session->has($this->tokenName)) { + // Session based CSRF protection + return $this->hash = $this->session->get($this->tokenName); + } - $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES)); + $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES)); - if ($this->isCSRFCookie()) { - $this->saveHashInCookie(); - } else { - // Session based CSRF protection - $this->saveHashInSession(); - } + if ($this->isCSRFCookie()) { + $this->saveHashInCookie(); + } else { + // Session based CSRF protection + $this->saveHashInSession(); } return $this->hash; From e056312d0c20f51c4d0b7bb64be66883d27b457b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 16:02:11 +0900 Subject: [PATCH 0942/8282] refactor: extract restoreHash() method --- system/Security/Security.php | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 5ec843ae416a..3dc2ce61e6f4 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -502,6 +502,21 @@ public function sanitizeFilename(string $str, bool $relativePath = false): strin return stripslashes($str); } + /** + * Restore hash from Session or Cookie + */ + private function restoreHash(): void + { + if ($this->isCSRFCookie()) { + if ($this->isHashInCookie()) { + $this->hash = $this->hashInCookie; + } + } elseif ($this->session->has($this->tokenName)) { + // Session based CSRF protection + $this->hash = $this->session->get($this->tokenName); + } + } + /** * Generates the CSRF Hash. */ @@ -511,13 +526,10 @@ protected function generateHash(): string // We don't necessarily want to regenerate it with // each page load since a page could contain embedded // sub-pages causing this feature to fail - if ($this->isCSRFCookie()) { - if ($this->isHashInCookie()) { - return $this->hash = $this->hashInCookie; - } - } elseif ($this->session->has($this->tokenName)) { - // Session based CSRF protection - return $this->hash = $this->session->get($this->tokenName); + $this->restoreHash(); + + if ($this->hash !== null) { + return $this->hash; } $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES)); From 01842619d0b7a3810089f2672c8b0c71833a5063 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 16:05:29 +0900 Subject: [PATCH 0943/8282] refactor: generateHash() always generate new hash --- system/Security/Security.php | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 3dc2ce61e6f4..365aa752091b 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -200,6 +200,7 @@ public function __construct(App $config) $this->request = Services::request(); $this->hashInCookie = $this->request->getCookie($this->cookieName); + $this->restoreHash(); if ($this->hash === null) { $this->generateHash(); } @@ -314,16 +315,6 @@ public function verify(RequestInterface $request) } if ($this->regenerate) { - $this->hash = null; - if ($this->isCSRFCookie()) { - $this->hashInCookie = null; - } else { - // Session based CSRF protection - $this->session->remove($this->tokenName); - } - } - - if ($this->hash === null) { $this->generateHash(); } @@ -518,20 +509,10 @@ private function restoreHash(): void } /** - * Generates the CSRF Hash. + * Generates (Regenerate) the CSRF Hash. */ protected function generateHash(): string { - // If the cookie exists we will use its value. - // We don't necessarily want to regenerate it with - // each page load since a page could contain embedded - // sub-pages causing this feature to fail - $this->restoreHash(); - - if ($this->hash !== null) { - return $this->hash; - } - $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES)); if ($this->isCSRFCookie()) { From f4c1fa4cc7aad697571c4b0d2954412d2d3b3fab Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 16:08:35 +0900 Subject: [PATCH 0944/8282] refactor: extract removeTokenInRequest() method --- system/Security/Security.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 365aa752091b..f2c754d202ae 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -302,6 +302,22 @@ public function verify(RequestInterface $request) throw SecurityException::forDisallowedAction(); } + $this->removeTokenInRequest($request); + + if ($this->regenerate) { + $this->generateHash(); + } + + log_message('info', 'CSRF token verified.'); + + return $this; + } + + /** + * Remove token in POST or JSON request data + */ + private function removeTokenInRequest(RequestInterface $request): void + { $json = json_decode($request->getBody() ?? ''); if (isset($_POST[$this->tokenName])) { @@ -313,14 +329,6 @@ public function verify(RequestInterface $request) unset($json->{$this->tokenName}); $request->setBody(json_encode($json)); } - - if ($this->regenerate) { - $this->generateHash(); - } - - log_message('info', 'CSRF token verified.'); - - return $this; } private function getPostedToken(RequestInterface $request): ?string From 2b890fe8678e5d5ea24fb02f4052a6e59f8cc89c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 16:21:48 +0900 Subject: [PATCH 0945/8282] docs: add doc comments --- system/Security/Security.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index f2c754d202ae..529e10b0a8f7 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -54,7 +54,7 @@ class Security implements SecurityInterface protected $tokenRandomize = false; /** - * CSRF Hash + * CSRF Hash (without randomization) * * Random hash for Cross Site Request Forgery protection. * @@ -88,7 +88,7 @@ class Security implements SecurityInterface protected $cookie; /** - * CSRF Cookie Name + * CSRF Cookie Name (with Prefix) * * Cookie name for Cross Site Request Forgery protection. * @@ -155,7 +155,10 @@ class Security implements SecurityInterface private ?Session $session = null; /** - * CSRF Hash in Cookie + * CSRF Hash in Request Cookie + * + * The cookie value is always CSRF hash (without randomization) even if + * $tokenRandomize is true. */ private ?string $hashInCookie = null; @@ -249,7 +252,7 @@ public function CSRFVerify(RequestInterface $request) } /** - * Returns the CSRF Hash. + * Returns the CSRF Token. * * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method. * @@ -351,7 +354,7 @@ private function getPostedToken(RequestInterface $request): ?string } /** - * Returns the CSRF Hash. + * Returns the CSRF Token. */ public function getHash(): ?string { @@ -360,6 +363,10 @@ public function getHash(): ?string /** * Randomize hash to avoid BREACH attacks. + * + * @params string $hash CSRF hash + * + * @return string CSRF token */ protected function randomize(string $hash): string { @@ -376,7 +383,11 @@ protected function randomize(string $hash): string /** * Derandomize the token. * + * @params string $token CSRF token + * * @throws InvalidArgumentException "hex2bin(): Hexadecimal input string must have an even length" + * + * @return string CSRF hash */ protected function derandomize(string $token): string { From c38f6040d65b19cbd11123052cff702455785381 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 19:56:55 +0900 Subject: [PATCH 0946/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/installation/troubleshooting.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst index a1fb26961696..992c6969ef94 100644 --- a/user_guide_src/source/installation/troubleshooting.rst +++ b/user_guide_src/source/installation/troubleshooting.rst @@ -70,8 +70,8 @@ the webapp, for better security. You can see the error in the log file. See `CodeIgniter Error Logs`_ below. -If it is not on the production server, you should set your environment to -"development" (in **.env**). See :ref:`setting-development-mode` for the detail. +If you reach this page while developing you should change your environment to +"development" (in **.env**). See :ref:`setting-development-mode` for more details. After that, reload the page. You will see the error and the back trace. CodeIgniter Error Logs From bf7c6bc5736927e8060db99991a252493b2119a9 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 19:08:14 +0200 Subject: [PATCH 0947/8282] Add Timer method record for callables --- system/Common.php | 12 +++- system/Debug/Timer.php | 18 ++++++ tests/system/Debug/TimerTest.php | 95 ++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 3 deletions(-) diff --git a/system/Common.php b/system/Common.php index 962483bb68b2..6880a570664b 100644 --- a/system/Common.php +++ b/system/Common.php @@ -1076,12 +1076,14 @@ function stringify_attributes($attributes, bool $js = false): string if (! function_exists('timer')) { /** * A convenience method for working with the timer. - * If no parameter is passed, it will return the timer instance, - * otherwise will start or stop the timer intelligently. + * If no parameter is passed, it will return the timer instance. + * If callable is passed, it measures time of callable and + * returns its return value if any. + * Otherwise will start or stop the timer intelligently. * * @return mixed|Timer */ - function timer(?string $name = null) + function timer(?string $name = null, ?callable $callable) { $timer = Services::timer(); @@ -1089,6 +1091,10 @@ function timer(?string $name = null) return $timer; } + if (! is_null($callable)) { + return $timer->record($name, $callable); + } + if ($timer->has($name)) { return $timer->stop($name); } diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php index 9ca51d1c9b08..a576eb9586e4 100644 --- a/system/Debug/Timer.php +++ b/system/Debug/Timer.php @@ -126,4 +126,22 @@ public function has(string $name): bool { return array_key_exists(strtolower($name), $this->timers); } + + /** + * Executes callable and measures its time. + * Returns its return value if any. + * + * @param string $name The name of the timer + * @param callable $callable callable to be executed + * + * @return mixed|null + */ + public function record(string $name, callable $callable) + { + $this->start($name); + $returnValue = call_user_func($callable); + $this->stop($name); + + return $returnValue; + } } diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index fdd09829d9ff..f3ca047bf4b9 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -121,4 +121,99 @@ public function testReturnsNullGettingElapsedTimeOfNonTimer() $this->assertNull($timer->getElapsedTime('test1')); } + + /** + * @timeLimit 1.5 + */ + public function testRecordFunctionNoReturn() + { + $timer = new Timer(); + $returnValue = $timer->record('longjohn', function() { sleep(1); }); + + $this->assertGreaterThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); + $this->assertNull($returnValue); + } + + /** + * @timeLimit 1.5 + */ + public function testRecordFunctionWithReturn() + { + $timer = new Timer(); + $returnValue = $timer->record('longjohn', function() { sleep(1); return 'test'; }); + + $this->assertGreaterThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); + $this->assertSame('test', $returnValue); + } + + public function testRecordArrowFunction() + { + $timer = new Timer(); + $returnValue = $timer->record('longjohn', fn() => strlen('CI4') ); + + $this->assertLessThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); + $this->assertSame(3, $returnValue); + } + + public function testRecordThrowsException() + { + $this->expectException('RuntimeException'); + + $timer = new Timer(); + $timer->record('ex', function() { throw new RuntimeException(); }); + } + + public function testRecordThrowsErrorOnCallableWithParams() + { + $this->expectException('Error'); + + $timer = new Timer(); + $timer->record('error', 'strlen'); + } + + public function testCommonNoNameExpectTimer() + { + $returnValue = timer(); + + $this->assertInstanceOf(Timer::class, $returnValue); + } + + public function testCommonWithNameExpectTimer() + { + $returnValue = timer('test'); + + $this->assertInstanceOf(Timer::class, $returnValue); + $this->assertTrue($returnValue->has('test')); + } + + public function testCommonNoNameCallableExpectTimer() + { + $returnValue = timer(null, fn() => strlen('CI4') ); + + $this->assertInstanceOf(Timer::class, $returnValue); + } + + /** + * @timeLimit 1.5 + */ + public function testCommonCallableExpectNoReturn() + { + $returnValue = timer('common', function() { sleep(1); } ); + + $this->assertNotInstanceOf(Timer::class, $returnValue); + $this->assertNull($returnValue); + $this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('common')); + } + + /** + * @timeLimit 1.5 + */ + public function testCommonCallableExpectWithReturn() + { + $returnValue = timer('common', function() { sleep(1); return strlen('CI4'); } ); + + $this->assertNotInstanceOf(Timer::class, $returnValue); + $this->assertSame(3, $returnValue); + $this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('common')); + } } From ba1cc5cdf0ce507d99a34f06b2159fe83d414973 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 19:16:56 +0200 Subject: [PATCH 0948/8282] Code fixes --- system/Common.php | 2 +- tests/system/Debug/TimerTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Common.php b/system/Common.php index 6880a570664b..8af9122e846f 100644 --- a/system/Common.php +++ b/system/Common.php @@ -1083,7 +1083,7 @@ function stringify_attributes($attributes, bool $js = false): string * * @return mixed|Timer */ - function timer(?string $name = null, ?callable $callable) + function timer(?string $name = null, ?callable $callable = null) { $timer = Services::timer(); diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index f3ca047bf4b9..402348797a6c 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -160,7 +160,7 @@ public function testRecordThrowsException() $this->expectException('RuntimeException'); $timer = new Timer(); - $timer->record('ex', function() { throw new RuntimeException(); }); + $timer->record('ex', function() { throw new \RuntimeException(); }); } public function testRecordThrowsErrorOnCallableWithParams() From 22194d0620ec05c4d599fd79420a8d102fa3ea45 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 19:19:01 +0200 Subject: [PATCH 0949/8282] Changelogs and user guide --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + user_guide_src/source/testing/benchmark.rst | 14 ++++++++++++++ user_guide_src/source/testing/benchmark/010.php | 11 +++++++++++ user_guide_src/source/testing/benchmark/011.php | 13 +++++++++++++ user_guide_src/source/testing/benchmark/012.php | 13 +++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 user_guide_src/source/testing/benchmark/010.php create mode 100644 user_guide_src/source/testing/benchmark/011.php create mode 100644 user_guide_src/source/testing/benchmark/012.php diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 9c62bb05c150..2f250c389f38 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -41,6 +41,7 @@ Enhancements - SQLite ``BaseConnection::getIndexData()`` now can return pseudo index named ``PRIMARY`` for `AUTOINCREMENT` column, and each returned index data has ``type`` property. - Added ``spark filter:check`` command to check the filters for a route. See :ref:`Controller Filters ` for the details. - Now **Encryption** can decrypt data encrypted with CI3's Encryption. See :ref:`encryption-compatible-with-ci3`. +- Added method ``Timer::record`` to measure performance in a callable. Also enhanced common function ``timer()`` to accept optional callable. Changes ******* diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst index fb92eb19dfec..072021a2afb3 100644 --- a/user_guide_src/source/testing/benchmark.rst +++ b/user_guide_src/source/testing/benchmark.rst @@ -38,6 +38,20 @@ and stop timers: .. literalinclude:: benchmark/003.php +If you use very small code blocks to benchmark, you can also use the ``record()`` method. It accepts +a no-parameter callable and measures its execution time. Methods ``start()`` and ``stop()`` will be called +automatically around the function call. + +.. literalinclude:: benchmark/010.php + +You can also return the callable's return value for further processing. + +.. literalinclude:: benchmark/011.php + +The same functionality is also available when passing callable to ``timer()`` as second parameter. + +.. literalinclude:: benchmark/012.php + Viewing Your Benchmark Points ============================= diff --git a/user_guide_src/source/testing/benchmark/010.php b/user_guide_src/source/testing/benchmark/010.php new file mode 100644 index 000000000000..ae958b1c1471 --- /dev/null +++ b/user_guide_src/source/testing/benchmark/010.php @@ -0,0 +1,11 @@ +record('slow_function', function() { slow_function('...'); }); + +/* + * Same as: + * + * $benchmark->start('slow_function'); + * slow_function('...'); + * $benchmark->stop('slow_function'); +*/ \ No newline at end of file diff --git a/user_guide_src/source/testing/benchmark/011.php b/user_guide_src/source/testing/benchmark/011.php new file mode 100644 index 000000000000..5e09cd4d98b5 --- /dev/null +++ b/user_guide_src/source/testing/benchmark/011.php @@ -0,0 +1,13 @@ +record('string length', fn() => strlen('CI4') ); + +/* + * $length = 3 + * + * Same as: + * + * $benchmark->start('string length'); + * $length = strlen('CI4'); + * $benchmark->stop('string length'); +*/ \ No newline at end of file diff --git a/user_guide_src/source/testing/benchmark/012.php b/user_guide_src/source/testing/benchmark/012.php new file mode 100644 index 000000000000..b4b942ab3d6d --- /dev/null +++ b/user_guide_src/source/testing/benchmark/012.php @@ -0,0 +1,13 @@ + strlen('CI4') ); + +/* + * $length = 3 + * + * Same as: + * + * timer('string length'); + * $length = strlen('CI4'); + * timer('string length'); +*/ \ No newline at end of file From 3dbcc7fdc5a81953fc5655333f5c25b4c1f77126 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 19:27:06 +0200 Subject: [PATCH 0950/8282] CS-Fixer changes --- system/Common.php | 2 +- system/Debug/Timer.php | 10 +++++----- tests/system/Debug/TimerTest.php | 25 +++++++++++++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/system/Common.php b/system/Common.php index 8af9122e846f..2215da3f7679 100644 --- a/system/Common.php +++ b/system/Common.php @@ -1091,7 +1091,7 @@ function timer(?string $name = null, ?callable $callable = null) return $timer; } - if (! is_null($callable)) { + if (null !== $callable) { return $timer->record($name, $callable); } diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php index a576eb9586e4..1e34a708e98a 100644 --- a/system/Debug/Timer.php +++ b/system/Debug/Timer.php @@ -130,16 +130,16 @@ public function has(string $name): bool /** * Executes callable and measures its time. * Returns its return value if any. - * - * @param string $name The name of the timer - * @param callable $callable callable to be executed - * + * + * @param string $name The name of the timer + * @param callable $callable callable to be executed + * * @return mixed|null */ public function record(string $name, callable $callable) { $this->start($name); - $returnValue = call_user_func($callable); + $returnValue = $callable(); $this->stop($name); return $returnValue; diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index 402348797a6c..5e0ffbd5c7b2 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Debug; use CodeIgniter\Test\CIUnitTestCase; +use RuntimeException; /** * @internal @@ -127,8 +128,8 @@ public function testReturnsNullGettingElapsedTimeOfNonTimer() */ public function testRecordFunctionNoReturn() { - $timer = new Timer(); - $returnValue = $timer->record('longjohn', function() { sleep(1); }); + $timer = new Timer(); + $returnValue = $timer->record('longjohn', static function () { sleep(1); }); $this->assertGreaterThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); $this->assertNull($returnValue); @@ -139,8 +140,10 @@ public function testRecordFunctionNoReturn() */ public function testRecordFunctionWithReturn() { - $timer = new Timer(); - $returnValue = $timer->record('longjohn', function() { sleep(1); return 'test'; }); + $timer = new Timer(); + $returnValue = $timer->record('longjohn', static function () { sleep(1); + +return 'test'; }); $this->assertGreaterThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); $this->assertSame('test', $returnValue); @@ -148,8 +151,8 @@ public function testRecordFunctionWithReturn() public function testRecordArrowFunction() { - $timer = new Timer(); - $returnValue = $timer->record('longjohn', fn() => strlen('CI4') ); + $timer = new Timer(); + $returnValue = $timer->record('longjohn', static fn () => strlen('CI4')); $this->assertLessThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); $this->assertSame(3, $returnValue); @@ -160,7 +163,7 @@ public function testRecordThrowsException() $this->expectException('RuntimeException'); $timer = new Timer(); - $timer->record('ex', function() { throw new \RuntimeException(); }); + $timer->record('ex', static function () { throw new RuntimeException(); }); } public function testRecordThrowsErrorOnCallableWithParams() @@ -188,7 +191,7 @@ public function testCommonWithNameExpectTimer() public function testCommonNoNameCallableExpectTimer() { - $returnValue = timer(null, fn() => strlen('CI4') ); + $returnValue = timer(null, static fn () => strlen('CI4')); $this->assertInstanceOf(Timer::class, $returnValue); } @@ -198,7 +201,7 @@ public function testCommonNoNameCallableExpectTimer() */ public function testCommonCallableExpectNoReturn() { - $returnValue = timer('common', function() { sleep(1); } ); + $returnValue = timer('common', static function () { sleep(1); }); $this->assertNotInstanceOf(Timer::class, $returnValue); $this->assertNull($returnValue); @@ -210,7 +213,9 @@ public function testCommonCallableExpectNoReturn() */ public function testCommonCallableExpectWithReturn() { - $returnValue = timer('common', function() { sleep(1); return strlen('CI4'); } ); + $returnValue = timer('common', static function () { sleep(1); + +return strlen('CI4'); }); $this->assertNotInstanceOf(Timer::class, $returnValue); $this->assertSame(3, $returnValue); From 838995bd9ffc86b10c3d7f164b1632ec44dedfed Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 19:48:52 +0200 Subject: [PATCH 0951/8282] Fixed CS-Fixer style issues --- tests/system/Debug/TimerTest.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index 5e0ffbd5c7b2..62ed83b74fb3 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -141,9 +141,10 @@ public function testRecordFunctionNoReturn() public function testRecordFunctionWithReturn() { $timer = new Timer(); - $returnValue = $timer->record('longjohn', static function () { sleep(1); - -return 'test'; }); + $returnValue = $timer->record('longjohn', static function () { + sleep(1); + return 'test'; + }); $this->assertGreaterThanOrEqual(1.0, $timer->getElapsedTime('longjohn')); $this->assertSame('test', $returnValue); @@ -213,9 +214,10 @@ public function testCommonCallableExpectNoReturn() */ public function testCommonCallableExpectWithReturn() { - $returnValue = timer('common', static function () { sleep(1); - -return strlen('CI4'); }); + $returnValue = timer('common', static function () { + sleep(1); + return strlen('CI4'); + }); $this->assertNotInstanceOf(Timer::class, $returnValue); $this->assertSame(3, $returnValue); From a47411b01626dd9bbf6ade87fa6189dbfecceafe Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 20:21:23 +0200 Subject: [PATCH 0952/8282] Unit test fixes for v7, added more new lines --- tests/system/Debug/TimerTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index 62ed83b74fb3..d6a1cbe3b5e9 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -143,6 +143,7 @@ public function testRecordFunctionWithReturn() $timer = new Timer(); $returnValue = $timer->record('longjohn', static function () { sleep(1); + return 'test'; }); @@ -169,7 +170,7 @@ public function testRecordThrowsException() public function testRecordThrowsErrorOnCallableWithParams() { - $this->expectException('Error'); + $this->expectException('Throwable'); $timer = new Timer(); $timer->record('error', 'strlen'); @@ -216,6 +217,7 @@ public function testCommonCallableExpectWithReturn() { $returnValue = timer('common', static function () { sleep(1); + return strlen('CI4'); }); From 9603cea4f9c7909f1f41afdc192a95653340701e Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sun, 31 Jul 2022 21:21:32 +0200 Subject: [PATCH 0953/8282] Further CS-Fixer changes --- tests/system/Debug/TimerTest.php | 5 +++-- user_guide_src/source/testing/benchmark/010.php | 4 ++-- user_guide_src/source/testing/benchmark/011.php | 6 +++--- user_guide_src/source/testing/benchmark/012.php | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index d6a1cbe3b5e9..580432b0ee96 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -13,6 +13,7 @@ use CodeIgniter\Test\CIUnitTestCase; use RuntimeException; +use Throwable; /** * @internal @@ -162,7 +163,7 @@ public function testRecordArrowFunction() public function testRecordThrowsException() { - $this->expectException('RuntimeException'); + $this->expectException(RuntimeException::class); $timer = new Timer(); $timer->record('ex', static function () { throw new RuntimeException(); }); @@ -170,7 +171,7 @@ public function testRecordThrowsException() public function testRecordThrowsErrorOnCallableWithParams() { - $this->expectException('Throwable'); + $this->expectException(Throwable::class); $timer = new Timer(); $timer->record('error', 'strlen'); diff --git a/user_guide_src/source/testing/benchmark/010.php b/user_guide_src/source/testing/benchmark/010.php index ae958b1c1471..76a5405b7129 100644 --- a/user_guide_src/source/testing/benchmark/010.php +++ b/user_guide_src/source/testing/benchmark/010.php @@ -1,10 +1,10 @@ record('slow_function', function() { slow_function('...'); }); +$benchmark->record('slow_function', static function () { slow_function('...'); }); /* * Same as: - * + * * $benchmark->start('slow_function'); * slow_function('...'); * $benchmark->stop('slow_function'); diff --git a/user_guide_src/source/testing/benchmark/011.php b/user_guide_src/source/testing/benchmark/011.php index 5e09cd4d98b5..bc12efafa3a4 100644 --- a/user_guide_src/source/testing/benchmark/011.php +++ b/user_guide_src/source/testing/benchmark/011.php @@ -1,12 +1,12 @@ record('string length', fn() => strlen('CI4') ); +$length = $benchmark->record('string length', static fn () => strlen('CI4')); /* * $length = 3 - * + * * Same as: - * + * * $benchmark->start('string length'); * $length = strlen('CI4'); * $benchmark->stop('string length'); diff --git a/user_guide_src/source/testing/benchmark/012.php b/user_guide_src/source/testing/benchmark/012.php index b4b942ab3d6d..2a964324df88 100644 --- a/user_guide_src/source/testing/benchmark/012.php +++ b/user_guide_src/source/testing/benchmark/012.php @@ -1,12 +1,12 @@ strlen('CI4') ); +$length = timer('string length', static fn () => strlen('CI4')); /* * $length = 3 - * + * * Same as: - * + * * timer('string length'); * $length = strlen('CI4'); * timer('string length'); From 95524d815bb00ef9595fab2f918799389b7eae05 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:04:02 +0900 Subject: [PATCH 0954/8282] fix: OCI8 uses deprecated Entity --- system/Database/OCI8/Result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php index 72a1b0980a28..1342378733d6 100644 --- a/system/Database/OCI8/Result.php +++ b/system/Database/OCI8/Result.php @@ -13,7 +13,7 @@ use CodeIgniter\Database\BaseResult; use CodeIgniter\Database\ResultInterface; -use CodeIgniter\Entity; +use CodeIgniter\Entity\Entity; /** * Result for OCI8 From d3562d1c8300520292856b54aaa9d298a947947f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 31 Jul 2022 07:55:14 +0900 Subject: [PATCH 0955/8282] docs: remove git intatllation It is not recommended. --- user_guide_src/source/installation/index.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst index b271d296d9fc..5c2503dc773b 100644 --- a/user_guide_src/source/installation/index.rst +++ b/user_guide_src/source/installation/index.rst @@ -2,9 +2,8 @@ Installation ############ -CodeIgniter4 can be installed in a number of different ways: manually, -using `Composer `_, or using -`Git `_. +CodeIgniter has two supported installation methods: manual download, +using `Composer `_. Which is right for you? - We recommend the Composer installation because it keeps CodeIgniter up to date easily. From ed4b80d20977890e55b6802a9f005e407bb0958e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:51:22 +0900 Subject: [PATCH 0956/8282] docs: fix description There are two techniques to describe. --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 5d550039b94e..1c9071df68c5 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -7,9 +7,9 @@ Composer Installation Composer can be used in several ways to install CodeIgniter4 on your system. -The first two techniques describe creating a skeleton project +The first technique describes creating a skeleton project using CodeIgniter4, that you would then use as the base for a new webapp. -The third technique described below lets you add CodeIgniter4 to an existing +The second technique described below lets you add CodeIgniter4 to an existing webapp, .. note:: If you are using a Git repository to store your code, or for From d9dfeb7875b013a66d12e2be26553967a2686ca5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:53:19 +0900 Subject: [PATCH 0957/8282] docs: fix section titles --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- user_guide_src/source/installation/running.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 1c9071df68c5..9e08cc3cc697 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -27,8 +27,8 @@ the latest released version of the framework. This installation technique would suit a developer who wishes to start a new CodeIgniter4 based project. -Installation & Set Up ---------------------- +Installation +------------ In the folder above your project root:: diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index bb96d98f488d..373e529bd656 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -12,8 +12,8 @@ This section addresses how to use each technique, and explains some of the pros If you're new to CodeIgniter, please read the :doc:`Getting Started ` section of the User Guide to begin learning how to build dynamic PHP applications. Enjoy! -Initial Configuration & Set Up -============================== +Initial Configuration +===================== #. Open the **app/Config/App.php** file with a text editor and set your base URL. If you need more flexibility, the baseURL may From c746b49ce46b93f03d0374683706931fd7e4c7f2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:54:09 +0900 Subject: [PATCH 0958/8282] docs: fix title underlines --- .../source/installation/installing_manual.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst index f2ffac576dcf..8deb9b1055da 100644 --- a/user_guide_src/source/installation/installing_manual.rst +++ b/user_guide_src/source/installation/installing_manual.rst @@ -27,31 +27,31 @@ and extract it to become your project root. So if you install CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter won't work. Setting Up ----------- +===================== None .. _installing-manual-upgrading: Upgrading ---------- +========= Download a new copy of the framework, and then replace the ``system`` folder. Read the :doc:`upgrade instructions `, and check Breaking Changes and Enhancements. Pros ----- +==== Download and run Cons ----- +==== You are responsible for merge conflicts when updating Structure ---------- +========= Folders in your project after set up: app, public, system, writable From b8c3ff063fc09f663db4bb3a3ee0181429241ca4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:54:52 +0900 Subject: [PATCH 0959/8282] docs: add initial configuration It is required. --- .../source/installation/installing_composer.rst | 12 +++++++++++- .../source/installation/installing_manual.rst | 5 +++-- user_guide_src/source/installation/running.rst | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 9e08cc3cc697..04184e62f497 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -52,7 +52,11 @@ A sample such installation command, using the default project-root "appstarter": > composer create-project codeigniter4/appstarter --no-dev -After installation you should follow the steps in the "Upgrading" section. +Initial Configuration +--------------------- + +After installation, a few initial configuration is required. +See :ref:`initial-configuration` for the detail. .. _app-starter-upgrading: @@ -148,6 +152,12 @@ Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from You will have to adjust the system path to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``, - the ``$systemDirectory`` variable in **app/Config/Paths.php** +Initial Configuration +--------------------- + +A few initial configuration is required. +See :ref:`initial-configuration` for the detail. + .. _adding-codeigniter4-upgrading: Upgrading diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst index 8deb9b1055da..a8796f778736 100644 --- a/user_guide_src/source/installation/installing_manual.rst +++ b/user_guide_src/source/installation/installing_manual.rst @@ -26,10 +26,11 @@ and extract it to become your project root. The symbols that can be used are ``/``, ``_``, ``.``, ``:``, ``\`` and space. So if you install CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter won't work. -Setting Up +Initial Configuration ===================== -None +After installation, a few initial configuration is required. +See :ref:`initial-configuration` for the detail. .. _installing-manual-upgrading: diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 373e529bd656..222e79870855 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -12,6 +12,8 @@ This section addresses how to use each technique, and explains some of the pros If you're new to CodeIgniter, please read the :doc:`Getting Started ` section of the User Guide to begin learning how to build dynamic PHP applications. Enjoy! +.. _initial-configuration: + Initial Configuration ===================== From 5417518c3f25cb654808b5ce8d25a42d98fe3428 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:56:02 +0900 Subject: [PATCH 0960/8282] docs: add section title --- user_guide_src/source/installation/installing_composer.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 04184e62f497..18ec82c1407a 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -130,6 +130,9 @@ The same `CodeIgniter 4 framework `_ repository described in "Manual Installation" can also be added to an existing project using Composer. +Installation +------------ + Develop your app inside the ``app`` folder, and the ``public`` folder will be your document root. From 22a9ac7fbbb7346fdc524550516c39c62c17a75e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:56:23 +0900 Subject: [PATCH 0961/8282] docs: change section title --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 18ec82c1407a..b1aa485cb541 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -143,8 +143,8 @@ In your project root:: As with the earlier two composer install methods, you can omit installing phpunit and its dependencies by adding the ``--no-dev`` argument to the ``composer require`` command. -Set Up ------- +Setting Up +---------- Copy the ``app``, ``public``, and ``writable`` folders from ``vendor/codeigniter4/framework`` to your project root From 0ef2bec2d8cd57a87280461243dd6ce6ef9f5ca1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:56:45 +0900 Subject: [PATCH 0962/8282] docs: change note position --- user_guide_src/source/installation/running.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 222e79870855..64ef5ec425b1 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -28,10 +28,10 @@ Initial Configuration in **.env** file to take advantage of the debugging tools provided. See :ref:`setting-development-mode` for the detail. -.. important:: In production environments, you should disable error display and - any other development-only functionality. In CodeIgniter, this can be done - by setting the environment to "production". By default, the application will - run using the "production" environment. See also :ref:`environment-constant`. + .. important:: In production environments, you should disable error display and + any other development-only functionality. In CodeIgniter, this can be done + by setting the environment to "production". By default, the application will + run using the "production" environment. See also :ref:`environment-constant`. .. note:: If you will be running your site using a web server (e.g., Apache or Nginx), you will need to modify the permissions for the ``writable`` folder inside From 71da80840408c05e259ec66b7d3160fac26e604f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:57:08 +0900 Subject: [PATCH 0963/8282] docs: add property name --- user_guide_src/source/installation/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 64ef5ec425b1..ff7bf28abbe5 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -18,7 +18,7 @@ Initial Configuration ===================== #. Open the **app/Config/App.php** file with a text editor and - set your base URL. If you need more flexibility, the baseURL may + set your base URL to ``$baseURL``. If you need more flexibility, the baseURL may be set within the **.env** file as ``app.baseURL = 'http://example.com/'``. (Always use a trailing slash on your base URL!) #. If you intend to use a database, open the From 1d641a5f73538c8bc2a1176119e7a48d4380fa24 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 10:57:23 +0900 Subject: [PATCH 0964/8282] docs: add note about baseURL and debug toolbar --- user_guide_src/source/installation/running.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index ff7bf28abbe5..4f24edd76950 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -21,6 +21,11 @@ Initial Configuration set your base URL to ``$baseURL``. If you need more flexibility, the baseURL may be set within the **.env** file as ``app.baseURL = 'http://example.com/'``. (Always use a trailing slash on your base URL!) + + .. note:: If you don't set the ``baseURL`` correctly, in development mode, + the debug toolbar may not load properly and web pages may take considerably + longer to display. + #. If you intend to use a database, open the **app/Config/Database.php** file with a text editor and set your database settings. Alternately, these could be set in your **.env** file. From ab52365fde07bd61a1afb29fcc88f0bcd6756c47 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Jul 2022 10:36:53 +0900 Subject: [PATCH 0965/8282] feat: spark routes shows route name --- system/Commands/Utilities/Routes.php | 10 ++++- .../Utilities/Routes/AutoRouteCollector.php | 1 + .../AutoRouterImproved/AutoRouteCollector.php | 1 + tests/system/Commands/RoutesTest.php | 45 +++++++++++++++++-- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index 8f8b5188e570..bf91729cb273 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -101,10 +101,17 @@ public function run(array $params) $sampleUri = $uriGenerator->get($route); $filters = $filterCollector->get($method, $sampleUri); + if ($handler instanceof Closure) { + $handler = '(Closure)'; + } + + $routeName = $collection->getRoutesOptions($route)['as'] ?? '»'; + $tbody[] = [ strtoupper($method), $route, - is_string($handler) ? $handler : '(Closure)', + $routeName, + $handler, implode(' ', array_map('class_basename', $filters['before'])), implode(' ', array_map('class_basename', $filters['after'])), ]; @@ -149,6 +156,7 @@ public function run(array $params) $thead = [ 'Method', 'Route', + 'Name', 'Handler', 'Before Filters', 'After Filters', diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php index 30c8eecfee9d..a2fa46c497e9 100644 --- a/system/Commands/Utilities/Routes/AutoRouteCollector.php +++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php @@ -56,6 +56,7 @@ public function get(): array $tbody[] = [ 'auto', $item['route'], + '', $item['handler'], ]; } diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php index e7597014f899..f2de8e4b4a6d 100644 --- a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php +++ b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php @@ -85,6 +85,7 @@ public function get(): array $tbody[] = [ strtoupper($item['method']) . '(auto)', $item['route'] . $item['route_params'], + '', $item['handler'], $item['before'], $item['after'], diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index c761a1eb2eb0..f38957e1eadf 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -39,6 +39,11 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } + private function getBufferWithoutSpaces(): string + { + return str_replace(' ', '', $this->getBuffer()); + } + public function testRoutesCommand() { command('routes'); @@ -49,7 +54,7 @@ public function testRoutesCommand() $this->assertStringContainsString('\\TestController::index', $this->getBuffer()); } - public function testRoutesCommandRouteFilterAndAutoRoute() + public function testRoutesCommandRouteFilterAndAutoRouteLegacy() { $routes = Services::routes(); $routes->setDefaultNamespace('App\Controllers'); @@ -60,8 +65,42 @@ public function testRoutesCommandRouteFilterAndAutoRoute() command('routes'); $this->assertStringContainsString( - '|auto|/|\App\Controllers\Home::index||toolbar|', - str_replace(' ', '', $this->getBuffer()) + '|auto|/||\App\Controllers\Home::index||toolbar|', + $this->getBufferWithoutSpaces() + ); + } + + public function testRoutesCommandRouteFilterAndAutoRouteImproved() + { + $routes = Services::routes(); + $routes->resetRoutes(); + $routes->loadRoutes(); + $routes->setAutoRoute(true); + config('Feature')->autoRoutesImproved = true; + $namespace = 'Tests\Support\Controllers'; + $routes->setDefaultNamespace($namespace); + + command('routes'); + + $this->assertStringContainsString( + '|GET|/|»|\App\Controllers\Home::index||toolbar|', + $this->getBufferWithoutSpaces() + ); + $this->assertStringContainsString( + '|GET|closure|»|(Closure)||toolbar|', + $this->getBufferWithoutSpaces() + ); + $this->assertStringContainsString( + '|GET|testing|testing-index|\App\Controllers\TestController::index||toolbar|', + $this->getBufferWithoutSpaces() + ); + $this->assertStringContainsString( + '|GET(auto)|newautorouting||\Tests\Support\Controllers\Newautorouting::getIndex||toolbar|', + $this->getBufferWithoutSpaces() + ); + $this->assertStringContainsString( + '|POST(auto)|newautorouting/save/../..[/..]||\Tests\Support\Controllers\Newautorouting::postSave||toolbar|', + $this->getBufferWithoutSpaces() ); } } From c978338cae8a50b64ce9c5c675a02cd862e19b81 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:12:07 +0900 Subject: [PATCH 0966/8282] test: improve tests --- tests/system/Commands/RoutesTest.php | 135 +++++++++++++++++++-------- 1 file changed, 94 insertions(+), 41 deletions(-) diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index f38957e1eadf..e262e5ca7c69 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Commands; +use CodeIgniter\Router\RouteCollection; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Services; @@ -39,68 +40,120 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - private function getBufferWithoutSpaces(): string + private function getCleanRoutes(): RouteCollection { - return str_replace(' ', '', $this->getBuffer()); + $routes = Services::routes(); + $routes->resetRoutes(); + $routes->loadRoutes(); + + return $routes; } public function testRoutesCommand() { + $this->getCleanRoutes(); + command('routes'); - $this->assertStringContainsString('| (Closure)', $this->getBuffer()); - $this->assertStringContainsString('| Route', $this->getBuffer()); - $this->assertStringContainsString('| testing', $this->getBuffer()); - $this->assertStringContainsString('\\TestController::index', $this->getBuffer()); + $expected = <<<'EOL' + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Home::index | | toolbar | + | GET | closure | » | (Closure) | | toolbar | + | GET | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | HEAD | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | POST | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | PUT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | DELETE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | OPTIONS | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CLI | testing | testing-index | \App\Controllers\TestController::index | | | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + EOL; + $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testRoutesCommandRouteFilterAndAutoRouteLegacy() + public function testRoutesCommandAutoRouteImproved() { - $routes = Services::routes(); - $routes->setDefaultNamespace('App\Controllers'); - $routes->resetRoutes(); - $routes->get('/', 'Home::index', ['filter' => 'csrf']); + $routes = $this->getCleanRoutes(); + $routes->setAutoRoute(true); + config('Feature')->autoRoutesImproved = true; + $namespace = 'Tests\Support\Controllers'; + $routes->setDefaultNamespace($namespace); command('routes'); - $this->assertStringContainsString( - '|auto|/||\App\Controllers\Home::index||toolbar|', - $this->getBufferWithoutSpaces() - ); + $expected = <<<'EOL' + +------------+--------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +------------+--------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Home::index | | toolbar | + | GET | closure | » | (Closure) | | toolbar | + | GET | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | HEAD | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | POST | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | PUT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | DELETE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | OPTIONS | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CLI | testing | testing-index | \App\Controllers\TestController::index | | | + | GET(auto) | newautorouting | | \Tests\Support\Controllers\Newautorouting::getIndex | | toolbar | + | POST(auto) | newautorouting/save/../..[/..] | | \Tests\Support\Controllers\Newautorouting::postSave | | toolbar | + +------------+--------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + EOL; + $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testRoutesCommandRouteFilterAndAutoRouteImproved() + public function testRoutesCommandRouteLegacy() { - $routes = Services::routes(); - $routes->resetRoutes(); - $routes->loadRoutes(); + $routes = $this->getCleanRoutes(); + $routes->setAutoRoute(true); - config('Feature')->autoRoutesImproved = true; - $namespace = 'Tests\Support\Controllers'; + $namespace = 'Tests\Support\Controllers'; $routes->setDefaultNamespace($namespace); command('routes'); - $this->assertStringContainsString( - '|GET|/|»|\App\Controllers\Home::index||toolbar|', - $this->getBufferWithoutSpaces() - ); - $this->assertStringContainsString( - '|GET|closure|»|(Closure)||toolbar|', - $this->getBufferWithoutSpaces() - ); - $this->assertStringContainsString( - '|GET|testing|testing-index|\App\Controllers\TestController::index||toolbar|', - $this->getBufferWithoutSpaces() - ); - $this->assertStringContainsString( - '|GET(auto)|newautorouting||\Tests\Support\Controllers\Newautorouting::getIndex||toolbar|', - $this->getBufferWithoutSpaces() - ); - $this->assertStringContainsString( - '|POST(auto)|newautorouting/save/../..[/..]||\Tests\Support\Controllers\Newautorouting::postSave||toolbar|', - $this->getBufferWithoutSpaces() - ); + $expected = <<<'EOL' + +---------+-------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+-------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Home::index | | toolbar | + | GET | closure | » | (Closure) | | toolbar | + | GET | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | HEAD | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | POST | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | PUT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | DELETE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | OPTIONS | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CLI | testing | testing-index | \App\Controllers\TestController::index | | | + | auto | hello | | \Tests\Support\Controllers\Hello::index | | toolbar | + | auto | hello/index[/...] | | \Tests\Support\Controllers\Hello::index | | toolbar | + | auto | newautorouting/getIndex[/...] | | \Tests\Support\Controllers\Newautorouting::getIndex | | toolbar | + | auto | newautorouting/postSave[/...] | | \Tests\Support\Controllers\Newautorouting::postSave | | toolbar | + | auto | popcorn | | \Tests\Support\Controllers\Popcorn::index | | toolbar | + | auto | popcorn/index[/...] | | \Tests\Support\Controllers\Popcorn::index | | toolbar | + | auto | popcorn/pop[/...] | | \Tests\Support\Controllers\Popcorn::pop | | toolbar | + | auto | popcorn/popper[/...] | | \Tests\Support\Controllers\Popcorn::popper | | toolbar | + | auto | popcorn/weasel[/...] | | \Tests\Support\Controllers\Popcorn::weasel | | toolbar | + | auto | popcorn/oops[/...] | | \Tests\Support\Controllers\Popcorn::oops | | toolbar | + | auto | popcorn/goaway[/...] | | \Tests\Support\Controllers\Popcorn::goaway | | toolbar | + | auto | popcorn/index3[/...] | | \Tests\Support\Controllers\Popcorn::index3 | | toolbar | + | auto | popcorn/canyon[/...] | | \Tests\Support\Controllers\Popcorn::canyon | | toolbar | + | auto | popcorn/cat[/...] | | \Tests\Support\Controllers\Popcorn::cat | | toolbar | + | auto | popcorn/json[/...] | | \Tests\Support\Controllers\Popcorn::json | | toolbar | + | auto | popcorn/xml[/...] | | \Tests\Support\Controllers\Popcorn::xml | | toolbar | + | auto | popcorn/toindex[/...] | | \Tests\Support\Controllers\Popcorn::toindex | | toolbar | + | auto | popcorn/echoJson[/...] | | \Tests\Support\Controllers\Popcorn::echoJson | | toolbar | + | auto | remap[/...] | | \Tests\Support\Controllers\Remap::_remap | | toolbar | + +---------+-------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ + EOL; + $this->assertStringContainsString($expected, $this->getBuffer()); } } From 30e2bd45e7fc7ef2e4dae1b634f31d308e48c49c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:30:45 +0900 Subject: [PATCH 0967/8282] docs: update spark routes --- user_guide_src/source/incoming/routing.rst | 57 +++++++++++++--------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 03d6ee8625cc..f7d431f207dd 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -711,7 +711,7 @@ In this example, if the user were to visit **example.com/products**, and a ``Pro Confirming Routes ***************** -CodeIgniter has the following :doc:`command ` to display all routes. +CodeIgniter has the following :doc:`command ` to display all routes. .. _routing-spark-routes: @@ -726,34 +726,47 @@ The output is like the following: .. code-block:: none - +--------+------------------+------------------------------------------+----------------+-----------------------+ - | Method | Route | Handler | Before Filters | After Filters | - +--------+------------------+------------------------------------------+----------------+-----------------------+ - | GET | / | \App\Controllers\Home::index | invalidchars | secureheaders toolbar | - | GET | feed | (Closure) | invalidchars | secureheaders toolbar | - | auto | / | \App\Controllers\Home::index | invalidchars | secureheaders toolbar | - | auto | home | \App\Controllers\Home::index | invalidchars | secureheaders toolbar | - | auto | home/index[/...] | \App\Controllers\Home::index | invalidchars | secureheaders toolbar | - +--------+------------------+------------------------------------------+----------------+-----------------------+ + +---------+---------+---------------+-------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+---------+---------------+-------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Home::index | | toolbar | + | GET | feed | » | (Closure) | | toolbar | + +---------+---------+---------------+-------------------------------+----------------+---------------+ -The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by Auto Routing (Legacy), so it is not defined in **app/Config/Routes.php**. +The *Method* column shows the HTTP method that the route is listening for. -The *Route* column shows the URI path to match. The route of a defined route is expressed as a regular expression. -But ``[/...]`` in the route of an auto route is indicates any number of segments. +The *Route* column shows the route (URI path) to match. The route of a defined route is expressed as a regular expression. + +The *Name* column shows the route name. ``»`` indicates the name is the same as the route. + +.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. If you want to check filters for a route, you can use :ref:`spark filter:check ` command. When you use Auto Routing (Improved), the output is like the following: .. code-block:: none - +-----------+-------------------------+------------------------------------------+----------------+---------------+ - | Method | Route | Handler | Before Filters | After Filters | - +-----------+-------------------------+------------------------------------------+----------------+---------------+ - | GET(auto) | product/list/../..[/..] | \App\Controllers\Product::getList | | toolbar | - +-----------+-------------------------+------------------------------------------+----------------+---------------+ + +-----------+-------------------------+---------------+-----------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +-----------+-------------------------+---------------+-----------------------------------+----------------+---------------+ + | GET(auto) | product/list/../..[/..] | | \App\Controllers\Product::getList | | toolbar | + +-----------+-------------------------+---------------+-----------------------------------+----------------+---------------+ -The *Method* will be like ``GET(auto)``. ``/..`` in the *Route* column indicates one segment. -``[/..]`` indicates it is optional. +The *Method* will be like ``GET(auto)``. -.. note:: When auto-routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``. +``/..`` in the *Route* column indicates one segment. ``[/..]`` indicates it is optional. -.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. If you want to check filters for a route, you can use :ref:`spark filter:check ` command. +When you use Auto Routing (Legacy), the output is like the following: + +.. code-block:: none + + +--------+--------------------+---------------+-----------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +--------+--------------------+---------------+-----------------------------------+----------------+---------------+ + | auto | product/list[/...] | | \App\Controllers\Product::getList | | toolbar | + +--------+--------------------+---------------+-----------------------------------+----------------+---------------+ + +The *Method* will be ``auto``. + +``[/...]`` in the *Route* column indicates any number of segments. + +.. note:: When auto-routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``. From 49e1b6dd3a1920b8728451a79b8b7e30785ebef2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:31:28 +0900 Subject: [PATCH 0968/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 959f9baaf5f0..3a429f6bc36b 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -42,6 +42,7 @@ Enhancements - SQLite ``BaseConnection::getIndexData()`` now can return pseudo index named ``PRIMARY`` for `AUTOINCREMENT` column, and each returned index data has ``type`` property. - Added ``spark filter:check`` command to check the filters for a route. See :ref:`Controller Filters ` for the details. - Now **Encryption** can decrypt data encrypted with CI3's Encryption. See :ref:`encryption-compatible-with-ci3`. +- Now ``spark routes`` command shows route names. See :ref:`URI Routing `. Changes ******* From 655baeea2438bf79a9bc9b7a63f19635665e3c5f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:36:25 +0900 Subject: [PATCH 0969/8282] test: remove unnecessary array keys --- .../Routes/AutoRouteCollectorTest.php | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 12e82eef93af..54ec9831e30a 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -31,97 +31,97 @@ public function testGet() $expected = [ [ - 0 => 'auto', - 1 => 'hello', - 2 => '\\Tests\\Support\\Controllers\\Hello::index', + 'auto', + 'hello', + '\\Tests\\Support\\Controllers\\Hello::index', ], [ - 0 => 'auto', - 1 => 'hello/index[/...]', - 2 => '\\Tests\\Support\\Controllers\\Hello::index', + 'auto', + 'hello/index[/...]', + '\\Tests\\Support\\Controllers\\Hello::index', ], [ - 0 => 'auto', - 1 => 'newautorouting/getIndex[/...]', - 2 => '\Tests\Support\Controllers\Newautorouting::getIndex', + 'auto', + 'newautorouting/getIndex[/...]', + '\Tests\Support\Controllers\Newautorouting::getIndex', ], [ - 0 => 'auto', - 1 => 'newautorouting/postSave[/...]', - 2 => '\Tests\Support\Controllers\Newautorouting::postSave', + 'auto', + 'newautorouting/postSave[/...]', + '\Tests\Support\Controllers\Newautorouting::postSave', ], [ - 0 => 'auto', - 1 => 'popcorn', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::index', + 'auto', + 'popcorn', + '\\Tests\\Support\\Controllers\\Popcorn::index', ], [ - 0 => 'auto', - 1 => 'popcorn/index[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::index', + 'auto', + 'popcorn/index[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::index', ], [ - 0 => 'auto', - 1 => 'popcorn/pop[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::pop', + 'auto', + 'popcorn/pop[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::pop', ], [ - 0 => 'auto', - 1 => 'popcorn/popper[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::popper', + 'auto', + 'popcorn/popper[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::popper', ], [ - 0 => 'auto', - 1 => 'popcorn/weasel[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::weasel', + 'auto', + 'popcorn/weasel[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::weasel', ], [ - 0 => 'auto', - 1 => 'popcorn/oops[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::oops', + 'auto', + 'popcorn/oops[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::oops', ], [ - 0 => 'auto', - 1 => 'popcorn/goaway[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::goaway', + 'auto', + 'popcorn/goaway[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::goaway', ], [ - 0 => 'auto', - 1 => 'popcorn/index3[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::index3', + 'auto', + 'popcorn/index3[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::index3', ], [ - 0 => 'auto', - 1 => 'popcorn/canyon[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::canyon', + 'auto', + 'popcorn/canyon[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::canyon', ], [ - 0 => 'auto', - 1 => 'popcorn/cat[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::cat', + 'auto', + 'popcorn/cat[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::cat', ], [ - 0 => 'auto', - 1 => 'popcorn/json[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::json', + 'auto', + 'popcorn/json[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::json', ], [ - 0 => 'auto', - 1 => 'popcorn/xml[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::xml', + 'auto', + 'popcorn/xml[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::xml', ], [ - 0 => 'auto', - 1 => 'popcorn/toindex[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::toindex', + 'auto', + 'popcorn/toindex[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::toindex', ], [ - 0 => 'auto', - 1 => 'popcorn/echoJson[/...]', - 2 => '\\Tests\\Support\\Controllers\\Popcorn::echoJson', + 'auto', + 'popcorn/echoJson[/...]', + '\\Tests\\Support\\Controllers\\Popcorn::echoJson', ], [ - 0 => 'auto', - 1 => 'remap[/...]', - 2 => '\\Tests\\Support\\Controllers\\Remap::_remap', + 'auto', + 'remap[/...]', + '\\Tests\\Support\\Controllers\\Remap::_remap', ], ]; $this->assertSame($expected, $routes); From 545f4970099f4fe6aafb9c847dca4eabdf215bfb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:39:45 +0900 Subject: [PATCH 0970/8282] test: update test expectations --- .../Routes/AutoRouteCollectorTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 54ec9831e30a..8f1f2185d047 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -33,94 +33,113 @@ public function testGet() [ 'auto', 'hello', + '', '\\Tests\\Support\\Controllers\\Hello::index', ], [ 'auto', 'hello/index[/...]', + '', '\\Tests\\Support\\Controllers\\Hello::index', ], [ 'auto', 'newautorouting/getIndex[/...]', + '', '\Tests\Support\Controllers\Newautorouting::getIndex', ], [ 'auto', 'newautorouting/postSave[/...]', + '', '\Tests\Support\Controllers\Newautorouting::postSave', ], [ 'auto', 'popcorn', + '', '\\Tests\\Support\\Controllers\\Popcorn::index', ], [ 'auto', 'popcorn/index[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::index', ], [ 'auto', 'popcorn/pop[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::pop', ], [ 'auto', 'popcorn/popper[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::popper', ], [ 'auto', 'popcorn/weasel[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::weasel', ], [ 'auto', 'popcorn/oops[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::oops', ], [ 'auto', 'popcorn/goaway[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::goaway', ], [ 'auto', 'popcorn/index3[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::index3', ], [ 'auto', 'popcorn/canyon[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::canyon', ], [ 'auto', 'popcorn/cat[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::cat', ], [ 'auto', 'popcorn/json[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::json', ], [ 'auto', 'popcorn/xml[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::xml', ], [ 'auto', 'popcorn/toindex[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::toindex', ], [ 'auto', 'popcorn/echoJson[/...]', + '', '\\Tests\\Support\\Controllers\\Popcorn::echoJson', ], [ 'auto', 'remap[/...]', + '', '\\Tests\\Support\\Controllers\\Remap::_remap', ], ]; From c2b490dc60749bcc882129e9897b760714d0e39b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:40:11 +0900 Subject: [PATCH 0971/8282] style: break lines --- .../Commands/Utilities/Routes/AutoRouteCollectorTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 8f1f2185d047..7733fb6f6cf3 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -89,12 +89,14 @@ public function testGet() 'popcorn/oops[/...]', '', '\\Tests\\Support\\Controllers\\Popcorn::oops', - ], [ + ], + [ 'auto', 'popcorn/goaway[/...]', '', '\\Tests\\Support\\Controllers\\Popcorn::goaway', - ], [ + ], + [ 'auto', 'popcorn/index3[/...]', '', From 48953df9f4b4dce99694c830595d5bb2d16f2ccb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:42:29 +0900 Subject: [PATCH 0972/8282] test: remove unnecessary array keys --- .../AutoRouteCollectorTest.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index 0f368925d57f..8e47466bf56e 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -59,18 +59,18 @@ public function testGetFilterMatches() $expected = [ 0 => [ - 0 => 'GET(auto)', - 1 => 'newautorouting', - 2 => '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', - 3 => '', - 4 => 'toolbar', + 'GET(auto)', + 'newautorouting', + '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', + '', + 'toolbar', ], 1 => [ - 0 => 'POST(auto)', - 1 => 'newautorouting/save/../..[/..]', - 2 => '\\Tests\\Support\\Controllers\\Newautorouting::postSave', - 3 => 'honeypot', - 4 => 'toolbar', + 'POST(auto)', + 'newautorouting/save/../..[/..]', + '\\Tests\\Support\\Controllers\\Newautorouting::postSave', + 'honeypot', + 'toolbar', ], ]; $this->assertSame($expected, $routes); @@ -85,18 +85,18 @@ public function testGetFilterDoesNotMatch() $expected = [ 0 => [ - 0 => 'GET(auto)', - 1 => 'newautorouting', - 2 => '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', - 3 => '', - 4 => 'toolbar', + 'GET(auto)', + 'newautorouting', + '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', + '', + 'toolbar', ], 1 => [ - 0 => 'POST(auto)', - 1 => 'newautorouting/save/../..[/..]', - 2 => '\\Tests\\Support\\Controllers\\Newautorouting::postSave', - 3 => '', - 4 => 'toolbar', + 'POST(auto)', + 'newautorouting/save/../..[/..]', + '\\Tests\\Support\\Controllers\\Newautorouting::postSave', + '', + 'toolbar', ], ]; $this->assertSame($expected, $routes); From 8300dcee16cd36a0871a4a7b04a69f3f4d8c5310 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 13:43:30 +0900 Subject: [PATCH 0973/8282] test: update test expectations --- .../Routes/AutoRouterImproved/AutoRouteCollectorTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index 8e47466bf56e..823646875812 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -61,6 +61,7 @@ public function testGetFilterMatches() 0 => [ 'GET(auto)', 'newautorouting', + '', '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', '', 'toolbar', @@ -68,6 +69,7 @@ public function testGetFilterMatches() 1 => [ 'POST(auto)', 'newautorouting/save/../..[/..]', + '', '\\Tests\\Support\\Controllers\\Newautorouting::postSave', 'honeypot', 'toolbar', @@ -87,6 +89,7 @@ public function testGetFilterDoesNotMatch() 0 => [ 'GET(auto)', 'newautorouting', + '', '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', '', 'toolbar', @@ -94,6 +97,7 @@ public function testGetFilterDoesNotMatch() 1 => [ 'POST(auto)', 'newautorouting/save/../..[/..]', + '', '\\Tests\\Support\\Controllers\\Newautorouting::postSave', '', 'toolbar', From 6ac3a7bfe48e72b687c5727cd60f88b9724da4ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 16:46:38 +0900 Subject: [PATCH 0974/8282] fix: move PHP version check to index.php/spark If we use new syntax in new PHP version when dropping older PHP version support, syntax error occurs before the PHP version check. --- public/index.php | 12 ++++++++++++ spark | 12 ++++++++++++ system/CodeIgniter.php | 13 +------------ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/public/index.php b/public/index.php index 51f4be81e731..96e7f45ff4ac 100644 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,17 @@ startTime = microtime(true); $this->config = $config; } @@ -962,6 +950,7 @@ protected function display404errors(PageNotFoundException $e) ob_end_flush(); // @codeCoverageIgnore } + // Throws new PageNotFoundException and remove exception message on production. throw PageNotFoundException::forPageNotFound( (ENVIRONMENT !== 'production' || ! $this->isWeb()) ? $e->getMessage() : null ); From 20487a6485fa14f236355331f7f16c160053803e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 1 Aug 2022 18:43:47 +0900 Subject: [PATCH 0975/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/installation/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst index 5c2503dc773b..4807b9a06620 100644 --- a/user_guide_src/source/installation/index.rst +++ b/user_guide_src/source/installation/index.rst @@ -3,7 +3,7 @@ Installation ############ CodeIgniter has two supported installation methods: manual download, -using `Composer `_. +or using `Composer `_. Which is right for you? - We recommend the Composer installation because it keeps CodeIgniter up to date easily. From 6636a3e9744858224ed676786c2fd80e22901e54 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Mon, 1 Aug 2022 14:06:28 +0200 Subject: [PATCH 0976/8282] camelCase language vars --- app/Views/errors/html/error_404.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index fc4bdf055629..2b2bca046eb6 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -2,7 +2,7 @@ - <?= lang('Errors.404pageNotFound') ?> + <?= lang('Errors.pageNotFound') ?> ') + 8); $script = PHP_EOL - . '' - . '' + . '' . '' . $kintScript . PHP_EOL; diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 0e73076f0e02..aae7fc6a81a1 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -22,7 +22,7 @@ -

      diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php index 11491f76910d..31c9525bdf08 100755 --- a/system/Helpers/html_helper.php +++ b/system/Helpers/html_helper.php @@ -214,7 +214,7 @@ function script_tag($src = '', bool $indexPage = false): string } } - return $script . 'type="text/javascript">'; + return rtrim($script) . '>'; } } diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 94f430a44b67..906716f0b240 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -371,7 +371,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin // improve obfuscation by eliminating newlines & whitespace $cspNonce = csp_script_nonce(); $cspNonce = $cspNonce ? ' ' . $cspNonce : $cspNonce; - $output = ''; + $expected = ''; $this->assertSame($expected, script_tag($target)); } public function testScriptTagWithoutProtocol() { $target = 'js/mystyles.js'; - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag($target)); } public function testScriptTagWithIndexpage() { $target = 'js/mystyles.js'; - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag($target, true)); } public function testScriptTagWithSrc() { $target = ['src' => 'http://site.com/js/mystyles.js']; - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag($target)); } public function testScriptTagWithSrcWithoutProtocol() { $target = ['src' => 'js/mystyles.js']; - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag($target)); } public function testScriptTagWithSrcAndAttributes() { $target = ['src' => 'js/mystyles.js', 'charset' => 'UTF-8', 'defer' => '', 'async' => null]; - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag($target)); } @@ -299,7 +299,7 @@ public function testScriptTagWithCsp() */ public function testScriptTagWithoutAnyArg() { - $expected = ''; + $expected = ''; $this->assertSame($expected, script_tag()); } diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index b213f6413e97..66282e304c93 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -439,18 +439,18 @@ public function safeMailtoPatterns() { return [ 'page01' => [ - "", + "", 'me@my-site.com', 'Click Here to Contact Me', ], 'page02' => [ - "", + "", 'me@my-site.com', 'Contact Me', ['title' => 'Mail me'], ], 'page03' => [ - "", + "", 'me@my-site.com', ], ]; @@ -542,7 +542,7 @@ public function autolinkEmails() ], 'test02' => [ 'This is my noreply@codeigniter.com test', - "This is my test", + "This is my test", ], 'test03' => [ '
      www.google.com', @@ -562,11 +562,11 @@ public function autolinkEmails() ], 'test07' => [ 'Visit example.com or email foo@bar.com', - "Visit example.com or email ", + "Visit example.com or email ", ], 'test08' => [ 'Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email ", + "Visit www.example.com or email ", ], ]; } @@ -591,7 +591,7 @@ public function autolinkBoth() ], 'test02' => [ 'This is my noreply@codeigniter.com test', - "This is my test", + "This is my test", ], 'test03' => [ '
      www.google.com', @@ -611,11 +611,11 @@ public function autolinkBoth() ], 'test07' => [ 'Visit example.com or email foo@bar.com', - "Visit example.com or email ", + "Visit example.com or email ", ], 'test08' => [ 'Visit www.example.com or email foo@bar.com', - "Visit www.example.com or email ", + "Visit www.example.com or email ", ], ]; } From d0e48fbfdb5e9c3c72a06e8ef7feab49b0f07631 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Oct 2022 12:10:38 +0900 Subject: [PATCH 1676/8282] docs: update user guide --- user_guide_src/source/changelogs/v4.3.0.rst | 1 + user_guide_src/source/helpers/html_helper/010.php | 2 +- user_guide_src/source/helpers/html_helper/011.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 85e04e06a322..1b28541bba4f 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -46,6 +46,7 @@ Others - ``CITestStreamFilter::$buffer = ''`` no longer causes the filter to be registered to listen for streams. Now there is a ``CITestStreamFilter::registration()`` method for this. See :ref:`upgrade-430-stream-filter` for details. - The data structure returned by :ref:`BaseConnection::getForeignKeyData() ` has been changed. +- :php:func:`script_tag()` and :php:func:`safe_mailto()` no longer output ``type="text/javascript"`` in `` +// diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php index f47bb7053770..586621f9c207 100644 --- a/user_guide_src/source/helpers/html_helper/011.php +++ b/user_guide_src/source/helpers/html_helper/011.php @@ -3,4 +3,4 @@ $script = ['src' => 'js/printer.js', 'defer' => null]; echo script_tag($script); -// +// From 2b0973d82c2c0383db264c97580d68ba6de23a90 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Oct 2022 19:01:02 +0900 Subject: [PATCH 1677/8282] fix: error when Config\Modules::$composerPackages is missing --- system/Autoloader/Autoloader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 367a0194a126..ad4de0329d66 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -139,7 +139,8 @@ private function loadComposerInfo(Modules $modules): void // Should we load through Composer's namespaces, also? if ($modules->discoverInComposer) { - $this->loadComposerNamespaces($composer, $modules->composerPackages); + // @phpstan-ignore-next-line + $this->loadComposerNamespaces($composer, $modules->composerPackages ?? []); } unset($composer); From ebc8b43956609ec7e26256c971bfb90f24dc35b4 Mon Sep 17 00:00:00 2001 From: MGatner Date: Thu, 6 Oct 2022 12:42:08 +0000 Subject: [PATCH 1678/8282] Prep for 4.2.7 release --- CHANGELOG.md | 32 +++++++++++++++ system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.2.7.rst | 2 +- user_guide_src/source/changelogs/v4.2.8.rst | 41 +++++++++++++++++++ user_guide_src/source/conf.py | 2 +- .../source/installation/upgrade_427.rst | 6 +-- 7 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 user_guide_src/source/changelogs/v4.2.8.rst diff --git a/CHANGELOG.md b/CHANGELOG.md index 523277614fa6..150b0cb5e4bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## [v4.2.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.7) (2022-10-06) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.6...v4.2.7) + +### Breaking Changes +* fix: make Time::__toString() database-compatible on any locale by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6461 +* fix: set_cookie() does not use Config\Cookie values by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6544 +* fix: `required_without` rule logic in `Validation` class. by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/6589 + +### Fixed Bugs +* fix: typos in messages in Language/en/Email.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6517 +* fix: table attribute cannot applied on td element by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/6538 +* add: set up "script_name" to handle every request by index.php file. by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/6522 +* fix: CSP autoNonce = false by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6570 +* fix: inconsistent new line view in `date_helper` by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/6582 +* fix: safe_mailto() does not work with CSP by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6604 +* fix: script_tag() does not work with CSP by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6611 +* fix: `$cleanValidationRules` does not work in Model updates by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6588 +* Fixed a bug that URLs with trailing newlines do not become invalid in validation. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/6618 +* fix: missing `valid_json` in Validation Language by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/6624 +* fix: default values for Session Redis Handler by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6614 + +### Enhancements +* Update coding-standards version by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/6537 +* chore: update ThirdParty Kint to 4.2.2 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6583 + +### Refactoring +* Refactor: CodeIgniter::generateCacheName() by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6498 +* refactor: replace `global $app` with Services by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/6524 +* refactor: small refactoring in view() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6546 +* refactor: replace utf8_encode() with mb_convert_encoding() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6564 +* refactor: make $precision int in View Filter round by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6566 + ## [v4.2.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.6) (2022-09-04) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.5...v4.2.6) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 6717f676687d..0cc4861be854 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -47,7 +47,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.2.6'; + public const CI_VERSION = '4.2.7'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 3f9becffa838..f764a929bff5 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.2.8 v4.2.7 v4.2.6 v4.2.5 diff --git a/user_guide_src/source/changelogs/v4.2.7.rst b/user_guide_src/source/changelogs/v4.2.7.rst index f9d51f00c90b..f052e95b8482 100644 --- a/user_guide_src/source/changelogs/v4.2.7.rst +++ b/user_guide_src/source/changelogs/v4.2.7.rst @@ -1,7 +1,7 @@ Version 4.2.7 ############# -Release Date: Unreleased +Release Date: October 6, 2022 **4.2.7 release of CodeIgniter4** diff --git a/user_guide_src/source/changelogs/v4.2.8.rst b/user_guide_src/source/changelogs/v4.2.8.rst new file mode 100644 index 000000000000..41d02699a956 --- /dev/null +++ b/user_guide_src/source/changelogs/v4.2.8.rst @@ -0,0 +1,41 @@ +Version 4.2.8 +############# + +Release Date: Unreleased + +**4.2.8 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 2 + +BREAKING +******** + +none. +Enhancements +************ + +none. + +Message Changes +*************** + +none. + +Changes +******* + +none. + +Deprecations +************ + +none. + +Bugs Fixed +********** + +none. + +See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 076101e2d2a8..a75a4ac56a08 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -24,7 +24,7 @@ version = '4.2' # The full version, including alpha/beta/rc tags. -release = '4.2.6' +release = '4.2.7' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_427.rst b/user_guide_src/source/installation/upgrade_427.rst index 4ad0a1b2586e..eb4e3ae5cc7f 100644 --- a/user_guide_src/source/installation/upgrade_427.rst +++ b/user_guide_src/source/installation/upgrade_427.rst @@ -58,9 +58,7 @@ Others Project Files ************* -A few files in the **project space** (root, app, public, writable) received cosmetic updates. -You need not touch these files at all. There are some third-party CodeIgniter modules available -to assist with merging changes to the project space: `Explore on Packagist `_. +Version ``4.2.7`` did not alter any executable code in project files. All Changes =========== @@ -68,4 +66,4 @@ All Changes This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: -* +* app/Common.php From 8bd750fddce4cccd8524e4d959b8b07f5a64ede8 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Thu, 6 Oct 2022 21:38:46 +0700 Subject: [PATCH 1679/8282] fix: phpstan error in v1.8.8 --- system/Helpers/array_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index 5a72efed67d3..f17809c09790 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -48,7 +48,7 @@ function _array_search_dot(array $indexes, array $array) // Grab the current index $currentIndex = $indexes ? array_shift($indexes) : null; - if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { + if (empty($currentIndex) || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { return null; } From a40f7a5aa7aade979bf76861204b4524b1845cde Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 6 Oct 2022 22:06:51 +0700 Subject: [PATCH 1680/8282] fix: phpstan analyze error in array_helper --- system/Helpers/array_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index f17809c09790..d827cfeb826b 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -48,7 +48,7 @@ function _array_search_dot(array $indexes, array $array) // Grab the current index $currentIndex = $indexes ? array_shift($indexes) : null; - if (empty($currentIndex) || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { + if (empty($currentIndex) || (int) $currentIndex !== 0 || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { return null; } From 0ad1683ebdeac968fb7650c63551caf20bbe5816 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 6 Oct 2022 23:07:51 +0700 Subject: [PATCH 1681/8282] fix: phpstan analyze error in array_helper --- system/Helpers/array_helper.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index d827cfeb826b..e4408bc60368 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -46,9 +46,10 @@ function dot_array_search(string $index, array $array) function _array_search_dot(array $indexes, array $array) { // Grab the current index - $currentIndex = $indexes ? array_shift($indexes) : null; + $currentIndex = $indexes ? array_shift($indexes) : null; + $intCurrentIndex = (int) $currentIndex; - if (empty($currentIndex) || (int) $currentIndex !== 0 || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { + if (empty($currentIndex) && $intCurrentIndex !== 0 || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { return null; } From 0fc4ee6a8f702c2b471d2ffef1b5be82fdc18cf9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 07:12:01 +0900 Subject: [PATCH 1682/8282] chore: update ThirdParty Kint to 4.2.3 --- system/ThirdParty/Kint/resources/compiled/rich.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/ThirdParty/Kint/resources/compiled/rich.js b/system/ThirdParty/Kint/resources/compiled/rich.js index 2f0ef6a1d0e2..8354914c50a3 100644 --- a/system/ThirdParty/Kint/resources/compiled/rich.js +++ b/system/ThirdParty/Kint/resources/compiled/rich.js @@ -1 +1 @@ -void 0===window.kintRich&&(window.kintRich=function(){"use strict";var l={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},toggle:function(e,t){var a=l.getChildren(e);a&&(e.classList.toggle("kint-show",t),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&a.classList&&a.classList.contains("kint-parent")&&l.toggle(a,t))},toggleChildren:function(e,t){var a=l.getChildren(e);if(a){var o=a.getElementsByClassName("kint-parent"),n=o.length;for(void 0===t&&(t=e.classList.contains("kint-show"));n--;)l.toggle(o[n],t)}},switchTab:function(e){var t=e.previousSibling,a=0;for(e.parentNode.getElementsByClassName("kint-active-tab")[0].classList.remove("kint-active-tab"),e.classList.add("kint-active-tab");t;)1===t.nodeType&&a++,t=t.previousSibling;for(var o=e.parentNode.nextSibling.childNodes,n=0;n"},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 Date: Fri, 7 Oct 2022 07:23:16 +0900 Subject: [PATCH 1683/8282] docs: add section --- user_guide_src/source/incoming/routing.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 094cdb14417d..7b0ed28352ef 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -39,7 +39,10 @@ passed to it, then they would be listed after the method name, separated by forw .. literalinclude:: routing/002.php -You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc): +HTTP verbs +========== + +You can use any standard HTTP verb (GET, POST, PUT, DELETE, OPTIONS, etc): .. literalinclude:: routing/003.php From bf6e17e925c6e4dfab09ae39a1bf6dcb24f3679a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 07:31:11 +0900 Subject: [PATCH 1684/8282] fix: add ! to createFromFormat() Co-authored-by: MGatner --- tests/system/HTTP/DownloadResponseTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index 026ff8a3c41e..538575ab4d9d 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -50,7 +50,7 @@ public function testSetDateRemembersDateInUTC() { $response = new DownloadResponse('unit-test.txt', true); - $datetime = DateTime::createFromFormat('Y-m-d', '2000-03-10'); + $datetime = DateTime::createFromFormat('!Y-m-d', '2000-03-10'); $response->setDate($datetime); $date = clone $datetime; From 592ad34b96df88be8bec81fa244538e2c6093530 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 07:31:20 +0900 Subject: [PATCH 1685/8282] fix: add ! to createFromFormat() Co-authored-by: MGatner --- tests/system/HTTP/ResponseTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index 75045e24859f..4185082ee47c 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -144,7 +144,7 @@ public function testSetDateRemembersDateInUTC() { $response = new Response(new App()); - $datetime = DateTime::createFromFormat('Y-m-d', '2000-03-10'); + $datetime = DateTime::createFromFormat('!Y-m-d', '2000-03-10'); $response->setDate($datetime); $date = clone $datetime; From 162a9131a8bcbe3f4c86256ec4e1691af1204910 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 07:58:51 +0900 Subject: [PATCH 1686/8282] docs: add SECURITY section in 4.2.7 changelog --- user_guide_src/source/changelogs/v4.2.7.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.2.7.rst b/user_guide_src/source/changelogs/v4.2.7.rst index f052e95b8482..c7d29b0ce70e 100644 --- a/user_guide_src/source/changelogs/v4.2.7.rst +++ b/user_guide_src/source/changelogs/v4.2.7.rst @@ -9,6 +9,12 @@ Release Date: October 6, 2022 :local: :depth: 2 +SECURITY +******** + +- *Secure or HttpOnly flag set in Config\Cookie is not reflected in Cookies issued* was fixed. See the `Security advisory GHSA-745p-r637-7vvp `_ for more information. +- Fixed a bug that prevents CSP headers from being sent when ``Config\ContentSecurityPolicy::$autoNonce`` is false. + BREAKING ******** @@ -40,6 +46,4 @@ none. Bugs Fixed ********** -- Fixed a bug that prevents CSP headers from being sent when ``Config\ContentSecurityPolicy::$autoNonce`` is false. - See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. From bf8937d3f7b0d5bf44540bd0a1bde662808882ee Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 07:59:35 +0900 Subject: [PATCH 1687/8282] docs: fix link to PR in 4.2.6 changelog --- user_guide_src/source/changelogs/v4.2.6.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.2.6.rst b/user_guide_src/source/changelogs/v4.2.6.rst index 2da5842ea88f..0b86636e0dcb 100644 --- a/user_guide_src/source/changelogs/v4.2.6.rst +++ b/user_guide_src/source/changelogs/v4.2.6.rst @@ -33,6 +33,7 @@ Bugs Fixed ********** Many bugs fixed, but notably: -- AssertionError occurs when using Validation in CLI `https://github.com/codeigniter4/CodeIgniter4/pull/6452` + +- AssertionError occurs when using Validation in CLI `#6452 `_ See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. From a638c56d2ff6e5976a14048d27b038f889961707 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 7 Oct 2022 11:48:27 +0800 Subject: [PATCH 1688/8282] docs: changed all type mixed to correspond type. --- system/Validation/StrictRules/Rules.php | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php index 76f32a9c1fe4..bf27ec15e9e0 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 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 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 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 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,7 +285,7 @@ public function required($str = null): bool * * required_with[password] * - * @param mixed $str + * @param 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 */ From 255fbe5ca623ca3a7dc5b3cd06e19777c3daecf8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 14:49:53 +0900 Subject: [PATCH 1689/8282] fix: bug in route registration $routes and $routesOptions are not the same structure. $routesOptions don't have route names. If there are two routes having the same `from` but not the same name, the route and the option were not connected correctly. --- system/Router/RouteCollection.php | 16 ++++++++++-- tests/system/Router/RouteCollectionTest.php | 29 +++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 66a950e72fee..844dfdb11f7a 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -110,7 +110,7 @@ class RouteCollection implements RouteCollectionInterface * verb => [ * routeName => [ * 'route' => [ - * routeKey => handler, + * routeKey(or from) => handler, * ] * ] * ], @@ -133,6 +133,14 @@ class RouteCollection implements RouteCollectionInterface * Array of routes options * * @var array + * + * [ + * verb => [ + * routeKey(or from) => [ + * key => value, + * ] + * ], + * ] */ protected $routesOptions = []; @@ -1239,12 +1247,16 @@ protected function create(string $verb, string $from, $to, ?array $options = nul $name = $options['as'] ?? $from; + helper('array'); + // Don't overwrite any existing 'froms' so that auto-discovered routes // do not overwrite any app/Config/Routes settings. The app // routes should always be the "source of truth". // this works only because discovered routes are added just prior // to attempting to route the request. - if (isset($this->routes[$verb][$name]) && ! $overwrite) { + $fromExists = (dot_array_search('*.route.' . $from, $this->routes[$verb] ?? []) === null) + ? false : true; + if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) { return; } diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index cac8d4d4d336..2db20898e20c 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -1189,6 +1189,35 @@ static function () {}, $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']); } + public function testRoutesOptionsWithSameFromTwoRoutes() + { + $routes = $this->getCollector(); + + // This is the first route for `administrator`. + $options1 = [ + 'as' => 'admin', + 'foo' => 'options1', + ]; + $routes->get( + 'administrator', + static function () {}, + $options1 + ); + // The second route for `administrator` should be ignored. + $options2 = [ + 'foo' => 'options2', + ]; + $routes->get( + 'administrator', + static function () {}, + $options2 + ); + + $options = $routes->getRoutesOptions('administrator'); + + $this->assertSame($options, $options1); + } + public function testRoutesOptionsForDifferentVerbs() { $routes = $this->getCollector(); From 8ac5198bcf7bd712ab7d9a32a39b2742d5bde360 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 14:56:14 +0900 Subject: [PATCH 1690/8282] test: fix incorrect test --- tests/system/Router/RouteCollectionTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 2db20898e20c..b8b6f9ddbfc0 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -11,7 +11,6 @@ namespace CodeIgniter\Router; -use App\Controllers\Home; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; @@ -1489,12 +1488,12 @@ public function testRouteOverwritingTwoRules() $routes->setDefaultController('Home'); $routes->setDefaultMethod('index'); + // The subdomain of the current URL is `doc`, so this route is registered. $routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']); + // The subdomain route is already registered, so this route is not registered. $routes->get('/', 'Home::index'); - // the second rule applies, so overwrites the first - $expects = '\\' . Home::class; - + $expects = '\App\Controllers\Site\CDoc'; $this->assertSame($expects, $router->handle('/')); } From cfeb6f1e2eac4bc97fb89a4ebe815f3a5d23cf8e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 15:03:56 +0900 Subject: [PATCH 1691/8282] test: add test cases --- tests/system/Router/RouteCollectionTest.php | 54 ++++++++++++++++++--- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index b8b6f9ddbfc0..c41ae4ec64ba 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -1188,24 +1188,20 @@ static function () {}, $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']); } - public function testRoutesOptionsWithSameFromTwoRoutes() + /** + * @dataProvider optionsProvider + */ + public function testRoutesOptionsWithSameFromTwoRoutes(array $options1, array $options2) { $routes = $this->getCollector(); // This is the first route for `administrator`. - $options1 = [ - 'as' => 'admin', - 'foo' => 'options1', - ]; $routes->get( 'administrator', static function () {}, $options1 ); // The second route for `administrator` should be ignored. - $options2 = [ - 'foo' => 'options2', - ]; $routes->get( 'administrator', static function () {}, @@ -1217,6 +1213,48 @@ static function () {}, $this->assertSame($options, $options1); } + public function optionsProvider() + { + yield from [ + [ + [ + 'foo' => 'options1', + ], + [ + 'foo' => 'options2', + ], + ], + [ + [ + 'as' => 'admin', + 'foo' => 'options1', + ], + [ + 'foo' => 'options2', + ], + ], + [ + [ + 'foo' => 'options1', + ], + [ + 'as' => 'admin', + 'foo' => 'options2', + ], + ], + [ + [ + 'as' => 'admin', + 'foo' => 'options1', + ], + [ + 'as' => 'admin', + 'foo' => 'options2', + ], + ], + ]; + } + public function testRoutesOptionsForDifferentVerbs() { $routes = $this->getCollector(); From 596b2e949d7ccdd9838a382075344a7ce90ba716 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 15:24:54 +0900 Subject: [PATCH 1692/8282] refactor: run rector --- system/Router/RouteCollection.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 844dfdb11f7a..70a4fdc22311 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1254,8 +1254,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul // routes should always be the "source of truth". // this works only because discovered routes are added just prior // to attempting to route the request. - $fromExists = (dot_array_search('*.route.' . $from, $this->routes[$verb] ?? []) === null) - ? false : true; + $fromExists = dot_array_search('*.route.' . $from, $this->routes[$verb] ?? []) !== null; if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) { return; } From daa1b7c250c05b0f9741978ea858fd0f56f3dab6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 15:37:39 +0900 Subject: [PATCH 1693/8282] fix: incorrect test The second call for add `exampleRoute` would be ignored. --- tests/system/HTTP/RedirectResponseTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index 1b8fe62f49d9..a3736f891a3d 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -73,12 +73,12 @@ public function testRedirectRoute() $this->assertTrue($response->hasHeader('Location')); $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location')); - $this->routes->add('exampleRoute', 'Home::index', ['as' => 'home']); + $this->routes->add('exampleRoute2', 'Home::index', ['as' => 'home']); $response->route('home'); $this->assertTrue($response->hasHeader('Location')); - $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location')); + $this->assertSame('http://example.com/index.php/exampleRoute2', $response->getHeaderLine('Location')); } public function testRedirectRouteBadNamedRoute() From 93f36095d063d46a98d689a347be8f8e9374b3ba Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Oct 2022 19:58:39 +0900 Subject: [PATCH 1694/8282] refactor: make if conditions simple --- system/Helpers/array_helper.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index e4408bc60368..9b88cc2a0e0f 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -45,11 +45,15 @@ function dot_array_search(string $index, array $array) */ function _array_search_dot(array $indexes, array $array) { + // If index is empty, returns null. + if ($indexes === []) { + return null; + } + // Grab the current index - $currentIndex = $indexes ? array_shift($indexes) : null; - $intCurrentIndex = (int) $currentIndex; + $currentIndex = array_shift($indexes); - if (empty($currentIndex) && $intCurrentIndex !== 0 || (! isset($array[$currentIndex]) && $currentIndex !== '*')) { + if (! isset($array[$currentIndex]) && $currentIndex !== '*') { return null; } From c1d0b102122d249acb6bf620aa251c767dffd91e Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 7 Oct 2022 12:47:34 -0700 Subject: [PATCH 1695/8282] Add CLIRequest::getCookie() This is a placeholder method. Cookie helper may call getCookie() with a CLI Request. --- system/HTTP/CLIRequest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index e81ae9cabbd9..dc590ba625de 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -272,6 +272,20 @@ public function getGetPost($index = null, $filter = null, $flags = null) return $this->returnNullOrEmptyArray($index); } + /** + * This is a place holder for calls from cookie_helper get_cookie(). + * + * @param array|string|null $index Index for item to be fetched from $_COOKIE + * @param int|null $filter A filter name to be applied + * @param mixed $flags + * + * @return null + */ + public function getCookie($index = null, $filter = null, $flags = null) + { + return null; + } + /** * @param array|string|null $index * From 82c3d2511842f87fc57795652a215addf0751112 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 7 Oct 2022 14:36:55 -0700 Subject: [PATCH 1696/8282] Use returnNullOrEmptyArray($index) instead of null --- system/HTTP/CLIRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index dc590ba625de..e4ff79b6e305 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -283,7 +283,7 @@ public function getGetPost($index = null, $filter = null, $flags = null) */ public function getCookie($index = null, $filter = null, $flags = null) { - return null; + return $this->returnNullOrEmptyArray($index); } /** From 6f7c56fff5ade1b885aeebb4040169a10c0a2407 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 7 Oct 2022 14:37:24 -0700 Subject: [PATCH 1697/8282] Add test --- tests/system/HTTP/CLIRequestTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php index b294d1621b2b..5bd9a22221d5 100644 --- a/tests/system/HTTP/CLIRequestTest.php +++ b/tests/system/HTTP/CLIRequestTest.php @@ -616,4 +616,9 @@ public function testGetLocale() { $this->assertSame('en', $this->request->getLocale()); } + + public function testGetCookie() + { + $this->assertNull($this->request->getCookie('TESTY')); + } } From ad18607f1804b55dfff60c026eb86b0a655e54c0 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 7 Oct 2022 14:41:42 -0700 Subject: [PATCH 1698/8282] Add null $index condition to test --- tests/system/HTTP/CLIRequestTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php index 5bd9a22221d5..cbec9b22a33e 100644 --- a/tests/system/HTTP/CLIRequestTest.php +++ b/tests/system/HTTP/CLIRequestTest.php @@ -620,5 +620,7 @@ public function testGetLocale() public function testGetCookie() { $this->assertNull($this->request->getCookie('TESTY')); + + $this->assertSame($this->request->getCookie(), []); } } From b5607b70bc7388b2f00da83269155663b09e0721 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" <51850998+paulbalandan@users.noreply.github.com> Date: Sat, 8 Oct 2022 11:20:20 +0800 Subject: [PATCH 1699/8282] Remove unneeded `$logger` property in `Session` --- system/Session/Session.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/system/Session/Session.php b/system/Session/Session.php index f864a09b6f19..fb3a5e40a8e5 100644 --- a/system/Session/Session.php +++ b/system/Session/Session.php @@ -156,13 +156,6 @@ class Session implements SessionInterface */ protected $sidRegexp; - /** - * Logger instance to record error messages and warnings. - * - * @var LoggerInterface - */ - protected $logger; - /** * Constructor. * From 2f069f58e1385b9c7875d9d12cacec9a50e2b308 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" <51850998+paulbalandan@users.noreply.github.com> Date: Sat, 8 Oct 2022 11:25:44 +0800 Subject: [PATCH 1700/8282] Remove unused import --- system/Session/Session.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Session/Session.php b/system/Session/Session.php index fb3a5e40a8e5..041b795e6d48 100644 --- a/system/Session/Session.php +++ b/system/Session/Session.php @@ -17,7 +17,6 @@ use Config\Cookie as CookieConfig; use Config\Services; use Psr\Log\LoggerAwareTrait; -use Psr\Log\LoggerInterface; use SessionHandlerInterface; /** From 7faeeaa5cd0c63d4e81c75646eaf79488e9439d3 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 7 Oct 2022 23:45:16 -0700 Subject: [PATCH 1701/8282] Update system/HTTP/CLIRequest.php Co-authored-by: kenjis --- system/HTTP/CLIRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index e4ff79b6e305..64c0f0adae6d 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -279,7 +279,7 @@ public function getGetPost($index = null, $filter = null, $flags = null) * @param int|null $filter A filter name to be applied * @param mixed $flags * - * @return null + * @return array|null */ public function getCookie($index = null, $filter = null, $flags = null) { From f4641f6d9de19129427d2c5a17107a72f7d8f1c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 09:50:20 +0900 Subject: [PATCH 1702/8282] feat: add missing Response::getCSP() method and use it --- system/Debug/Toolbar.php | 4 ++-- system/HTTP/ResponseTrait.php | 7 +++++++ tests/system/HTTP/ContentSecurityPolicyTest.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 4b3ac0124fc6..a9ad94b31a77 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -163,8 +163,8 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques $data['config'] = Config::display(); - if ($response->CSP !== null) { - $response->CSP->addImageSrc('data:'); + if ($response->getCSP() !== null) { + $response->getCSP()->addImageSrc('data:'); } return json_encode($data); diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index b58fcdae8e53..efa7c52b1a80 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -48,6 +48,8 @@ trait ResponseTrait * Content security policy handler * * @var ContentSecurityPolicy + * + * @TODO Will be protected. Use `getCSP()` instead. */ public $CSP; @@ -795,4 +797,9 @@ public function download(string $filename = '', $data = '', bool $setMime = fals return $response; } + + public function getCSP(): ContentSecurityPolicy + { + return $this->CSP; + } } diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 19d720d9f49b..608a6eb1aeee 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -40,7 +40,7 @@ protected function prepare(bool $CSPEnabled = true) $config->CSPEnabled = $CSPEnabled; $this->response = new Response($config); $this->response->pretend(false); - $this->csp = $this->response->CSP; + $this->csp = $this->response->getCSP(); } protected function work(string $parm = 'Hello') @@ -635,7 +635,7 @@ public function testCSPDisabled() { $this->prepare(false); $this->work(); - $this->response->CSP->addStyleSrc('https://example.com'); + $this->response->getCSP()->addStyleSrc('https://example.com'); $this->assertHeaderNotEmitted('content-security-policy', true); } From 8cdd561a9cfe85330672fb738ff7a39212d9530d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:05:37 +0900 Subject: [PATCH 1703/8282] fix: add missing getCSP() in ResponseInterface --- system/HTTP/ResponseInterface.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index f6b00a5044db..7e38d1edeb5b 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -382,4 +382,13 @@ public function redirect(string $uri, string $method = 'auto', ?int $code = null * @return DownloadResponse|null */ public function download(string $filename = '', $data = '', bool $setMime = false); + + // -------------------------------------------------------------------- + // CSP Methods + // -------------------------------------------------------------------- + + /** + * Get Content Security Policy handler. + */ + public function getCSP(): ContentSecurityPolicy; } From 77fd44b44585db255a6a0c1fe9243ee6e2051087 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:08:19 +0900 Subject: [PATCH 1704/8282] docs: remove duplicate "response" --- system/HTTP/ResponseInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index 7e38d1edeb5b..76c98094643b 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -135,7 +135,7 @@ public function getStatusCode(): int; public function setStatusCode(int $code, string $reason = ''); /** - * Gets the response response phrase associated with the status code. + * Gets the response phrase associated with the status code. * * @see http://tools.ietf.org/html/rfc7231#section-6 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml From 508782e770ce0e281eb0468357194454bafeef48 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:09:39 +0900 Subject: [PATCH 1705/8282] fix: add missing getReasonPhrase() and getCookieStore() in ResponseInterface --- system/HTTP/ResponseInterface.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index 76c98094643b..346f2dd802f0 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -12,6 +12,7 @@ namespace CodeIgniter\HTTP; use CodeIgniter\Cookie\Cookie; +use CodeIgniter\Cookie\CookieStore; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Pager\PagerInterface; use DateTime; @@ -144,6 +145,22 @@ public function setStatusCode(int $code, string $reason = ''); */ public function getReason(): string; + /** + * Gets the response reason phrase associated with the status code. + * + * Because a reason phrase is not a required element in a response + * status line, the reason phrase value MAY be null. Implementations MAY + * choose to return the default RFC 7231 recommended reason phrase (or those + * listed in the IANA HTTP Status Code Registry) for the response's + * status code. + * + * @see http://tools.ietf.org/html/rfc7231#section-6 + * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml + * + * @return string Reason phrase; must return an empty string if none present. + */ + public function getReasonPhrase(); + // -------------------------------------------------------------------- // Convenience Methods // -------------------------------------------------------------------- @@ -353,6 +370,13 @@ public function deleteCookie(string $name = '', string $domain = '', string $pat */ public function getCookies(); + /** + * Returns the `CookieStore` instance. + * + * @return CookieStore + */ + public function getCookieStore(); + // -------------------------------------------------------------------- // Response Methods // -------------------------------------------------------------------- From 680945dc7fc3e4d3e331c1d5f2a558df5f9c1ccb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:18:40 +0900 Subject: [PATCH 1706/8282] fix: incorrect declared types --- system/API/ResponseTrait.php | 4 +--- system/Common.php | 2 +- system/Config/Services.php | 2 +- system/Debug/Exceptions.php | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php index 93dd976eaefb..cc302a9de91d 100644 --- a/system/API/ResponseTrait.php +++ b/system/API/ResponseTrait.php @@ -282,10 +282,8 @@ protected function failTooManyRequests(string $description = 'Too Many Requests' * @param string $description The error message to show the user. * @param string|null $code A custom, API-specific, error code. * @param string $message A custom "reason" message to return. - * - * @return Response The value of the Response's send() method. */ - protected function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): Response + protected function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): ResponseInterface { return $this->fail($description, $this->codes['server_error'], $code, $message); } diff --git a/system/Common.php b/system/Common.php index 306afaa744de..631aa14488c0 100644 --- a/system/Common.php +++ b/system/Common.php @@ -900,7 +900,7 @@ function request() /** * Returns the shared Response. */ - function response(): Response + function response(): ResponseInterface { return Services::response(); } diff --git a/system/Config/Services.php b/system/Config/Services.php index 08d1a354bc4e..edfe13113457 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -253,7 +253,7 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared = public static function exceptions( ?ExceptionsConfig $config = null, ?IncomingRequest $request = null, - ?Response $response = null, + ?ResponseInterface $response = null, bool $getShared = true ) { if ($getShared) { diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 01eca101d887..01609788bd0f 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -70,7 +70,7 @@ class Exceptions /** * @param CLIRequest|IncomingRequest $request */ - public function __construct(ExceptionsConfig $config, $request, Response $response) + public function __construct(ExceptionsConfig $config, $request, ResponseInterface $response) { $this->ob_level = ob_get_level(); $this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR; From 180b67c3b2749b376c94c12215467efafae45d86 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:19:27 +0900 Subject: [PATCH 1707/8282] docs: fix incorrect @throws --- system/HTTP/ResponseInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index 346f2dd802f0..878d1488c25d 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -131,7 +131,7 @@ public function getStatusCode(): int; * * @return $this * - * @throws InvalidArgumentException For invalid status code arguments. + * @throws HTTPException For invalid status code arguments. */ public function setStatusCode(int $code, string $reason = ''); From a39efce8569c2c225b681af927397716efecdd9e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:21:30 +0900 Subject: [PATCH 1708/8282] docs: fix @return --- system/HTTP/ResponseTrait.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index efa7c52b1a80..cec378cb2a6b 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -175,7 +175,7 @@ public function setStatusCode(int $code, string $reason = '') /** * Sets the date header * - * @return Response + * @return $this */ public function setDate(DateTime $date) { @@ -191,7 +191,7 @@ public function setDate(DateTime $date) * * @see http://tools.ietf.org/html/rfc5988 * - * @return Response + * @return $this * * @todo Recommend moving to Pager */ @@ -222,7 +222,7 @@ public function setLink(PagerInterface $pager) * Sets the Content Type header for this response with the mime type * and, optionally, the charset. * - * @return Response + * @return $this */ public function setContentType(string $mime, string $charset = 'UTF-8') { @@ -336,7 +336,7 @@ protected function formatBody($body, string $format) * Sets the appropriate headers to ensure this response * is not cached by the browsers. * - * @return Response + * @return $this * * @todo Recommend researching these directives, might need: 'private', 'no-transform', 'no-store', 'must-revalidate' * @@ -374,7 +374,7 @@ public function noCache() * - proxy-revalidate * - no-transform * - * @return Response + * @return $this */ public function setCache(array $options = []) { @@ -411,7 +411,7 @@ public function setCache(array $options = []) * * @param DateTime|string $date * - * @return Response + * @return $this */ public function setLastModified($date) { @@ -454,7 +454,7 @@ public function send() /** * Sends the headers of this HTTP response to the browser. * - * @return Response + * @return $this */ public function sendHeaders() { @@ -483,7 +483,7 @@ public function sendHeaders() /** * Sends the Body of the message to the browser. * - * @return Response + * @return $this */ public function sendBody() { From c2657f6a45a745a332ff917bb0ee9baff191c77a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:22:05 +0900 Subject: [PATCH 1709/8282] docs: replace Response with ResponseInterface in doc comments --- system/API/ResponseTrait.php | 29 ++++++++++++++------------- system/Config/BaseService.php | 5 ++--- system/Config/Services.php | 2 +- system/Debug/Exceptions.php | 4 ++-- system/Debug/Toolbar.php | 3 --- system/HTTP/ContentSecurityPolicy.php | 6 +----- system/RESTful/ResourceController.php | 16 +++++++-------- 7 files changed, 29 insertions(+), 36 deletions(-) diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php index cc302a9de91d..d623bc942df3 100644 --- a/system/API/ResponseTrait.php +++ b/system/API/ResponseTrait.php @@ -14,6 +14,7 @@ use CodeIgniter\Format\FormatterInterface; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; use Config\Services; /** @@ -85,7 +86,7 @@ trait ResponseTrait * * @param array|string|null $data * - * @return Response + * @return ResponseInterface */ protected function respond($data = null, ?int $status = null, string $message = '') { @@ -119,7 +120,7 @@ protected function respond($data = null, ?int $status = null, string $message = * @param int $status HTTP status code * @param string|null $code Custom, API-specific, error code * - * @return Response + * @return ResponseInterface */ protected function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '') { @@ -145,7 +146,7 @@ protected function fail($messages, int $status = 400, ?string $code = null, stri * * @param array|string|null $data * - * @return Response + * @return ResponseInterface */ protected function respondCreated($data = null, string $message = '') { @@ -157,7 +158,7 @@ protected function respondCreated($data = null, string $message = '') * * @param array|string|null $data * - * @return Response + * @return ResponseInterface */ protected function respondDeleted($data = null, string $message = '') { @@ -169,7 +170,7 @@ protected function respondDeleted($data = null, string $message = '') * * @param array|string|null $data * - * @return Response + * @return ResponseInterface */ protected function respondUpdated($data = null, string $message = '') { @@ -180,7 +181,7 @@ protected function respondUpdated($data = null, string $message = '') * Used after a command has been successfully executed but there is no * meaningful reply to send back to the client. * - * @return Response + * @return ResponseInterface */ protected function respondNoContent(string $message = 'No Content') { @@ -192,7 +193,7 @@ protected function respondNoContent(string $message = 'No Content') * or had bad authorization credentials. User is encouraged to try again * with the proper information. * - * @return Response + * @return ResponseInterface */ protected function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '') { @@ -203,7 +204,7 @@ protected function failUnauthorized(string $description = 'Unauthorized', ?strin * Used when access is always denied to this resource and no amount * of trying again will help. * - * @return Response + * @return ResponseInterface */ protected function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '') { @@ -213,7 +214,7 @@ protected function failForbidden(string $description = 'Forbidden', ?string $cod /** * Used when a specified resource cannot be found. * - * @return Response + * @return ResponseInterface */ protected function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '') { @@ -223,7 +224,7 @@ protected function failNotFound(string $description = 'Not Found', ?string $code /** * Used when the data provided by the client cannot be validated. * - * @return Response + * @return ResponseInterface * * @deprecated Use failValidationErrors instead */ @@ -237,7 +238,7 @@ protected function failValidationError(string $description = 'Bad Request', ?str * * @param string|string[] $errors * - * @return Response + * @return ResponseInterface */ protected function failValidationErrors($errors, ?string $code = null, string $message = '') { @@ -247,7 +248,7 @@ protected function failValidationErrors($errors, ?string $code = null, string $m /** * Use when trying to create a new resource and it already exists. * - * @return Response + * @return ResponseInterface */ protected function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '') { @@ -259,7 +260,7 @@ protected function failResourceExists(string $description = 'Conflict', ?string * Not Found, because here we know the data previously existed, but is now gone, * where Not Found means we simply cannot find any information about it. * - * @return Response + * @return ResponseInterface */ protected function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '') { @@ -269,7 +270,7 @@ protected function failResourceGone(string $description = 'Gone', ?string $code /** * Used when the user has made too many requests for the resource recently. * - * @return Response + * @return ResponseInterface */ protected function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '') { diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index a240246d3c5c..98cb19fde9e7 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -35,7 +35,6 @@ use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Request; use CodeIgniter\HTTP\RequestInterface; -use CodeIgniter\HTTP\Response; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use CodeIgniter\Images\Handlers\BaseHandler; @@ -101,7 +100,7 @@ * @method static CURLRequest curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true) * @method static Email email($config = null, $getShared = true) * @method static EncrypterInterface encrypter(Encryption $config = null, $getShared = false) - * @method static Exceptions exceptions(ConfigExceptions $config = null, IncomingRequest $request = null, Response $response = null, $getShared = true) + * @method static Exceptions exceptions(ConfigExceptions $config = null, IncomingRequest $request = null, ResponseInterface $response = null, $getShared = true) * @method static Filters filters(ConfigFilters $config = null, $getShared = true) * @method static Format format(ConfigFormat $config = null, $getShared = true) * @method static Honeypot honeypot(ConfigHoneyPot $config = null, $getShared = true) @@ -117,7 +116,7 @@ * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true) * @method static View renderer($viewPath = null, ConfigView $config = null, $getShared = true) * @method static IncomingRequest|CLIRequest request(App $config = null, $getShared = true) - * @method static Response response(App $config = null, $getShared = true) + * @method static ResponseInterface response(App $config = null, $getShared = true) * @method static Router router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true) * @method static RouteCollection routes($getShared = true) * @method static Security security(App $config = null, $getShared = true) diff --git a/system/Config/Services.php b/system/Config/Services.php index edfe13113457..aa2be0219b71 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -546,7 +546,7 @@ public static function incomingrequest(?App $config = null, bool $getShared = tr /** * The Response class models an HTTP response. * - * @return Response + * @return ResponseInterface */ public static function response(?App $config = null, bool $getShared = true) { diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 01609788bd0f..1e976fc6be1a 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -18,7 +18,7 @@ use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; -use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; use Config\Exceptions as ExceptionsConfig; use Config\Paths; use ErrorException; @@ -63,7 +63,7 @@ class Exceptions /** * The outgoing response. * - * @var Response + * @var ResponseInterface */ protected $response; diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index a9ad94b31a77..2d459227ca6e 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -20,7 +20,6 @@ use CodeIgniter\HTTP\DownloadResponse; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RequestInterface; -use CodeIgniter\HTTP\Response; use CodeIgniter\HTTP\ResponseInterface; use Config\Services; use Config\Toolbar as ToolbarConfig; @@ -71,7 +70,6 @@ public function __construct(ToolbarConfig $config) * * @param float $startTime App start time * @param IncomingRequest $request - * @param Response $response * * @return string JSON encoded data */ @@ -355,7 +353,6 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r { /** * @var IncomingRequest|null $request - * @var Response|null $response */ if (CI_DEBUG && ! is_cli()) { $app = Services::codeigniter(); diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php index 4f912a8ea011..3cc9b03a58db 100644 --- a/system/HTTP/ContentSecurityPolicy.php +++ b/system/HTTP/ContentSecurityPolicy.php @@ -690,11 +690,7 @@ protected function generateNonces(ResponseInterface $response) */ protected function buildHeaders(ResponseInterface $response) { - /** - * Ensure both headers are available and arrays... - * - * @var Response $response - */ + // Ensure both headers are available and arrays... $response->setHeader('Content-Security-Policy', []); $response->setHeader('Content-Security-Policy-Report-Only', []); diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php index 42bf93831e85..93a16d0dff98 100644 --- a/system/RESTful/ResourceController.php +++ b/system/RESTful/ResourceController.php @@ -12,7 +12,7 @@ namespace CodeIgniter\RESTful; use CodeIgniter\API\ResponseTrait; -use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; /** * An extendable controller to provide a RESTful API for a resource. @@ -24,7 +24,7 @@ class ResourceController extends BaseResource /** * Return an array of resource objects, themselves in array format * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function index() { @@ -36,7 +36,7 @@ public function index() * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function show($id = null) { @@ -46,7 +46,7 @@ public function show($id = null) /** * Return a new resource object, with default properties * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function new() { @@ -56,7 +56,7 @@ public function new() /** * Create a new resource object, from "posted" parameters * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function create() { @@ -68,7 +68,7 @@ public function create() * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function edit($id = null) { @@ -80,7 +80,7 @@ public function edit($id = null) * * @param string|null|int$id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function update($id = null) { @@ -92,7 +92,7 @@ public function update($id = null) * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function delete($id = null) { From 7379b67b2670f2ef1a17c82ad7e6f2110773b302 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:45:10 +0900 Subject: [PATCH 1710/8282] docs: replace Response with ResponseInterface in doc comments --- system/API/ResponseTrait.php | 5 ++--- system/HTTP/CURLRequest.php | 2 -- system/RESTful/ResourcePresenter.php | 18 +++++++++--------- system/Security/Security.php | 2 -- system/Session/Session.php | 2 -- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php index d623bc942df3..450c24288cea 100644 --- a/system/API/ResponseTrait.php +++ b/system/API/ResponseTrait.php @@ -13,7 +13,6 @@ use CodeIgniter\Format\FormatterInterface; use CodeIgniter\HTTP\IncomingRequest; -use CodeIgniter\HTTP\Response; use CodeIgniter\HTTP\ResponseInterface; use Config\Services; @@ -22,8 +21,8 @@ * consistent HTTP responses under a variety of common * situations when working as an API. * - * @property IncomingRequest $request - * @property Response $response + * @property IncomingRequest $request + * @property ResponseInterface $response */ trait ResponseTrait { diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 2ecf69cc0242..217899863aa7 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -96,8 +96,6 @@ class CURLRequest extends Request * - baseURI * - timeout * - any other request options to use as defaults. - * - * @param ResponseInterface $response */ public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = []) { diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php index 3b832a2412be..5aedb28d4ad8 100644 --- a/system/RESTful/ResourcePresenter.php +++ b/system/RESTful/ResourcePresenter.php @@ -11,7 +11,7 @@ namespace CodeIgniter\RESTful; -use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; /** * An extendable controller to help provide a UI for a resource. @@ -21,7 +21,7 @@ class ResourcePresenter extends BaseResource /** * Present a view of resource objects * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function index() { @@ -33,7 +33,7 @@ public function index() * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function show($id = null) { @@ -43,7 +43,7 @@ public function show($id = null) /** * Present a view to present a new single resource object * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function new() { @@ -54,7 +54,7 @@ public function new() * Process the creation/insertion of a new resource object. * This should be a POST. * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function create() { @@ -66,7 +66,7 @@ public function create() * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function edit($id = null) { @@ -79,7 +79,7 @@ public function edit($id = null) * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function update($id = null) { @@ -91,7 +91,7 @@ public function update($id = null) * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function remove($id = null) { @@ -103,7 +103,7 @@ public function remove($id = null) * * @param int|string|null $id * - * @return Response|string|void + * @return ResponseInterface|string|void */ public function delete($id = null) { diff --git a/system/Security/Security.php b/system/Security/Security.php index bc24c0605e30..ba70e3ec24f0 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -15,7 +15,6 @@ use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Request; use CodeIgniter\HTTP\RequestInterface; -use CodeIgniter\HTTP\Response; use CodeIgniter\Security\Exceptions\SecurityException; use CodeIgniter\Session\Session; use Config\App; @@ -571,7 +570,6 @@ private function saveHashInCookie(): void ] ); - /** @var Response $response */ $response = Services::response(); $response->setCookie($this->cookie); } diff --git a/system/Session/Session.php b/system/Session/Session.php index f864a09b6f19..1ac80e40f02f 100644 --- a/system/Session/Session.php +++ b/system/Session/Session.php @@ -12,7 +12,6 @@ namespace CodeIgniter\Session; use CodeIgniter\Cookie\Cookie; -use CodeIgniter\HTTP\Response; use Config\App; use Config\Cookie as CookieConfig; use Config\Services; @@ -930,7 +929,6 @@ protected function setCookie() $expiration = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration; $this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration); - /** @var Response $response */ $response = Services::response(); $response->setCookie($this->cookie); } From cf74c952b072ccd618eeb042761f911030ffb9e4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:46:03 +0900 Subject: [PATCH 1711/8282] fix: use ResponseInterface instead of Response in ControllerTestTrait --- system/Test/ControllerTestTrait.php | 8 ++++---- system/Test/ControllerTester.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index 6a784eb8c7e9..27ccb5cfcbec 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -14,7 +14,7 @@ use CodeIgniter\Controller; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; -use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use Config\App; use Config\Services; @@ -55,7 +55,7 @@ trait ControllerTestTrait /** * Response. * - * @var Response + * @var ResponseInterface */ protected $response; @@ -177,7 +177,7 @@ public function execute(string $method, ...$params) } // If the controller did not return a response then start one - if (! $response instanceof Response) { + if (! $response instanceof ResponseInterface) { $response = $this->response; } @@ -244,7 +244,7 @@ public function withRequest($request) /** * Set controller's response, with method chaining. * - * @param mixed $response + * @param ResponseInterface $response * * @return $this */ diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php index 67b5e01e782e..a4b41a94c308 100644 --- a/system/Test/ControllerTester.php +++ b/system/Test/ControllerTester.php @@ -13,7 +13,7 @@ use CodeIgniter\Controller; use CodeIgniter\HTTP\IncomingRequest; -use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use Config\App; use Config\Services; @@ -58,7 +58,7 @@ trait ControllerTester /** * Response. * - * @var Response + * @var ResponseInterface */ protected $response; @@ -182,7 +182,7 @@ public function execute(string $method, ...$params) $output = ob_get_clean(); // If the controller returned a response, use it - if (isset($response) && $response instanceof Response) { + if (isset($response) && $response instanceof ResponseInterface) { $result->setResponse($response); } From 22d4d6070ab59958c84460cf3182e3f11d31cc9f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 10:58:33 +0900 Subject: [PATCH 1712/8282] docs: add @deprecated to Response::$CSP It will be protected. --- system/HTTP/ResponseTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index cec378cb2a6b..7ba699262869 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -49,7 +49,7 @@ trait ResponseTrait * * @var ContentSecurityPolicy * - * @TODO Will be protected. Use `getCSP()` instead. + * @deprecated Will be protected. Use `getCSP()` instead. */ public $CSP; From d9e59193d772e0d77f78be0d704b8d2d7a6ecc1b Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Sep 2022 11:05:41 +0900 Subject: [PATCH 1713/8282] refactor: run rector --- system/Debug/Toolbar.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 2d459227ca6e..49ccc340f18c 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -161,9 +161,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques $data['config'] = Config::display(); - if ($response->getCSP() !== null) { - $response->getCSP()->addImageSrc('data:'); - } + $response->getCSP()->addImageSrc('data:'); return json_encode($data); } From 81cb93acc0f4904443b22d8cc819b30745c4dfaa Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Oct 2022 08:42:48 +0900 Subject: [PATCH 1714/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.0.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 1b28541bba4f..ec93e937445b 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -55,6 +55,7 @@ Interface Changes - Added missing ``getBody()``, ``hasHeader()`` and ``getHeaderLine()`` method in ``MessageInterface``. - Now ``ResponseInterface`` extends ``MessageInterface``. +- Added missing ``ResponseInterface::getCSP()`` (and ``Response::getCSP()``), ``ResponseInterface::getReasonPhrase()`` and ``ResponseInterface::getCookieStore()`` methods. Method Signature Changes ======================== @@ -96,6 +97,10 @@ Others - ``BaseBuilder::_updateBatch()`` - The second parameter ``$values`` has changed to ``$keys``. - The third parameter ``$index`` has changed to ``$values``. The parameter type also has changed to ``array``. +- The return type of ``API\ResponseTrait::failServerError()`` has been changed to ``ResponseInterface``. +- The following methods have been changed to accept ``ResponseInterface`` as a parameter instead of ``Response``. + - ``Debug\Exceptions::__construct()`` + - ``Services::exceptions()`` Enhancements ************ @@ -186,6 +191,7 @@ Deprecations - ``RouteCollection::localizeRoute()`` is deprecated. - ``RouteCollection::fillRouteParams()`` is deprecated. Use ``RouteCollection::buildReverseRoute()`` instead. - ``BaseBuilder::setUpdateBatch()`` and ``BaseBuilder::setInsertBatch()`` are deprecated. Use ``BaseBuilder::setData()`` instead. +- The public property ``Response::$CSP`` is deprecated. It will be protected. Use ``Response::getCSP()`` instead. Bugs Fixed ********** From fdbaa0788defee5446e5fb37b015cf081144318a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Oct 2022 09:16:08 +0900 Subject: [PATCH 1715/8282] docs: fix @return types --- system/HTTP/CLIRequest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index 64c0f0adae6d..708fbafbae63 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -223,7 +223,7 @@ public function isCLI(): bool * @param int|null $filter A filter name to apply. * @param mixed|null $flags * - * @return null + * @return array|null */ public function getGet($index = null, $filter = null, $flags = null) { @@ -237,7 +237,7 @@ public function getGet($index = null, $filter = null, $flags = null) * @param int|null $filter A filter name to apply * @param mixed $flags * - * @return null + * @return array|null */ public function getPost($index = null, $filter = null, $flags = null) { @@ -251,7 +251,7 @@ public function getPost($index = null, $filter = null, $flags = null) * @param int|null $filter A filter name to apply * @param mixed $flags * - * @return null + * @return array|null */ public function getPostGet($index = null, $filter = null, $flags = null) { @@ -265,7 +265,7 @@ public function getPostGet($index = null, $filter = null, $flags = null) * @param int|null $filter A filter name to apply * @param mixed $flags * - * @return null + * @return array|null */ public function getGetPost($index = null, $filter = null, $flags = null) { From 74d30a107f8e121ed4cce4834f8ac05724a1b25e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 06:39:24 +0900 Subject: [PATCH 1716/8282] refactor: remove unnecessary "&" --- system/Filters/Filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index f4c629b9f481..da68cd47a6d0 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -147,7 +147,7 @@ private function discoverFilters() */ public function setResponse(ResponseInterface $response) { - $this->response = &$response; + $this->response = $response; } /** From f1dfdc8abcd1756146b79e3589595d1a9d6fb6fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 06:41:50 +0900 Subject: [PATCH 1717/8282] docs: fix typo --- system/Filters/Filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index da68cd47a6d0..30e36a32c65f 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -143,7 +143,7 @@ private function discoverFilters() } /** - * Set the response explicity. + * Set the response explicitly. */ public function setResponse(ResponseInterface $response) { From e51c0d7b74c59095fddccdb5a874d41435d3d2e2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 07:02:32 +0900 Subject: [PATCH 1718/8282] feat: add method to disable controller filters --- system/CodeIgniter.php | 88 ++++++++++++++++++++------------ tests/system/CodeIgniterTest.php | 27 ++++++++++ 2 files changed, 81 insertions(+), 34 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 902c98a8f069..2e5207ff3664 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -152,6 +152,11 @@ class CodeIgniter */ protected ?string $context = null; + /** + * Whether to enable Control Filters. + */ + protected bool $enableFilters = true; + /** * Constructor. */ @@ -399,6 +404,14 @@ private function isWeb(): bool return $this->context === 'web'; } + /** + * Disables Controller Filters. + */ + public function disableFilters(): void + { + $this->enableFilters = false; + } + /** * Handles the main request logic and fires the controller. * @@ -413,35 +426,37 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache $uri = $this->determinePath(); - // Start up the filters - $filters = Services::filters(); - - // If any filters were specified within the routes file, - // we need to ensure it's active for the current request - if ($routeFilter !== null) { - $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false; - if ($multipleFiltersEnabled) { - $filters->enableFilters($routeFilter, 'before'); - $filters->enableFilters($routeFilter, 'after'); - } else { - // for backward compatibility - $filters->enableFilter($routeFilter, 'before'); - $filters->enableFilter($routeFilter, 'after'); + if ($this->enableFilters) { + // Start up the filters + $filters = Services::filters(); + + // If any filters were specified within the routes file, + // we need to ensure it's active for the current request + if ($routeFilter !== null) { + $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false; + if ($multipleFiltersEnabled) { + $filters->enableFilters($routeFilter, 'before'); + $filters->enableFilters($routeFilter, 'after'); + } else { + // for backward compatibility + $filters->enableFilter($routeFilter, 'before'); + $filters->enableFilter($routeFilter, 'after'); + } } - } - // Run "before" filters - $this->benchmark->start('before_filters'); - $possibleResponse = $filters->run($uri, 'before'); - $this->benchmark->stop('before_filters'); + // Run "before" filters + $this->benchmark->start('before_filters'); + $possibleResponse = $filters->run($uri, 'before'); + $this->benchmark->stop('before_filters'); - // If a ResponseInterface instance is returned then send it back to the client and stop - if ($possibleResponse instanceof ResponseInterface) { - return $returnResponse ? $possibleResponse : $possibleResponse->send(); - } + // If a ResponseInterface instance is returned then send it back to the client and stop + if ($possibleResponse instanceof ResponseInterface) { + return $returnResponse ? $possibleResponse : $possibleResponse->send(); + } - if ($possibleResponse instanceof Request) { - $this->request = $possibleResponse; + if ($possibleResponse instanceof Request) { + $this->request = $possibleResponse; + } } $returned = $this->startController(); @@ -468,20 +483,25 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // so it can be used with the output. $this->gatherOutput($cacheConfig, $returned); - $filters->setResponse($this->response); + if ($this->enableFilters) { + $filters = Services::filters(); + $filters->setResponse($this->response); - // After filter debug toolbar requires 'total_execution'. - $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); + // After filter debug toolbar requires 'total_execution'. + $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); - // Run "after" filters - $this->benchmark->start('after_filters'); - $response = $filters->run($uri, 'after'); - $this->benchmark->stop('after_filters'); + // Run "after" filters + $this->benchmark->start('after_filters'); + $response = $filters->run($uri, 'after'); + $this->benchmark->stop('after_filters'); - if ($response instanceof ResponseInterface) { - $this->response = $response; + if ($response instanceof ResponseInterface) { + $this->response = $response; + } } + $response ??= $this->response; + // Skip unnecessary processing for special Responses. if (! $response instanceof DownloadResponse && ! $response instanceof RedirectResponse) { // Cache it without the performance metrics replaced diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index ca95d403d6d5..418b79f14af7 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -245,6 +245,33 @@ public function testControllersRunFilterByClassName() $this->resetServices(); } + public function testDisableControllerFilters() + { + $_SERVER['argv'] = ['index.php', 'pages/about']; + $_SERVER['argc'] = 2; + + $_SERVER['REQUEST_URI'] = '/pages/about'; + + // Inject mock router. + $routes = Services::routes(); + $routes->add( + 'pages/about', + static fn () => Services::incomingrequest()->getBody(), + ['filter' => Customfilter::class] + ); + $router = Services::router($routes, Services::incomingrequest()); + Services::injectMock('router', $router); + + ob_start(); + $this->codeigniter->disableFilters(); + $this->codeigniter->run(); + $output = ob_get_clean(); + + $this->assertStringContainsString('', $output); + + $this->resetServices(); + } + public function testResponseConfigEmpty() { $_SERVER['argv'] = ['index.php', '/']; From 21669f3e5bfd6ed8210835fd5b69973bec3d3be9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 07:42:57 +0900 Subject: [PATCH 1719/8282] refactor: use $this->response instead of $response --- system/CodeIgniter.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 2e5207ff3664..f4b319d9a1a4 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -500,10 +500,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache } } - $response ??= $this->response; - // Skip unnecessary processing for special Responses. - if (! $response instanceof DownloadResponse && ! $response instanceof RedirectResponse) { + if (! $this->response instanceof DownloadResponse && ! $this->response instanceof RedirectResponse) { // Cache it without the performance metrics replaced // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. From badbd2242fbf4bade491384202bd68ec2ae0c9a7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 07:43:54 +0900 Subject: [PATCH 1720/8282] style: break long line --- system/CodeIgniter.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index f4b319d9a1a4..4fcba3c7e0e7 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -501,7 +501,10 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache } // Skip unnecessary processing for special Responses. - if (! $this->response instanceof DownloadResponse && ! $this->response instanceof RedirectResponse) { + if ( + ! $this->response instanceof DownloadResponse + && ! $this->response instanceof RedirectResponse + ) { // Cache it without the performance metrics replaced // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. From ed70083a88030bc56537825f6d1e49cea8a129d5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 09:23:55 +0900 Subject: [PATCH 1721/8282] docs: deprecated CodeIgniter::$path and CodeIgniter::setPath() --- system/CodeIgniter.php | 8 ++++++-- user_guide_src/source/changelogs/v4.3.0.rst | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 902c98a8f069..6bf5b5046c72 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -130,6 +130,8 @@ class CodeIgniter * Request path to use. * * @var string + * + * @deprecated No longer used. */ protected $path; @@ -789,7 +791,7 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null) /** * Determines the path to use for us to try to route to, based - * on user input (setPath), or the CLI/IncomingRequest path. + * on the CLI/IncomingRequest path. * * @return string */ @@ -806,9 +808,11 @@ protected function determinePath() * Allows the request path to be set from outside the class, * instead of relying on CLIRequest or IncomingRequest for the path. * - * This is primarily used by the Console. + * This is not used now. * * @return $this + * + * @deprecated No longer used. */ public function setPath(string $path) { diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index ec93e937445b..09146748cb21 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -192,6 +192,7 @@ Deprecations - ``RouteCollection::fillRouteParams()`` is deprecated. Use ``RouteCollection::buildReverseRoute()`` instead. - ``BaseBuilder::setUpdateBatch()`` and ``BaseBuilder::setInsertBatch()`` are deprecated. Use ``BaseBuilder::setData()`` instead. - The public property ``Response::$CSP`` is deprecated. It will be protected. Use ``Response::getCSP()`` instead. +- ``CodeIgniter::$path`` and ``CodeIgniter::setPath()`` are deprecated. No longer used. Bugs Fixed ********** From 7aead5dea70df0acbd5ad2ed686fe24435526dff Mon Sep 17 00:00:00 2001 From: ddevsr Date: Mon, 10 Oct 2022 09:28:54 +0700 Subject: [PATCH 1722/8282] refactor: move print_r to interpolate and use clean_path --- system/Log/Logger.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/Log/Logger.php b/system/Log/Logger.php index 515a065647ee..9812cdc73d4f 100644 --- a/system/Log/Logger.php +++ b/system/Log/Logger.php @@ -265,10 +265,6 @@ public function log($level, $message, array $context = []): bool // Parse our placeholders $message = $this->interpolate($message, $context); - if (! is_string($message)) { - $message = print_r($message, true); - } - if ($this->cacheLogs) { $this->logCache[] = [ 'level' => $level, @@ -319,7 +315,7 @@ public function log($level, $message, array $context = []): bool protected function interpolate($message, array $context = []) { if (! is_string($message)) { - return $message; + return print_r($message, true); } // build a replacement array with braces around the context keys @@ -329,7 +325,7 @@ protected function interpolate($message, array $context = []) // Verify that the 'exception' key is actually an exception // or error, both of which implement the 'Throwable' interface. if ($key === 'exception' && $val instanceof Throwable) { - $val = $val->getMessage() . ' ' . $this->cleanFileNames($val->getFile()) . ':' . $val->getLine(); + $val = $val->getMessage() . ' ' . clean_path($val->getFile()) . ':' . $val->getLine(); } // todo - sanitize input before writing to file? From 8bf591be69164eefa787c2da90d3871674ad339b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Oct 2022 13:54:10 +0900 Subject: [PATCH 1723/8282] docs: fix sample code Fix incorrect results. --- user_guide_src/source/incoming/incomingrequest/021.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/incomingrequest/021.php b/user_guide_src/source/incoming/incomingrequest/021.php index 672efa42b02e..558bb6a98e6f 100644 --- a/user_guide_src/source/incoming/incomingrequest/021.php +++ b/user_guide_src/source/incoming/incomingrequest/021.php @@ -7,8 +7,8 @@ echo $uri->getUserInfo(); // snoopy:password echo $uri->getHost(); // example.com echo $uri->getPort(); // 88 -echo $uri->getPath(); // /path/to/page +echo $uri->getPath(); // path/to/page echo $uri->getQuery(); // foo=bar&bar=baz -echo $uri->getSegments(); // ['path', 'to', 'page'] -echo $uri->getSegment(1); // 'path' +print_r($uri->getSegments()); // Array ( [0] => path [1] => to [2] => page ) +echo $uri->getSegment(1); // path echo $uri->getTotalSegments(); // 3 From 280f969f3a811c9c1ebd6c337243efa6c6486ed9 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 6 Oct 2022 21:45:46 +0700 Subject: [PATCH 1724/8282] docs: replace types in Logger tests: increase coverage tests in Logger use dedicated clean_path refactor: implement __toString() in Logger docs: replace param string message to phpdocblock docs: replace param string message to phpdocblock docs: replace types in Logger Co-authored-by: kenjis docs: replace types in Logger docs: replace types in Logger revert refactoring in Logger --- system/Common.php | 2 +- system/Log/Handlers/ChromeLoggerHandler.php | 2 +- system/Log/Logger.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system/Common.php b/system/Common.php index 70bc6105a39a..8df5ece73f75 100644 --- a/system/Common.php +++ b/system/Common.php @@ -782,7 +782,7 @@ function lang(string $line, array $args = [], ?string $locale = null) * - info * - debug * - * @return mixed + * @return bool */ function log_message(string $level, string $message, array $context = []) { diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php index 2ab019d8f6fc..b2c6d28fdfb4 100644 --- a/system/Log/Handlers/ChromeLoggerHandler.php +++ b/system/Log/Handlers/ChromeLoggerHandler.php @@ -128,7 +128,7 @@ public function handle($level, $message): bool /** * Converts the object to display nicely in the Chrome Logger UI. * - * @param mixed $object + * @param array|int|object|string $object * * @return array */ diff --git a/system/Log/Logger.php b/system/Log/Logger.php index 515a065647ee..1bf578ba1a03 100644 --- a/system/Log/Logger.php +++ b/system/Log/Logger.php @@ -243,7 +243,7 @@ public function debug($message, array $context = []): bool /** * Logs with an arbitrary level. * - * @param mixed $level + * @param string $level * @param string $message */ public function log($level, $message, array $context = []): bool @@ -312,9 +312,9 @@ public function log($level, $message, array $context = []): bool * {file} * {line} * - * @param mixed $message + * @param string $message * - * @return mixed + * @return string */ protected function interpolate($message, array $context = []) { From 634e48d35f4e41bb1a778a212499340fe650b5ea Mon Sep 17 00:00:00 2001 From: Dyno Date: Mon, 10 Oct 2022 11:15:49 +0200 Subject: [PATCH 1725/8282] Bug: showError in CLI/BaseCommand use hardcoded error view path Fix #6656 --- system/CLI/BaseCommand.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php index e663adb2e251..12a82a7afaa7 100644 --- a/system/CLI/BaseCommand.php +++ b/system/CLI/BaseCommand.php @@ -119,8 +119,9 @@ protected function showError(Throwable $e) { $exception = $e; $message = $e->getMessage(); + $config = config('Exceptions'); - require APPPATH . 'Views/errors/cli/error_exception.php'; + require $config->errorViewPath . '/cli/error_exception.php'; } /** From 521d83d7980013415747f9e0b796e795d78ebfc8 Mon Sep 17 00:00:00 2001 From: Dyno Date: Mon, 10 Oct 2022 12:14:24 +0200 Subject: [PATCH 1726/8282] GPG Signing From 3d02abcd091b99c7c34aeb90c0beb79e64a37d94 Mon Sep 17 00:00:00 2001 From: Dyno Date: Mon, 10 Oct 2022 12:14:24 +0200 Subject: [PATCH 1727/8282] GPG Signing From d91196185ef130ff0ec2b45685905f6ddb3c2572 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Mon, 10 Oct 2022 21:52:27 +0800 Subject: [PATCH 1728/8282] docs: change string|null to array|bool|float|int|object|string|null --- system/Validation/StrictRules/Rules.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php index bf27ec15e9e0..47dbee9b5ae7 100644 --- a/system/Validation/StrictRules/Rules.php +++ b/system/Validation/StrictRules/Rules.php @@ -46,7 +46,7 @@ public function differs($str, string $field, array $data): bool /** * Equals the static value provided. * - * @param string|null $str + * @param array|bool|float|int|object|string|null $str */ public function equals($str, string $val): 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 string|null $str + * @param array|bool|float|int|object|string|null $str */ public function is_not_unique($str, string $field, array $data): 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 string|null $str + * @param array|bool|float|int|object|string|null $str */ public function is_unique($str, string $field, array $data): bool { @@ -240,7 +240,7 @@ public function min_length($str, string $val): bool /** * Does not equal the static value provided. * - * @param string|null $str + * @param array|bool|float|int|object|string|null $str */ public function not_equals($str, string $val): bool { @@ -285,9 +285,9 @@ public function required($str = null): bool * * required_with[password] * - * @param 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 + * @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 { From da9a6ba2a1ca6d5ec7ccd8bc8e2e3bbb032efaea Mon Sep 17 00:00:00 2001 From: sclubricants Date: Fri, 16 Sep 2022 16:01:05 -0700 Subject: [PATCH 1729/8282] Add ability to set key names for primary, key, and unique key Mysql and Sqlite Forgot to commit this in smaller steps.. --- system/Database/Forge.php | 124 +++++++++++++++-------- system/Database/MySQLi/Forge.php | 30 +++--- system/Database/SQLite3/Forge.php | 39 +------ tests/system/Database/Live/ForgeTest.php | 2 + 4 files changed, 100 insertions(+), 95 deletions(-) diff --git a/system/Database/Forge.php b/system/Database/Forge.php index eabed06ed6ec..282f01f26ec2 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -39,7 +39,7 @@ class Forge /** * List of keys. * - * @var array + * @phpstan-var array{}|list */ protected $keys = []; @@ -51,9 +51,9 @@ class Forge protected $uniqueKeys = []; /** - * List of primary keys. + * Primary keys. * - * @var array + * @phpstan-var array{}|array{fields: string[], keyName: string} */ protected $primaryKeys = []; @@ -309,14 +309,12 @@ public function dropDatabase(string $dbName): bool * * @return Forge */ - public function addKey($key, bool $primary = false, bool $unique = false) + public function addKey($key, bool $primary = false, bool $unique = false, string $keyName = '') { if ($primary) { - foreach ((array) $key as $one) { - $this->primaryKeys[] = $one; - } + $this->primaryKeys = ['fields' => (array) $key, 'keyName' => $keyName]; } else { - $this->keys[] = $key; + $this->keys[] = ['fields' => (array) $key, 'keyName' => $keyName]; if ($unique) { $this->uniqueKeys[] = count($this->keys) - 1; @@ -333,9 +331,9 @@ public function addKey($key, bool $primary = false, bool $unique = false) * * @return Forge */ - public function addPrimaryKey($key) + public function addPrimaryKey($key, string $keyName = '') { - return $this->addKey($key, true); + return $this->addKey($key, true, false, $keyName); } /** @@ -345,9 +343,9 @@ public function addPrimaryKey($key) * * @return Forge */ - public function addUniqueKey($key) + public function addUniqueKey($key, string $keyName = '') { - return $this->addKey($key, false, true); + return $this->addKey($key, false, true, $keyName); } /** @@ -404,11 +402,9 @@ public function addField($field) * @param string|string[] $fieldName * @param string|string[] $tableField * - * @return Forge - * * @throws DatabaseException */ - public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '', string $fkName = '') + public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '', string $fkName = ''): Forge { $fieldName = (array) $fieldName; $tableField = (array) $tableField; @@ -441,17 +437,27 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie /** * Drop Key * - * @return bool - * * @throws DatabaseException */ - public function dropKey(string $table, string $keyName) + public function dropKey(string $table, string $keyName, bool $prefixKeyName = true): bool { - $sql = sprintf( - $this->dropIndexStr, - $this->db->escapeIdentifiers($this->db->DBPrefix . $keyName), - $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - ); + $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName); + $table = $this->db->escapeIdentifiers($this->db->DBPrefix . $table); + $dropKeyAsConstraint = $this->dropKeyAsConstraint($table, $keyName); + + if ($dropKeyAsConstraint === true) { + $sql = sprintf( + $this->dropConstraintStr, + $table, + $keyName, + ); + } else { + $sql = sprintf( + $this->dropIndexStr, + $keyName, + $table, + ); + } if ($sql === '') { if ($this->db->DBDebug) { @@ -464,15 +470,37 @@ public function dropKey(string $table, string $keyName) return $this->db->query($sql); } + /** + * Checks if if key needs to be dropped as a constraint. + */ + protected function dropKeyAsConstraint(string $table, string $constraintName): bool + { + $sql = $this->_dropKeyAsConstraint($table, $constraintName); + + if ($sql === '') { + return false; + } + + return $this->db->query($sql)->getResultArray() !== []; + } + + /** + * Constructs sql to check if key is a constraint. + */ + protected function _dropKeyAsConstraint(string $table, string $constraintName): string + { + return ''; + } + /** * Drop Primary Key */ - public function dropPrimaryKey(string $table): bool + public function dropPrimaryKey(string $table, string $keyName = ''): bool { $sql = sprintf( 'ALTER TABLE %s DROP CONSTRAINT %s', $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - $this->db->escapeIdentifiers('pk_' . $this->db->DBPrefix . $table), + ($keyName === '') ? $this->db->escapeIdentifiers('pk_' . $this->db->DBPrefix . $table) : $this->db->escapeIdentifiers($keyName), ); return $this->db->query($sql); @@ -1016,15 +1044,19 @@ protected function _processPrimaryKeys(string $table): string { $sql = ''; - for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++) { - if (! isset($this->fields[$this->primaryKeys[$i]])) { - unset($this->primaryKeys[$i]); + if (isset($this->primaryKeys['fields'])) { + for ($i = 0, $c = count($this->primaryKeys['fields']); $i < $c; $i++) { + if (! isset($this->fields[$this->primaryKeys['fields'][$i]])) { + unset($this->primaryKeys['fields'][$i]); + } } } - if ($this->primaryKeys !== []) { - $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table) - . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')'; + if (isset($this->primaryKeys['fields']) && $this->primaryKeys['fields'] !== []) { + $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers(($this->primaryKeys['keyName'] === '' ? + 'pk_' . $table : + $this->primaryKeys['keyName'])) + . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys['fields'])) . ')'; } return $sql; @@ -1035,29 +1067,37 @@ protected function _processIndexes(string $table) $sqls = []; for ($i = 0, $c = count($this->keys); $i < $c; $i++) { - $this->keys[$i] = (array) $this->keys[$i]; - - for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) { - if (! isset($this->fields[$this->keys[$i][$i2]])) { - unset($this->keys[$i][$i2]); + for ($i2 = 0, $c2 = count($this->keys[$i]['fields']); $i2 < $c2; $i2++) { + if (! isset($this->fields[$this->keys[$i]['fields'][$i2]])) { + unset($this->keys[$i]['fields'][$i2]); } } - if (count($this->keys[$i]) <= 0) { + if (count($this->keys[$i]['fields']) <= 0) { continue; } + $keyName = $this->db->escapeIdentifiers(($this->keys[$i]['keyName'] === '') ? + $table . '_' . implode('_', $this->keys[$i]['fields']) : + $this->keys[$i]['keyName']); + if (in_array($i, $this->uniqueKeys, true)) { - $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) - . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) - . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')'; + if ($this->db->DBDriver === 'SQLite3') { + $sqls[] = 'CREATE UNIQUE INDEX ' . $keyName + . ' ON ' . $this->db->escapeIdentifiers($table) + . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ')'; + } else { + $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) + . ' ADD CONSTRAINT ' . $keyName + . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ')'; + } continue; } - $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) + $sqls[] = 'CREATE INDEX ' . $keyName . ' ON ' . $this->db->escapeIdentifiers($table) - . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')'; + . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ')'; } return $sqls; diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php index 12aab402d647..6adcbeb9ce64 100644 --- a/system/Database/MySQLi/Forge.php +++ b/system/Database/MySQLi/Forge.php @@ -192,28 +192,28 @@ protected function _processIndexes(string $table): string $sql = ''; for ($i = 0, $c = count($this->keys); $i < $c; $i++) { - if (is_array($this->keys[$i])) { - for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) { - if (! isset($this->fields[$this->keys[$i][$i2]])) { - unset($this->keys[$i][$i2]); + if (isset($this->keys[$i]['fields'])) { + for ($i2 = 0, $c2 = count($this->keys[$i]['fields']); $i2 < $c2; $i2++) { + if (! isset($this->fields[$this->keys[$i]['fields'][$i2]])) { + unset($this->keys[$i]['fields'][$i2]); continue; } } - } elseif (! isset($this->fields[$this->keys[$i]])) { - unset($this->keys[$i]); - - continue; } - if (! is_array($this->keys[$i])) { - $this->keys[$i] = [$this->keys[$i]]; + if (! is_array($this->keys[$i]['fields'])) { + $this->keys[$i]['fields'] = [$this->keys[$i]['fields']]; } $unique = in_array($i, $this->uniqueKeys, true) ? 'UNIQUE ' : ''; - $sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i])) - . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')'; + $keyName = $this->db->escapeIdentifiers(($this->keys[$i]['keyName'] === '') ? + implode('_', $this->keys[$i]['fields']) : + $this->keys[$i]['keyName']); + + $sql .= ",\n\t{$unique}KEY " . $keyName + . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ')'; } $this->keys = []; @@ -223,10 +223,8 @@ protected function _processIndexes(string $table): string /** * Drop Key - * - * @return bool */ - public function dropKey(string $table, string $keyName) + public function dropKey(string $table, string $keyName, bool $prefixKeyName = true): bool { $sql = sprintf( $this->dropIndexStr, @@ -240,7 +238,7 @@ public function dropKey(string $table, string $keyName) /** * Drop Primary Key */ - public function dropPrimaryKey(string $table): bool + public function dropPrimaryKey(string $table, string $keyName = ''): bool { $sql = sprintf( 'ALTER TABLE %s DROP PRIMARY KEY', diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php index 5538777f610b..0de70960fc0a 100644 --- a/system/Database/SQLite3/Forge.php +++ b/system/Database/SQLite3/Forge.php @@ -156,41 +156,6 @@ protected function _processColumn(array $field): string . $field['default']; } - /** - * Process indexes - */ - protected function _processIndexes(string $table): array - { - $sqls = []; - - for ($i = 0, $c = count($this->keys); $i < $c; $i++) { - $this->keys[$i] = (array) $this->keys[$i]; - - for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) { - if (! isset($this->fields[$this->keys[$i][$i2]])) { - unset($this->keys[$i][$i2]); - } - } - if (count($this->keys[$i]) <= 0) { - continue; - } - - if (in_array($i, $this->uniqueKeys, true)) { - $sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) - . ' ON ' . $this->db->escapeIdentifiers($table) - . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');'; - - continue; - } - - $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) - . ' ON ' . $this->db->escapeIdentifiers($table) - . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');'; - } - - return $sqls; - } - /** * Field attribute TYPE * @@ -254,7 +219,7 @@ public function dropForeignKey(string $table, string $foreignName): bool /** * Drop Primary Key */ - public function dropPrimaryKey(string $table): bool + public function dropPrimaryKey(string $table, string $keyName = ''): bool { $sqlTable = new Table($this->db, $this); @@ -263,7 +228,7 @@ public function dropPrimaryKey(string $table): bool ->run(); } - public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '', string $fkName = '') + public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '', string $fkName = ''): BaseForge { if ($fkName === '') { return parent::addForeignKey($fieldName, $tableName, $tableField, $onUpdate, $onDelete, $fkName); diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 978550939b09..cc709c0fe5df 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -1047,6 +1047,8 @@ public function testAddFields() public function testCompositeKey() { + $this->forge->dropTable('forge_test_1', true); + $this->forge->addField([ 'id' => [ 'type' => 'INTEGER', From e53c0eb92e770846b37d5e0180a86b65acb72336 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 11:44:33 -0700 Subject: [PATCH 1730/8282] Add index name to sqlsrv --- system/Database/MySQLi/Forge.php | 2 ++ system/Database/SQLSRV/Forge.php | 38 ++++++++++++++++++------------- system/Database/SQLite3/Forge.php | 2 ++ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php index 6adcbeb9ce64..b3069f2b4cb7 100644 --- a/system/Database/MySQLi/Forge.php +++ b/system/Database/MySQLi/Forge.php @@ -237,6 +237,8 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr /** * Drop Primary Key + * + * @param mixed $keyName */ public function dropPrimaryKey(string $table, string $keyName = ''): bool { diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index e9625018cb00..b1b54e02c207 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -250,31 +250,35 @@ protected function _processIndexes(string $table) $sqls = []; for ($i = 0, $c = count($this->keys); $i < $c; $i++) { - $this->keys[$i] = (array) $this->keys[$i]; + $this->keys[$i]['fields'] = (array) $this->keys[$i]['fields']; - for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) { - if (! isset($this->fields[$this->keys[$i][$i2]])) { - unset($this->keys[$i][$i2]); + for ($i2 = 0, $c2 = count($this->keys[$i]['fields']); $i2 < $c2; $i2++) { + if (! isset($this->fields[$this->keys[$i]['fields'][$i2]])) { + unset($this->keys[$i]['fields'][$i2]); } } - if (count($this->keys[$i]) <= 0) { + if (count($this->keys[$i]['fields']) <= 0) { continue; } + $keyName = ($this->keys[$i]['keyName'] === '') ? + $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]['fields'])) : + $this->db->escapeIdentifiers($this->keys[$i]['keyName']); + if (in_array($i, $this->uniqueKeys, true)) { $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table) - . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) - . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');'; + . ' ADD CONSTRAINT ' . $keyName + . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ');'; continue; } $sqls[] = 'CREATE INDEX ' - . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i])) + . $keyName . ' ON ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table) - . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');'; + . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i]['fields'])) . ');'; } return $sqls; @@ -300,15 +304,17 @@ protected function _processColumn(array $field): string */ protected function _processPrimaryKeys(string $table): string { - for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++) { - if (! isset($this->fields[$this->primaryKeys[$i]])) { - unset($this->primaryKeys[$i]); + if (isset($this->primaryKeys['fields'])) { + for ($i = 0, $c = count($this->primaryKeys['fields']); $i < $c; $i++) { + if (! isset($this->fields[$this->primaryKeys['fields'][$i]])) { + unset($this->primaryKeys['fields'][$i]); + } } - } - if ($this->primaryKeys !== []) { - $sql = ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table) - . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')'; + if ($this->primaryKeys['fields'] !== []) { + $sql = ",\n\tCONSTRAINT " . ($this->primaryKeys['keyName'] === '' ? $this->db->escapeIdentifiers('pk_' . $table) : $this->primaryKeys['keyName']) + . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys['fields'])) . ')'; + } } return $sql ?? ''; diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php index 0de70960fc0a..0098bc250cf7 100644 --- a/system/Database/SQLite3/Forge.php +++ b/system/Database/SQLite3/Forge.php @@ -218,6 +218,8 @@ public function dropForeignKey(string $table, string $foreignName): bool /** * Drop Primary Key + * + * @param mixed $keyName */ public function dropPrimaryKey(string $table, string $keyName = ''): bool { From 63a969ef137615ae195c4879588b12af434bcefe Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 12:27:09 -0700 Subject: [PATCH 1731/8282] Add index name to OCI8 --- system/Database/OCI8/Forge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 8acbd246c063..5c9b549fe2bc 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -186,7 +186,7 @@ protected function _processColumn(array $field): string . ' IN ' . $field['length'] . ')'; $field['length'] = '(' . max(array_map('mb_strlen', explode("','", mb_substr($field['length'], 2, -2)))) . ')' . $constraint; - } elseif (count($this->primaryKeys) === 1 && $field['name'] === $this->primaryKeys[0]) { + } elseif (isset($this->primaryKeys['fields']) && count($this->primaryKeys['fields']) === 1 && $field['name'] === $this->primaryKeys['fields'][0]) { $field['unique'] = ''; } From 3ad29908b91e3be9c88cdeac6a5c933502e7f862 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 14:19:57 -0700 Subject: [PATCH 1732/8282] Created dropKey() methohd for OCI8 Some keys such as unique indexes are created as constraints. This looks to see if there is a constraint by the index name. If there is then we will drop constraint else we drop index. --- system/Database/OCI8/Forge.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 5c9b549fe2bc..15cb77f6b54a 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -279,4 +279,14 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade) return $sql; } + + /** + * Constructs sql to check if key is a constraint. + */ + protected function _dropKeyAsConstraint(string $table, string $constraintName): string + { + return "SELECT constraint_name FROM all_constraints WHERE table_name = '" + . trim($table, '"') . "' AND index_name = '" + . trim($constraintName, '"') . "'"; + } } From 6d8648f6231645b66027c72950bd55b2da2bdec0 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 14:43:57 -0700 Subject: [PATCH 1733/8282] Add prefixKeyName to mysql dropKey() --- system/Database/MySQLi/Forge.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php index b3069f2b4cb7..6adcbeb9ce64 100644 --- a/system/Database/MySQLi/Forge.php +++ b/system/Database/MySQLi/Forge.php @@ -237,8 +237,6 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr /** * Drop Primary Key - * - * @param mixed $keyName */ public function dropPrimaryKey(string $table, string $keyName = ''): bool { From d47d1ebbf63c2092618e0c934da7e3d5e0e9cfb0 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 15:28:02 -0700 Subject: [PATCH 1734/8282] Add dropKey() to postgres Same as oracle - this looks up if key is a constraint --- system/Database/Postgre/Forge.php | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php index 6791da6169fa..cb757acebc6e 100644 --- a/system/Database/Postgre/Forge.php +++ b/system/Database/Postgre/Forge.php @@ -190,4 +190,56 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str return $sql; } + + /** + * Drop Key + * + * @param mixed $prefixKeyName + * + * @return bool + * + * @throws DatabaseException + */ + public function dropKey(string $table, string $keyName, bool $prefixKeyName = true) + { + $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName); + + // check if key is a constraint + $sql = "SELECT con.conname + FROM pg_catalog.pg_constraint con + INNER JOIN pg_catalog.pg_class rel + ON rel.oid = con.conrelid + INNER JOIN pg_catalog.pg_namespace nsp + ON nsp.oid = connamespace + WHERE nsp.nspname = '{$this->db->schema}' + AND rel.relname = '" . $this->db->DBPrefix . $table . "' + AND con.conname = '" . trim($keyName, '"') . "'"; + + $constraint = $this->db->query($sql)->getResultArray(); + + $sql = sprintf( + $this->dropIndexStr, + $keyName, + $this->db->escapeIdentifiers($this->db->DBPrefix . $table), + ); + + if (count($constraint) !== 0) { + $sqlString = $this->dropConstraintStr; + $sql = sprintf( + $this->dropConstraintStr, + $this->db->escapeIdentifiers($this->db->DBPrefix . $table), + $keyName, + ); + } + + if ($sql === '') { + if ($this->db->DBDebug) { + throw new DatabaseException('This feature is not available for the database you are using.'); + } + + return false; + } + + return $this->db->query($sql); + } } From b34c15110f3d0880ce9da5194828da67905c8d40 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 15:55:26 -0700 Subject: [PATCH 1735/8282] Fix SQLite Table class to use index names --- system/Database/SQLite3/Table.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php index 2c142086a1d5..e1e0d8aad6e6 100644 --- a/system/Database/SQLite3/Table.php +++ b/system/Database/SQLite3/Table.php @@ -261,18 +261,18 @@ protected function createTable() // Unique/Index keys if (is_array($this->keys)) { - foreach ($this->keys as $key) { + foreach ($this->keys as $i => $key) { switch ($key['type']) { case 'primary': $this->forge->addPrimaryKey($key['fields']); break; case 'unique': - $this->forge->addUniqueKey($key['fields']); + $this->forge->addUniqueKey($key['fields'], $i); break; case 'index': - $this->forge->addKey($key['fields']); + $this->forge->addKey($key['fields'], false, false, $i); break; } } From 83382bb001e263c97509fe2d24b4900305381c45 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 16:09:36 -0700 Subject: [PATCH 1736/8282] Add dropKey() to SQLSRV Have to lookup if key is constraint. --- system/Database/SQLSRV/Forge.php | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index b1b54e02c207..8b34eaabd038 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -391,4 +391,50 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str return $sql; } + + /** + * Drop Key + * + * @param mixed $prefixKeyName + * + * @return bool + * + * @throws DatabaseException + */ + public function dropKey(string $table, string $keyName, bool $prefixKeyName = true) + { + $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName); + + // check if key is a constraint + $sql = "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS + WHERE TABLE_NAME= '" . $this->db->DBPrefix . $table . "' + AND CONSTRAINT_NAME = '" . trim($keyName, '"') . "'"; + + $constraint = $this->db->query($sql)->getResultArray(); + + $sql = sprintf( + $this->dropIndexStr, + $keyName, + $this->db->escapeIdentifiers($this->db->DBPrefix . $table), + ); + + if (count($constraint) !== 0) { + $sqlString = $this->dropConstraintStr; + $sql = sprintf( + $this->dropConstraintStr, + $this->db->escapeIdentifiers($this->db->DBPrefix . $table), + $keyName, + ); + } + + if ($sql === '') { + if ($this->db->DBDebug) { + throw new DatabaseException('This feature is not available for the database you are using.'); + } + + return false; + } + + return $this->db->query($sql); + } } From a3faf8fea3a61166053a6587b6bbc57fef129824 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 16:29:05 -0700 Subject: [PATCH 1737/8282] Add test This test adding custom names but also test removing them by custom names. --- tests/system/Database/Live/ForgeTest.php | 64 ++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index cc709c0fe5df..1346cfa1e1e0 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -1140,6 +1140,70 @@ public function testCompositeKey() $this->forge->dropTable('forge_test_1', true); } + public function testSetKeyNames() + { + $this->forge->dropTable('forge_test_1', true); + + $this->forge->addField([ + 'id' => [ + 'type' => 'INTEGER', + 'constraint' => 3, + 'auto_increment' => true, + ], + 'code' => [ + 'type' => 'VARCHAR', + 'constraint' => 40, + ], + 'company' => [ + 'type' => 'VARCHAR', + 'constraint' => 40, + ], + 'active' => [ + 'type' => 'INTEGER', + 'constraint' => 1, + ], + ]); + + $pk = 'my_custom_pk'; + $index = 'my_custom_index'; + $uniqueIndex = 'my_custom_unique_index'; + + if ($this->db->DBDriver === 'MySQLi' || $this->db->DBDriver === 'SQLite3') { + $pk = 'PRIMARY'; + } + + $this->forge->addPrimaryKey('id', $pk); + $this->forge->addKey(['code', 'company'], false, false, $index); + $this->forge->addUniqueKey(['code', 'active'], $uniqueIndex); + $this->forge->createTable('forge_test_1', true); + + $keys = $this->db->getIndexData('forge_test_1'); + + // mysql must redefine auto increment which can only exist on a key + if ($this->db->DBDriver === 'MySQLi') { + $id = [ + 'id' => [ + 'name' => 'id', + 'type' => 'INTEGER', + 'constraint' => 3, + ], + ]; + $this->forge->modifyColumn('forge_test_1', $id); + } + + $this->assertSame($keys[$pk]->name, $pk); + $this->assertSame($keys[$index]->name, $index); + $this->assertSame($keys[$uniqueIndex]->name, $uniqueIndex); + + $this->forge->dropPrimaryKey('forge_test_1', $pk); + $this->forge->dropKey('forge_test_1', $index, false); + $this->forge->dropKey('forge_test_1', $uniqueIndex, false); + + $this->assertCount(0, $this->db->getIndexData('forge_test_1')); + + $this->forge->dropTable('forge_test_1', true); + } + public function testDropColumn() { $this->forge->dropTable('forge_test_two', true); From 9eff2f1a91e668f46a58194653e47a32c512a801 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 17:46:53 -0700 Subject: [PATCH 1738/8282] Fix phpstan --- system/Database/Postgre/Forge.php | 24 ++++++++++++++++++------ system/Database/SQLSRV/Forge.php | 8 +++----- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php index cb757acebc6e..bcad20d5fcf7 100644 --- a/system/Database/Postgre/Forge.php +++ b/system/Database/Postgre/Forge.php @@ -11,6 +11,8 @@ namespace CodeIgniter\Database\Postgre; +use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge as BaseForge; /** @@ -65,6 +67,19 @@ class Forge extends BaseForge */ protected $null = 'NULL'; + /** + * @var Connection + */ + protected $db; + + /** + * Constructor. + */ + public function __construct(BaseConnection $db) + { + parent::__construct($db); + } + /** * CREATE TABLE attributes * @@ -194,8 +209,6 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str /** * Drop Key * - * @param mixed $prefixKeyName - * * @return bool * * @throws DatabaseException @@ -214,7 +227,7 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr WHERE nsp.nspname = '{$this->db->schema}' AND rel.relname = '" . $this->db->DBPrefix . $table . "' AND con.conname = '" . trim($keyName, '"') . "'"; - + $constraint = $this->db->query($sql)->getResultArray(); $sql = sprintf( @@ -223,9 +236,8 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr $this->db->escapeIdentifiers($this->db->DBPrefix . $table), ); - if (count($constraint) !== 0) { - $sqlString = $this->dropConstraintStr; - $sql = sprintf( + if ($constraint !== []) { + $sql = sprintf( $this->dropConstraintStr, $this->db->escapeIdentifiers($this->db->DBPrefix . $table), $keyName, diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index 8b34eaabd038..a75eff49f90f 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Database\SQLSRV; use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge as BaseForge; /** @@ -395,8 +396,6 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str /** * Drop Key * - * @param mixed $prefixKeyName - * * @return bool * * @throws DatabaseException @@ -418,9 +417,8 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr $this->db->escapeIdentifiers($this->db->DBPrefix . $table), ); - if (count($constraint) !== 0) { - $sqlString = $this->dropConstraintStr; - $sql = sprintf( + if ($constraint !== []) { + $sql = sprintf( $this->dropConstraintStr, $this->db->escapeIdentifiers($this->db->DBPrefix . $table), $keyName, From 3907420c0716fb03bb4c0c061abcd7679105e04d Mon Sep 17 00:00:00 2001 From: sclubricants Date: Sun, 18 Sep 2022 17:54:45 -0700 Subject: [PATCH 1739/8282] Fix rector --- system/Database/Postgre/Forge.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php index bcad20d5fcf7..f2257fca620b 100644 --- a/system/Database/Postgre/Forge.php +++ b/system/Database/Postgre/Forge.php @@ -11,7 +11,6 @@ namespace CodeIgniter\Database\Postgre; -use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge as BaseForge; @@ -72,14 +71,6 @@ class Forge extends BaseForge */ protected $db; - /** - * Constructor. - */ - public function __construct(BaseConnection $db) - { - parent::__construct($db); - } - /** * CREATE TABLE attributes * From 5c51465533c263f367f25c8dfcc051eeaeafad0f Mon Sep 17 00:00:00 2001 From: sclubricants Date: Mon, 19 Sep 2022 14:38:12 -0700 Subject: [PATCH 1740/8282] Refactor dropKey() Get rid of CPD error --- system/Database/Postgre/Forge.php | 44 ++++--------------------------- system/Database/SQLSRV/Forge.php | 44 ++++--------------------------- 2 files changed, 10 insertions(+), 78 deletions(-) diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php index f2257fca620b..662fbe666595 100644 --- a/system/Database/Postgre/Forge.php +++ b/system/Database/Postgre/Forge.php @@ -11,7 +11,6 @@ namespace CodeIgniter\Database\Postgre; -use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge as BaseForge; /** @@ -198,51 +197,18 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str } /** - * Drop Key - * - * @return bool - * - * @throws DatabaseException + * Constructs sql to check if key is a constraint. */ - public function dropKey(string $table, string $keyName, bool $prefixKeyName = true) + protected function _dropKeyAsConstraint(string $table, string $constraintName): string { - $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName); - - // check if key is a constraint - $sql = "SELECT con.conname + return "SELECT con.conname FROM pg_catalog.pg_constraint con INNER JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid INNER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = connamespace WHERE nsp.nspname = '{$this->db->schema}' - AND rel.relname = '" . $this->db->DBPrefix . $table . "' - AND con.conname = '" . trim($keyName, '"') . "'"; - - $constraint = $this->db->query($sql)->getResultArray(); - - $sql = sprintf( - $this->dropIndexStr, - $keyName, - $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - ); - - if ($constraint !== []) { - $sql = sprintf( - $this->dropConstraintStr, - $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - $keyName, - ); - } - - if ($sql === '') { - if ($this->db->DBDebug) { - throw new DatabaseException('This feature is not available for the database you are using.'); - } - - return false; - } - - return $this->db->query($sql); + AND rel.relname = '" . trim($table, '"') . "' + AND con.conname = '" . trim($constraintName, '"') . "'"; } } diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php index a75eff49f90f..f6079ad3363b 100755 --- a/system/Database/SQLSRV/Forge.php +++ b/system/Database/SQLSRV/Forge.php @@ -12,7 +12,6 @@ namespace CodeIgniter\Database\SQLSRV; use CodeIgniter\Database\BaseConnection; -use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge as BaseForge; /** @@ -394,45 +393,12 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade): str } /** - * Drop Key - * - * @return bool - * - * @throws DatabaseException + * Constructs sql to check if key is a constraint. */ - public function dropKey(string $table, string $keyName, bool $prefixKeyName = true) + protected function _dropKeyAsConstraint(string $table, string $constraintName): string { - $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName); - - // check if key is a constraint - $sql = "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS - WHERE TABLE_NAME= '" . $this->db->DBPrefix . $table . "' - AND CONSTRAINT_NAME = '" . trim($keyName, '"') . "'"; - - $constraint = $this->db->query($sql)->getResultArray(); - - $sql = sprintf( - $this->dropIndexStr, - $keyName, - $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - ); - - if ($constraint !== []) { - $sql = sprintf( - $this->dropConstraintStr, - $this->db->escapeIdentifiers($this->db->DBPrefix . $table), - $keyName, - ); - } - - if ($sql === '') { - if ($this->db->DBDebug) { - throw new DatabaseException('This feature is not available for the database you are using.'); - } - - return false; - } - - return $this->db->query($sql); + return "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS + WHERE TABLE_NAME= '" . trim($table, '"') . "' + AND CONSTRAINT_NAME = '" . trim($constraintName, '"') . "'"; } } From f6fb1689659929ade8d949009f63e101f53c61e7 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Mon, 19 Sep 2022 15:53:19 -0700 Subject: [PATCH 1741/8282] Added documentation --- user_guide_src/source/changelogs/v4.3.0.rst | 12 ++++---- user_guide_src/source/dbmgmt/forge.rst | 33 +++++++++++++++++---- user_guide_src/source/dbmgmt/forge/010.php | 8 ++--- user_guide_src/source/dbmgmt/forge/020.php | 5 ++-- 4 files changed, 42 insertions(+), 16 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 09146748cb21..ade238a16437 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -46,7 +46,6 @@ Others - ``CITestStreamFilter::$buffer = ''`` no longer causes the filter to be registered to listen for streams. Now there is a ``CITestStreamFilter::registration()`` method for this. See :ref:`upgrade-430-stream-filter` for details. - The data structure returned by :ref:`BaseConnection::getForeignKeyData() ` has been changed. -- :php:func:`script_tag()` and :php:func:`safe_mailto()` no longer output ``type="text/javascript"`` in ``' . '' - . '' + . '' . $kintScript . PHP_EOL; diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index aae7fc6a81a1..7c0d5336a5d4 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -18,7 +18,7 @@ * @var \CodeIgniter\View\Parser $parser */ ?> - @@ -264,7 +264,7 @@ setData($config)->render('_config.tpl') ?>
      -'; + $body = str_ireplace('', $style . '', $body); + } + $response->setBody($body); } From 87a677efd950d9cce7902254de9d21c18820d722 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 14:28:01 +0900 Subject: [PATCH 2757/8282] docs: fix section level --- user_guide_src/source/libraries/honeypot.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst index cdaa4eb1eb52..4b49e4c85b19 100644 --- a/user_guide_src/source/libraries/honeypot.rst +++ b/user_guide_src/source/libraries/honeypot.rst @@ -1,6 +1,6 @@ -===================== +############## Honeypot Class -===================== +############## The Honeypot Class makes it possible to determine when a Bot makes a request to a CodeIgniter4 application, if it's enabled in ``Application\Config\Filters.php`` file. This is done by attaching form fields to any form, @@ -11,8 +11,9 @@ assumed the request is coming from a Bot, and you can throw a ``HoneypotExceptio :local: :depth: 2 +***************** Enabling Honeypot -===================== +***************** To enable a Honeypot, changes have to be made to the **app/Config/Filters.php**. Just uncomment honeypot from the ``$globals`` array, like: @@ -23,8 +24,9 @@ A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``. If it is not suitable, make your own at ``app/Filters/Honeypot.php``, and modify the ``$aliases`` in the configuration appropriately. +******************** Customizing Honeypot -===================== +******************** Honeypot can be customized. The fields below can be set either in **app/Config/Honeypot.php** or in **.env**. From 53380f4ba830e98096dc9dc9585617db17bf43fb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 14:28:48 +0900 Subject: [PATCH 2758/8282] docs: fix text decoration --- user_guide_src/source/libraries/honeypot.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst index 4b49e4c85b19..643c7044282d 100644 --- a/user_guide_src/source/libraries/honeypot.rst +++ b/user_guide_src/source/libraries/honeypot.rst @@ -3,7 +3,7 @@ Honeypot Class ############## The Honeypot Class makes it possible to determine when a Bot makes a request to a CodeIgniter4 application, -if it's enabled in ``Application\Config\Filters.php`` file. This is done by attaching form fields to any form, +if it's enabled in **app\Config\Filters.php** file. This is done by attaching form fields to any form, and this form field is hidden from a human but accessible to a Bot. When data is entered into the field, it's assumed the request is coming from a Bot, and you can throw a ``HoneypotException``. @@ -20,8 +20,8 @@ from the ``$globals`` array, like: .. literalinclude:: honeypot/001.php -A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``. -If it is not suitable, make your own at ``app/Filters/Honeypot.php``, +A sample Honeypot filter is bundled, as **system/Filters/Honeypot.php**. +If it is not suitable, make your own at **app/Filters/Honeypot.php**, and modify the ``$aliases`` in the configuration appropriately. ******************** @@ -31,7 +31,7 @@ Customizing Honeypot Honeypot can be customized. The fields below can be set either in **app/Config/Honeypot.php** or in **.env**. -* ``hidden`` - true|false to control visibility of the honeypot field; default is ``true`` -* ``label`` - HTML label for the honeypot field, default is 'Fill This Field' -* ``name`` - name of the HTML form field used for the template; default is 'honeypot' -* ``template`` - form field template used for the honeypot; default is '' +* ``$hidden`` - ``true`` or ``false`` to control visibility of the honeypot field; default is ``true`` +* ``$label`` - HTML label for the honeypot field, default is ``'Fill This Field'`` +* ``$name`` - name of the HTML form field used for the template; default is ``'honeypot'`` +* ``$template`` - form field template used for the honeypot; default is ``''`` From 0c25173cb119c20d2752600ea4f55c3f1432efab Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 14:38:51 +0900 Subject: [PATCH 2759/8282] docs: update sample Config file --- user_guide_src/source/libraries/honeypot/001.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php index f0dbf7e64d57..573010145976 100644 --- a/user_guide_src/source/libraries/honeypot/001.php +++ b/user_guide_src/source/libraries/honeypot/001.php @@ -6,14 +6,18 @@ class Filters extends BaseConfig { + // ... + public $globals = [ 'before' => [ 'honeypot', // 'csrf', + // 'invalidchars', ], 'after' => [ 'toolbar', 'honeypot', + // 'secureheaders', ], ]; From 184dd467955453c4f92006889c83f4cdeceb8c74 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 14:34:01 +0900 Subject: [PATCH 2760/8282] docs: add config items --- user_guide_src/source/libraries/honeypot.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst index 643c7044282d..e034e0dc08db 100644 --- a/user_guide_src/source/libraries/honeypot.rst +++ b/user_guide_src/source/libraries/honeypot.rst @@ -35,3 +35,6 @@ Honeypot can be customized. The fields below can be set either in * ``$label`` - HTML label for the honeypot field, default is ``'Fill This Field'`` * ``$name`` - name of the HTML form field used for the template; default is ``'honeypot'`` * ``$template`` - form field template used for the honeypot; default is ``''`` +* ``$container`` - container tag for the template; default is ``'
      {template}
      '``. + If you enables CSP, you can remove ``style="display:none"``. +* ``$containerId`` - [Since v4.3.0] this setting is used only when you enables CSP. You can change the id attribute for the container tag; default is ``'hpc'`` From ee49833c035cc36c2e076bdbc630de75c711afc9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 15:15:29 +0900 Subject: [PATCH 2761/8282] docs: add changelog and upgrading guide --- user_guide_src/source/changelogs/v4.3.0.rst | 2 ++ user_guide_src/source/installation/upgrade_430.rst | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 7fdb8038d6d4..4ea3b567cf68 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -291,6 +291,7 @@ The following items are affected: - Typography class: Creation of ``br`` tag - View Parser: The ``nl2br`` filter +- Honeypot: ``input`` tag - Form helper - HTML helper - Common Functions @@ -364,3 +365,4 @@ Bugs Fixed - Fixed a bug when all types of ``Prepared Queries`` were returning a ``Result`` object instead of a bool value for write-type queries. - Fixed a bug with variable filtering in JSON requests using with ``IncomingRequest::getVar()`` or ``IncomingRequest::getJsonVar()`` methods. - Fixed a bug when variable type may be changed when using a specified index with ``IncomingRequest::getVar()`` or ``IncomingRequest::getJsonVar()`` methods. +- Fixed a bug that Honeypot field appears when CSP is enabled. See also :ref:`upgrade-430-honeypot-and-csp`. diff --git a/user_guide_src/source/installation/upgrade_430.rst b/user_guide_src/source/installation/upgrade_430.rst index 5d7192822c31..04f44a03f4b4 100644 --- a/user_guide_src/source/installation/upgrade_430.rst +++ b/user_guide_src/source/installation/upgrade_430.rst @@ -216,6 +216,16 @@ Database - The ``Model::update()`` method now raises a ``DatabaseException`` if it generates an SQL statement without a WHERE clause. If you need to update all records in a table, use Query Builder instead. E.g., ``$model->builder()->update($data)``. +.. _upgrade-430-honeypot-and-csp: + +Honeypot and CSP +================ + +When CSP is enabled, id attribute ``id="hpc"`` will be injected into the container tag +for the Honeypot field to hide the field. If the id is already used in your views, you need to change it +with ``Config\Honeypot::$containerId``. +And you can remove ``style="display:none"`` in ``Config\Honeypot::$container``. + Others ====== @@ -260,6 +270,10 @@ Config - app/Config/Exceptions.php - Two additional public properties were added: ``$logDeprecations`` and ``$deprecationLogLevel``. See See :ref:`logging_deprecation_warnings` for details. +- app/Config/Honeypot.php + - The new property ``$containerId`` is added to set id attribute value for the container tag + when CSP is enabled. + - The ``input`` tag in the property ``$template`` value has been changed to HTML5 compatible. - app/Config/Logger.php - The property ``$threshold`` has been changed to ``9`` in other than ``production`` environment. From 221b9ac1df24a045b3140035eadf3cccbb73f6f4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 15:18:44 +0900 Subject: [PATCH 2762/8282] test: use aliasing with use operator --- tests/system/Honeypot/HoneypotTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 5b9c0c0073d8..7a6f2341dd1c 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -18,6 +18,7 @@ use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; +use Config\Honeypot as HoneypotConfig; /** * @backupGlobals enabled @@ -28,7 +29,7 @@ */ final class HoneypotTest extends CIUnitTestCase { - private \Config\Honeypot $config; + private HoneypotConfig $config; private Honeypot $honeypot; /** @@ -41,7 +42,7 @@ final class HoneypotTest extends CIUnitTestCase protected function setUp(): void { parent::setUp(); - $this->config = new \Config\Honeypot(); + $this->config = new HoneypotConfig(); $this->honeypot = new Honeypot($this->config); unset($_POST[$this->config->name]); @@ -147,7 +148,7 @@ public function testHoneypotFilterAfter() public function testEmptyConfigContainer() { - $config = new \Config\Honeypot(); + $config = new HoneypotConfig(); $config->container = ''; $honeypot = new Honeypot($config); @@ -159,7 +160,7 @@ public function testEmptyConfigContainer() public function testNoTemplateConfigContainer() { - $config = new \Config\Honeypot(); + $config = new HoneypotConfig(); $config->container = '
      '; $honeypot = new Honeypot($config); From 3c339cd045c027ced37002cac7b43056c24153d2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 15:20:42 +0900 Subject: [PATCH 2763/8282] test: update expected --- tests/system/Honeypot/HoneypotTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 7a6f2341dd1c..167d41e080d3 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -67,13 +67,13 @@ public function testAttachHoneypotAndContainer() { $this->response->setBody('
      '); $this->honeypot->attachHoneypot($this->response); - $expected = '
      '; + $expected = '
      '; $this->assertSame($expected, $this->response->getBody()); $this->config->container = ''; $this->response->setBody('
      '); $this->honeypot->attachHoneypot($this->response); - $expected = '
      '; + $expected = '
      '; $this->assertSame($expected, $this->response->getBody()); } From 4643580f5b9c821b6337feba499c2abf7fdde609 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 15:48:52 +0900 Subject: [PATCH 2764/8282] test: add test --- tests/system/Honeypot/HoneypotTest.php | 27 ++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 167d41e080d3..b87ce3fe3c48 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Honeypot; +use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Filters\Filters; use CodeIgniter\Honeypot\Exceptions\HoneypotException; @@ -18,6 +19,7 @@ use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; +use Config\App; use Config\Honeypot as HoneypotConfig; /** @@ -42,14 +44,16 @@ final class HoneypotTest extends CIUnitTestCase protected function setUp(): void { parent::setUp(); + $this->config = new HoneypotConfig(); $this->honeypot = new Honeypot($this->config); unset($_POST[$this->config->name]); $_SERVER['REQUEST_METHOD'] = 'POST'; $_POST[$this->config->name] = 'hey'; - $this->request = Services::request(null, false); - $this->response = Services::response(); + + $this->request = Services::request(null, false); + $this->response = Services::response(); } public function testAttachHoneypot() @@ -77,6 +81,25 @@ public function testAttachHoneypotAndContainer() $this->assertSame($expected, $this->response->getBody()); } + public function testAttachHoneypotAndContainerWithCSP() + { + $this->resetServices(); + + $config = new App(); + $config->CSPEnabled = true; + Factories::injectMock('config', 'App', $config); + $this->response = Services::response($config, false); + + $this->config = new HoneypotConfig(); + $this->honeypot = new Honeypot($this->config); + + $this->response->setBody('
      '); + $this->honeypot->attachHoneypot($this->response); + + $regex = '!
      !u'; + $this->assertMatchesRegularExpression($regex, $this->response->getBody()); + } + public function testHasntContent() { unset($_POST[$this->config->name]); From 52ac433989db19a6defda17b97913092d94a4d3b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 17:15:27 +0900 Subject: [PATCH 2765/8282] fix: ValueError on CLI [ValueError] The arguments array must contain 4 items, 1 given at SYSTEMPATH/HTTP/RequestTrait.php:121 --- system/HTTP/RequestTrait.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 8c6307bde5fa..2dbc05671797 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -73,6 +73,11 @@ public function getIPAddress(): string $this->ipAddress = $this->getServer('REMOTE_ADDR'); + // If this is a CLI request, $this->ipAddress is null. + if ($this->ipAddress === null) { + return $this->ipAddress = '0.0.0.0'; + } + if ($proxyIPs) { // @TODO Extract all this IP address logic to another class. foreach ($proxyIPs as $proxyIP => $header) { From 2c6109170a90327c364cbd3ba9fc9a10f9e5b188 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 17:16:34 +0900 Subject: [PATCH 2766/8282] refactor: $this->ipAddress is never emtpy Because empty values do not pass the validation. --- system/HTTP/RequestTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 2dbc05671797..5dc0359b3488 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -44,7 +44,7 @@ trait RequestTrait /** * Gets the user's IP address. * - * @return string IP address if it can be detected, or empty string. + * @return string IP address if it can be detected. * If the IP address is not a valid IP address, * then will return '0.0.0.0'. */ @@ -156,7 +156,7 @@ public function getIPAddress(): string return $this->ipAddress = '0.0.0.0'; } - return empty($this->ipAddress) ? '' : $this->ipAddress; + return $this->ipAddress; } /** From 445438088d36b047e082e6c22a90e0f62b26d300 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Dec 2022 17:18:25 +0900 Subject: [PATCH 2767/8282] docs: fix incorrect description null is not a valid IP address, so it will be 0.0.0.0. --- user_guide_src/source/incoming/request.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst index 0b6128a4bd19..8f2b52c67815 100644 --- a/user_guide_src/source/incoming/request.rst +++ b/user_guide_src/source/incoming/request.rst @@ -19,8 +19,8 @@ Class Reference .. php:method:: getIPAddress() - :returns: The user's IP Address, if it can be detected, or null. If the IP address - is not a valid IP address, then will return 0.0.0.0 + :returns: The user's IP Address, if it can be detected. If the IP address + is not a valid IP address, then will return 0.0.0.0. :rtype: string Returns the IP address for the current user. If the IP address is not valid, the method From 4a1d91e956f86dfe650764966a598420adbdc361 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 09:10:59 +0900 Subject: [PATCH 2768/8282] docs: fix typo Co-authored-by: MGatner --- app/Config/Honeypot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Honeypot.php b/app/Config/Honeypot.php index 019b48acf9de..67ebcb0ee74c 100644 --- a/app/Config/Honeypot.php +++ b/app/Config/Honeypot.php @@ -29,7 +29,7 @@ class Honeypot extends BaseConfig /** * Honeypot container * - * If you enables CSP, you can remove `style="display:none"`. + * If you enabled CSP, you can remove `style="display:none"`. */ public string $container = '
      {template}
      '; From c63a3e02c0c121a719a8a84f23a4045a12996a34 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Mon, 26 Dec 2022 21:41:12 +0700 Subject: [PATCH 2769/8282] chore: secure workflows permission --- .github/workflows/deploy-apidocs.yml | 4 ++++ .github/workflows/deploy-distributables.yml | 14 ++++++++++++++ .github/workflows/deploy-userguide-latest.yml | 4 ++++ .github/workflows/test-autoreview.yml | 3 +++ .github/workflows/test-coding-standards.yml | 3 +++ .github/workflows/test-deptrac.yml | 3 +++ .github/workflows/test-phpcpd.yml | 3 +++ .github/workflows/test-phpstan.yml | 3 +++ .github/workflows/test-phpunit.yml | 3 +++ .github/workflows/test-rector.yml | 3 +++ .github/workflows/test-scss.yml | 3 +++ .github/workflows/test-userguide.yml | 3 +++ 12 files changed, 49 insertions(+) diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml index 41633244cb52..5fbe748beca6 100644 --- a/.github/workflows/deploy-apidocs.yml +++ b/.github/workflows/deploy-apidocs.yml @@ -11,6 +11,10 @@ on: - 'system/**' - '.github/workflows/deploy-apidocs.yml' +permissions: + contents: write + pull-requests: write + jobs: build: name: Deploy to api diff --git a/.github/workflows/deploy-distributables.yml b/.github/workflows/deploy-distributables.yml index d00ebc5a9f36..e53cb814a3c2 100644 --- a/.github/workflows/deploy-distributables.yml +++ b/.github/workflows/deploy-distributables.yml @@ -9,6 +9,8 @@ on: jobs: check-version: name: Check for updated version + permissions: + contents: read runs-on: ubuntu-22.04 steps: @@ -31,6 +33,10 @@ jobs: framework: name: Deploy to framework + permissions: + # Allow actions/github-script to create release + contents: write + pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version @@ -78,6 +84,10 @@ jobs: appstarter: name: Deploy to appstarter + permissions: + # Allow actions/github-script to create release + contents: write + pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version @@ -125,6 +135,10 @@ jobs: userguide: name: Deploy to userguide + permissions: + # Allow actions/github-script to create release + contents: write + pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml index 4ba79a8b341b..94f6391a32e7 100644 --- a/.github/workflows/deploy-userguide-latest.yml +++ b/.github/workflows/deploy-userguide-latest.yml @@ -15,6 +15,10 @@ on: jobs: build: name: Deploy to gh-pages + permissions: + # Allow ad-m/github-push-action to push commit to branch gh-pages + contents: write + pull-requests: write if: (github.repository == 'codeigniter4/CodeIgniter4') runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml index b78180249e73..dfe4892bdebe 100644 --- a/.github/workflows/test-autoreview.yml +++ b/.github/workflows/test-autoreview.yml @@ -18,6 +18,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: auto-review-tests: uses: ./.github/workflows/reusable-serviceless-phpunit-test.yml # @TODO Extract to codeigniter4/.github repo diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index 99e6bd4a3b14..a38e3ab85cd9 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -16,6 +16,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: lint: name: PHP ${{ matrix.php-version }} Lint with PHP CS Fixer diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml index a7c755e58492..e6b92346972b 100644 --- a/.github/workflows/test-deptrac.yml +++ b/.github/workflows/test-deptrac.yml @@ -28,6 +28,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: build: name: Architectural Inspection diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml index 9fe3764dfcb1..c4365f7b1e63 100644 --- a/.github/workflows/test-phpcpd.yml +++ b/.github/workflows/test-phpcpd.yml @@ -27,6 +27,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: build: name: Duplicate Code Detection diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml index 796d78bdba9a..cb793c356d94 100644 --- a/.github/workflows/test-phpstan.yml +++ b/.github/workflows/test-phpstan.yml @@ -31,6 +31,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: build: name: PHP ${{ matrix.php-versions }} Static Analysis diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index 7c6182cac13c..66dc091f7b0d 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -31,6 +31,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: # Any environment variables set in an env context defined at the workflow level # in the caller workflow are not propagated to the called workflow. diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml index 7d8c11d61362..89f211120d0d 100644 --- a/.github/workflows/test-rector.yml +++ b/.github/workflows/test-rector.yml @@ -33,6 +33,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: build: name: PHP ${{ matrix.php-versions }} Analyze code (Rector) on ${{ matrix.paths }} diff --git a/.github/workflows/test-scss.yml b/.github/workflows/test-scss.yml index 797bd3e42ea9..26a679719156 100644 --- a/.github/workflows/test-scss.yml +++ b/.github/workflows/test-scss.yml @@ -23,6 +23,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: build: name: Compilation of SCSS (Dart Sass) diff --git a/.github/workflows/test-userguide.yml b/.github/workflows/test-userguide.yml index d3cc4c9d25ea..b188080996db 100644 --- a/.github/workflows/test-userguide.yml +++ b/.github/workflows/test-userguide.yml @@ -14,6 +14,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true +permissions: + contents: read + jobs: syntax_check: name: Check User Guide syntax From d6336e8143427b3b5ae5b27e29c25dbc4eee401b Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Tue, 27 Dec 2022 20:57:21 +0700 Subject: [PATCH 2770/8282] correction permission to remove pull-request --- .github/workflows/deploy-apidocs.yml | 6 ++---- .github/workflows/deploy-distributables.yml | 3 --- .github/workflows/deploy-userguide-latest.yml | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml index 5fbe748beca6..9a65a017bea1 100644 --- a/.github/workflows/deploy-apidocs.yml +++ b/.github/workflows/deploy-apidocs.yml @@ -11,13 +11,11 @@ on: - 'system/**' - '.github/workflows/deploy-apidocs.yml' -permissions: - contents: write - pull-requests: write - jobs: build: name: Deploy to api + permissions: + contents: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 diff --git a/.github/workflows/deploy-distributables.yml b/.github/workflows/deploy-distributables.yml index e53cb814a3c2..9e93dd9e3cac 100644 --- a/.github/workflows/deploy-distributables.yml +++ b/.github/workflows/deploy-distributables.yml @@ -36,7 +36,6 @@ jobs: permissions: # Allow actions/github-script to create release contents: write - pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version @@ -87,7 +86,6 @@ jobs: permissions: # Allow actions/github-script to create release contents: write - pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version @@ -138,7 +136,6 @@ jobs: permissions: # Allow actions/github-script to create release contents: write - pull-requests: write if: github.repository == 'codeigniter4/CodeIgniter4' runs-on: ubuntu-22.04 needs: check-version diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml index 94f6391a32e7..eb0cd8d227ac 100644 --- a/.github/workflows/deploy-userguide-latest.yml +++ b/.github/workflows/deploy-userguide-latest.yml @@ -18,7 +18,6 @@ jobs: permissions: # Allow ad-m/github-push-action to push commit to branch gh-pages contents: write - pull-requests: write if: (github.repository == 'codeigniter4/CodeIgniter4') runs-on: ubuntu-latest steps: From 9b1c61be9c69775f9a7e61c05e7b93abf8564894 Mon Sep 17 00:00:00 2001 From: ddevsr Date: Wed, 28 Dec 2022 08:46:34 +0700 Subject: [PATCH 2771/8282] set top-level permission with default read --- .github/workflows/deploy-apidocs.yml | 3 +++ .github/workflows/deploy-distributables.yml | 5 +++-- .github/workflows/deploy-userguide-latest.yml | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml index 9a65a017bea1..b117e3dad72b 100644 --- a/.github/workflows/deploy-apidocs.yml +++ b/.github/workflows/deploy-apidocs.yml @@ -11,6 +11,9 @@ on: - 'system/**' - '.github/workflows/deploy-apidocs.yml' +permissions: + contents: read + jobs: build: name: Deploy to api diff --git a/.github/workflows/deploy-distributables.yml b/.github/workflows/deploy-distributables.yml index 9e93dd9e3cac..e279abad2dd7 100644 --- a/.github/workflows/deploy-distributables.yml +++ b/.github/workflows/deploy-distributables.yml @@ -6,11 +6,12 @@ on: release: types: [published] +permissions: + contents: read + jobs: check-version: name: Check for updated version - permissions: - contents: read runs-on: ubuntu-22.04 steps: diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml index eb0cd8d227ac..58e5e731ed18 100644 --- a/.github/workflows/deploy-userguide-latest.yml +++ b/.github/workflows/deploy-userguide-latest.yml @@ -12,6 +12,9 @@ on: paths: - 'user_guide_src/**' +permissions: + contents: read + jobs: build: name: Deploy to gh-pages From f0700a53569fc93323c8ffedb9223dc2db5a6cb4 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 28 Dec 2022 10:53:46 +0700 Subject: [PATCH 2772/8282] [Rector] Enable skipped RemoveUselessReturnTagRector `RemoveUselessReturnTagRector` already cover `@return true` --- rector.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rector.php b/rector.php index 81ad3df5006b..bdaf1165bddb 100644 --- a/rector.php +++ b/rector.php @@ -29,7 +29,6 @@ use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; -use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; @@ -116,12 +115,7 @@ // @TODO remove if https://github.com/rectorphp/rector-phpunit/issues/86 is fixed GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', - ], - - // rector mistakenly removes `@return true` - RemoveUselessReturnTagRector::class => [ - __DIR__ . '/system/Debug/Exceptions.php', - ], + ] ]); // auto import fully qualified class names From 4b78a2ea0a8a617cce4a507f1087081ee70757c5 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 28 Dec 2022 10:58:51 +0700 Subject: [PATCH 2773/8282] add trailing comma --- rector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rector.php b/rector.php index bdaf1165bddb..d53f9af118eb 100644 --- a/rector.php +++ b/rector.php @@ -115,7 +115,7 @@ // @TODO remove if https://github.com/rectorphp/rector-phpunit/issues/86 is fixed GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', - ] + ], ]); // auto import fully qualified class names From 87897ec6db8e4049e4edfcb1cf561b0225a168e6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 15:27:50 +0900 Subject: [PATCH 2774/8282] docs: fix section title underline --- user_guide_src/source/general/helpers.rst | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst index 684ca021f70e..df4aab4f2329 100644 --- a/user_guide_src/source/general/helpers.rst +++ b/user_guide_src/source/general/helpers.rst @@ -29,8 +29,9 @@ Helpers are typically stored in your **system/Helpers**, or specified helper is not located there CI will instead look in your global **system/Helpers** directory. +**************** Loading a Helper -================ +**************** .. note:: The URL helper is always loaded so you do not need to load it yourself. @@ -50,7 +51,7 @@ For example, to load the **Cookie Helper** file, which is named don't try to assign it to a variable. Just use it as shown. Loading Multiple Helpers ------------------------- +======================== If you need to load more than one helper at a time, you can pass an array of file names in and all of them will be loaded: @@ -58,7 +59,7 @@ an array of file names in and all of them will be loaded: .. literalinclude:: helpers/003.php Loading in a Controller ------------------------ +======================= A helper can be loaded anywhere within your controller methods (or even within your View files, although that's not a good practice), as @@ -75,7 +76,7 @@ property in Controller instead. See :ref:`Controllers `. .. _helpers-loading-from-non-standard-locations: Loading from Non-standard Locations ------------------------------------ +=================================== Helpers can be loaded from directories outside of **app/Helpers** and **system/Helpers**, as long as that path can be found through a namespace that @@ -100,8 +101,9 @@ You can also use the following way: .. note:: The functions within files loaded this way are not truly namespaced. The namespace is simply used as a convenient way to locate the files. +************** Using a Helper -============== +************** Once you've loaded the Helper File containing the function you intend to use, you'll call it the way you would a standard PHP function. @@ -114,8 +116,9 @@ your view files you would do this: Where ``Click Here`` is the name of the link, and ``blog/comments`` is the URI to the controller/method you wish to link to. +******************* "Extending" Helpers -=================== +******************* To "extend" Helpers, create a file in your **app/Helpers/** folder with an identical name to the existing Helper. @@ -145,8 +148,9 @@ is as follows: 2. {namespace}/Helpers - All namespaces are looped through in the order they are defined. 3. system/Helpers - The base file is loaded last +********* Now What? -========= +********* In the Table of Contents, you'll find a list of all the available :doc:`Helpers <../helpers/index>`. Browse each one to see what they do. From e2b83e5dd8fdb86992a80f305c03b068ee53f96f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 15:33:02 +0900 Subject: [PATCH 2775/8282] docs: make function name linkable --- user_guide_src/source/general/helpers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst index df4aab4f2329..ebccf0dc5546 100644 --- a/user_guide_src/source/general/helpers.rst +++ b/user_guide_src/source/general/helpers.rst @@ -139,7 +139,7 @@ functions: .. literalinclude:: helpers/006.php -The ``helper()`` function will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php** +The :php:func:`helper()` function will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php** and load in ALL matching helpers of the same name. This allows any module's helpers to be loaded, as well as any helpers you've created specifically for this application. The load order is as follows: From 1eea7f1c3a29fa78a08acf3445726ef10c6c89ae Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 15:33:28 +0900 Subject: [PATCH 2776/8282] docs: add section title --- user_guide_src/source/general/helpers.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst index ebccf0dc5546..77c4b542124b 100644 --- a/user_guide_src/source/general/helpers.rst +++ b/user_guide_src/source/general/helpers.rst @@ -2,6 +2,14 @@ Helper Functions ################ +.. contents:: + :local: + :depth: 2 + +***************** +What are Helpers? +***************** + Helpers, as the name suggests, help you with tasks. Each helper file is simply a collection of functions in a particular category. There are **URL Helpers**, that assist in creating links, there are **Form Helpers** that help @@ -9,10 +17,6 @@ you create form elements, **Text Helpers** perform various text formatting routines, **Cookie Helpers** set and read cookies, **File Helpers** help you deal with files, etc. -.. contents:: - :local: - :depth: 2 - Unlike most other systems in CodeIgniter, Helpers are not written in an Object Oriented format. They are simple, procedural functions. Each helper function performs one specific task, with no dependence on other From 9a42d42b4652b1e5198d188f0a8ced8eb3106745 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 15:46:35 +0900 Subject: [PATCH 2777/8282] dpcs: add note for case sensitive file system --- user_guide_src/source/general/helpers.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst index 77c4b542124b..c4836a3a220b 100644 --- a/user_guide_src/source/general/helpers.rst +++ b/user_guide_src/source/general/helpers.rst @@ -46,6 +46,10 @@ Loading a helper file is quite simple using the following method: Where ``name`` is the file name of the helper, without the "**.php**" file extension or the "**_helper**" part. +.. important:: CodeIgniter helper file names are all lowercase. + Therefore, ``helper('Name')`` will not work on case-sensitive file systems + such as Linux. + For example, to load the **Cookie Helper** file, which is named **cookie_helper.php**, you would do this: From 6f9030af2c150b4f0855ae362a53e4a62824f20f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Dec 2022 17:02:28 +0900 Subject: [PATCH 2778/8282] docs: add note on namespace --- user_guide_src/source/general/helpers.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst index c4836a3a220b..8bdd95fe2ec2 100644 --- a/user_guide_src/source/general/helpers.rst +++ b/user_guide_src/source/general/helpers.rst @@ -147,6 +147,8 @@ functions: .. literalinclude:: helpers/006.php +.. important:: Do not specify the namespace ``App\Helpers``. + The :php:func:`helper()` function will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php** and load in ALL matching helpers of the same name. This allows any module's helpers to be loaded, as well as any helpers you've created specifically for this application. The load order From f0c828901dd3c4894abe94ced50f5177be608ed8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 09:09:46 +0900 Subject: [PATCH 2779/8282] docs: fix description for Timestamp Format --- app/Config/Migrations.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php index 91e80b4a9074..cb9697a63c15 100644 --- a/app/Config/Migrations.php +++ b/app/Config/Migrations.php @@ -44,7 +44,10 @@ class Migrations extends BaseConfig * using the CLI command: * > php spark migrate:create * - * Typical formats: + * Note: if you set an unsupported format, migration runner will not find + * your migration files. + * + * Supported formats: * - YmdHis_ * - Y-m-d-His_ * - Y_m_d_His_ From 1ce498beb629123528efe5bfbc4004b2572f2104 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 10:02:54 +0900 Subject: [PATCH 2780/8282] docs: add general instruction and section title --- user_guide_src/source/installation/upgrade_423.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_423.rst b/user_guide_src/source/installation/upgrade_423.rst index 980c8b3ed3ed..c78ddb38d77b 100644 --- a/user_guide_src/source/installation/upgrade_423.rst +++ b/user_guide_src/source/installation/upgrade_423.rst @@ -2,8 +2,17 @@ Upgrading from 4.2.2 to 4.2.3 ############################# +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + .. contents:: :local: :depth: 2 +Project Files +************* + Version ``4.2.3`` is an internal change for security measures and requires no intervention in projects. From 61a6aa3e0b2c563a216441fb3bb2225ebd7d3df1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 10:04:02 +0900 Subject: [PATCH 2781/8282] docs: add changelog for v4.2.12 --- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.2.12.rst | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 user_guide_src/source/changelogs/v4.2.12.rst diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 27896bd83847..a9539b9a4649 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.2.12 v4.2.11 v4.2.10 v4.2.9 diff --git a/user_guide_src/source/changelogs/v4.2.12.rst b/user_guide_src/source/changelogs/v4.2.12.rst new file mode 100644 index 000000000000..38b18be92308 --- /dev/null +++ b/user_guide_src/source/changelogs/v4.2.12.rst @@ -0,0 +1,18 @@ +Version 4.2.12 +############## + +Release Date: Unreleased + +**4.2.12 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 2 + +Bugs Fixed +********** + +- Fixed ``Request::getIPaddress()`` causes an error on CLI. +- Fixed ``link_tag()`` missing ``type="application/rss+xml"``. + +See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. From cd9a1ab4c031ac4f0ddf307310d413db190bd887 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 10:04:22 +0900 Subject: [PATCH 2782/8282] docs: add upgrading guide for v4.2.12 --- .../source/installation/upgrade_4212.rst | 27 +++++++++++++++++++ .../source/installation/upgrading.rst | 1 + 2 files changed, 28 insertions(+) create mode 100644 user_guide_src/source/installation/upgrade_4212.rst diff --git a/user_guide_src/source/installation/upgrade_4212.rst b/user_guide_src/source/installation/upgrade_4212.rst new file mode 100644 index 000000000000..233f8881ce96 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_4212.rst @@ -0,0 +1,27 @@ +############################### +Upgrading from 4.2.11 to 4.2.12 +############################### + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +Project Files +************* + +Version ``4.2.12`` did not alter any executable code in project files. + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +* app/Controllers/BaseController.php +* composer.json diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 6a759f93a232..242ac80d1b16 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_4212 upgrade_4211 upgrade_4210 upgrade_428 From 518cab411be11715cd7b572aa39db56ed9f6bc66 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 12:54:31 +0900 Subject: [PATCH 2783/8282] docs: add about DB caching --- user_guide_src/source/installation/upgrade_database.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst index a5228af71e2d..35efbbeb2042 100644 --- a/user_guide_src/source/installation/upgrade_database.rst +++ b/user_guide_src/source/installation/upgrade_database.rst @@ -14,6 +14,7 @@ Documentations What has been changed ===================== - The functionality in CI3 is basically the same as in CI4. +- `Database Caching `_ in CI3 is removed. - The method names have changed to camelCase and the :doc:`Query Builder <../database/query_builder>` now needs to be initialized before you can run queries on it. @@ -40,6 +41,8 @@ Upgrade Guide - ``$this->db->select_max('age');`` to ``$builder->selectMax('age');`` - ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');`` - ``$this->db->having('user_id', 45);`` to ``$builder->having('user_id', 45);`` +6. CI4 does not provide `Database Caching `_ + in CI3, so if you need to cache the result, use :doc:`../libraries/caching` instead. Code Example ============ From 4fc6a757f711ec93550376aefc358be6f6d5bb24 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 13:55:44 +0900 Subject: [PATCH 2784/8282] docs: update deprecated command Co-authored-by: Pooya Parsa Dadashi --- app/Config/Migrations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php index cb9697a63c15..604e059a1cf7 100644 --- a/app/Config/Migrations.php +++ b/app/Config/Migrations.php @@ -42,7 +42,7 @@ class Migrations extends BaseConfig * * This is the format that will be used when creating new migrations * using the CLI command: - * > php spark migrate:create + * > php spark make:migration * * Note: if you set an unsupported format, migration runner will not find * your migration files. From 928bfd338ea7ba13f578f4f3e9c6222cf6a6a220 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 14:00:08 +0900 Subject: [PATCH 2785/8282] docs: replace deprecated command in examples --- user_guide_src/source/cli/cli_commands.rst | 10 +++++----- user_guide_src/source/cli/cli_commands/001.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst index 7e00cb340e4c..e14a7063cf93 100644 --- a/user_guide_src/source/cli/cli_commands.rst +++ b/user_guide_src/source/cli/cli_commands.rst @@ -22,11 +22,11 @@ and must extend ``CodeIgniter\CLI\BaseCommand``, and implement the ``run()`` met The following properties should be used in order to get listed in CLI commands and to add help functionality to your command: * ``$group``: a string to describe the group the command is lumped under when listing commands. For example: ``Database`` -* ``$name``: a string to describe the command's name. For example: ``migrate:create`` -* ``$description``: a string to describe the command. For example: ``Creates a new migration file.`` -* ``$usage``: a string to describe the command usage. For example: ``migrate:create [name] [options]`` -* ``$arguments``: an array of strings to describe each command argument. For example: ``'name' => 'The migration file name'`` -* ``$options``: an array of strings to describe each command option. For example: ``'-n' => 'Set migration namespace'`` +* ``$name``: a string to describe the command's name. For example: ``make:controller`` +* ``$description``: a string to describe the command. For example: ``Generates a new controller file.`` +* ``$usage``: a string to describe the command usage. For example: ``make:controller [options]`` +* ``$arguments``: an array of strings to describe each command argument. For example: ``'name' => 'The controller class name.'`` +* ``$options``: an array of strings to describe each command option. For example: ``'--force' => 'Force overwrite existing file.'`` **Help description will be automatically generated according to the above parameters.** diff --git a/user_guide_src/source/cli/cli_commands/001.php b/user_guide_src/source/cli/cli_commands/001.php index 0069c7247d43..fb2640fcf01f 100644 --- a/user_guide_src/source/cli/cli_commands/001.php +++ b/user_guide_src/source/cli/cli_commands/001.php @@ -1,3 +1,3 @@ Date: Thu, 29 Dec 2022 14:01:54 +0900 Subject: [PATCH 2786/8282] docs: update note for deprecated command --- user_guide_src/source/cli/cli_generators.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/cli/cli_generators.rst b/user_guide_src/source/cli/cli_generators.rst index d50665fb6e04..0384c4f3cbaa 100644 --- a/user_guide_src/source/cli/cli_generators.rst +++ b/user_guide_src/source/cli/cli_generators.rst @@ -34,7 +34,7 @@ where ```` will be replaced with the command to check. namespace defined in your ``$psr4`` array in ``Config\Autoload`` or defined in your composer autoload file. Otherwise, code generation will be interrupted. -.. important:: Use of ``migrate:create`` to create migration files is now deprecated. It will be removed in +.. important:: Since v4.0.5, use of ``migrate:create`` to create migration files has been deprecated. It will be removed in future releases. Please use ``make:migration`` as replacement. Also, please use ``make:migration --session`` to use instead of the deprecated ``session:migration``. From 171244de9f71cb020fbec0a4a3d40f4935d2a0ca Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 14:56:09 +0900 Subject: [PATCH 2787/8282] test: add tests for MigrationRunner::getMigrationName() --- .../Migrations/MigrationRunnerTest.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index 28d9a2301fe5..aa5fdd80c6ff 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -186,6 +186,24 @@ public function testGetMigrationNumberReturnsZeroIfNoneFound() $this->assertSame('0', $method('Foo')); } + public function testGetMigrationNameDashes() + { + $runner = new MigrationRunner($this->config); + + $method = $this->getPrivateMethodInvoker($runner, 'getMigrationName'); + + $this->assertSame('Foo', $method('2019-08-06-235100_Foo')); + } + + public function testGetMigrationNameUnderscores() + { + $runner = new MigrationRunner($this->config); + + $method = $this->getPrivateMethodInvoker($runner, 'getMigrationName'); + + $this->assertSame('Foo', $method('2019_08_06_235100_Foo')); + } + public function testSetSilentStoresValue() { $runner = new MigrationRunner($this->config); From 2f02ec0085c2fe0b11788c1eee6b3bddb858d841 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 14:59:01 +0900 Subject: [PATCH 2788/8282] docs: add @param --- system/Database/MigrationRunner.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index 6eb92125237f..3902f5903160 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -448,6 +448,8 @@ public function findNamespaceMigrations(string $namespace): array /** * Create a migration object from a file path. * + * @param string $path Full path to a valid migration file. + * * @return false|object Returns the migration object, or false on failure */ protected function migrationFromFile(string $path, string $namespace) @@ -525,6 +527,8 @@ public function setSilent(bool $silent) /** * Extracts the migration number from a filename + * + * @param string $migration A migration filename w/o path. */ protected function getMigrationNumber(string $migration): string { From 351277eb11eda59f9cd0bbe218aa8928592eac2d Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 14:59:37 +0900 Subject: [PATCH 2789/8282] refactor: rename variable --- system/Database/MigrationRunner.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index 3902f5903160..4c99d42d8bfa 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -458,9 +458,9 @@ protected function migrationFromFile(string $path, string $namespace) return false; } - $name = basename($path, '.php'); + $filename = basename($path, '.php'); - if (! preg_match($this->regex, $name)) { + if (! preg_match($this->regex, $filename)) { return false; } @@ -468,8 +468,8 @@ protected function migrationFromFile(string $path, string $namespace) $migration = new stdClass(); - $migration->version = $this->getMigrationNumber($name); - $migration->name = $this->getMigrationName($name); + $migration->version = $this->getMigrationNumber($filename); + $migration->name = $this->getMigrationName($filename); $migration->path = $path; $migration->class = $locator->getClassname($path); $migration->namespace = $namespace; From 7e73bab00f59edd5253fe6a6370dee0b08d6bc2f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:00:48 +0900 Subject: [PATCH 2790/8282] fix: getMigrationName() does not take care of underscore seperator --- system/Database/MigrationRunner.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index 4c99d42d8bfa..e534c763001a 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -538,14 +538,18 @@ protected function getMigrationNumber(string $migration): string } /** - * Extracts the migration class name from a filename + * Extracts the migration name from a filename + * + * Note: The migration name should be the classname, but maybe they are + * different. + * + * @param string $migration A migration filename w/o path. */ protected function getMigrationName(string $migration): string { $parts = explode('_', $migration); - array_shift($parts); - return implode('_', $parts); + return array_pop($parts); } /** From e51b0977890073867e7e61858031baf85162d983 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:26:46 +0900 Subject: [PATCH 2791/8282] docs: fix by proofreading Co-authored-by: Michal Sniatala --- user_guide_src/source/installation/upgrade_database.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst index 35efbbeb2042..b39a6a84ca8d 100644 --- a/user_guide_src/source/installation/upgrade_database.rst +++ b/user_guide_src/source/installation/upgrade_database.rst @@ -42,7 +42,7 @@ Upgrade Guide - ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');`` - ``$this->db->having('user_id', 45);`` to ``$builder->having('user_id', 45);`` 6. CI4 does not provide `Database Caching `_ - in CI3, so if you need to cache the result, use :doc:`../libraries/caching` instead. + layer known from CI3, so if you need to cache the result, use :doc:`../libraries/caching` instead. Code Example ============ From e6559695f68a4432ab864b981e3b630b489fb9ba Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:39:33 +0900 Subject: [PATCH 2792/8282] fix: getMigrationName() logic --- system/Database/MigrationRunner.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index e534c763001a..5550f8765a9d 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -67,7 +67,7 @@ class MigrationRunner * * @var string */ - protected $regex = '/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}_(\w+)$/'; + protected $regex = '/\A(\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6})_(\w+)\z/'; /** * The main database connection. Used to store @@ -547,9 +547,9 @@ protected function getMigrationNumber(string $migration): string */ protected function getMigrationName(string $migration): string { - $parts = explode('_', $migration); + preg_match($this->regex, $migration, $matches); - return array_pop($parts); + return count($matches) ? $matches[2] : ''; } /** From 1496d43bf2b55f3d5a112b0671b96e19951cf39e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:47:00 +0900 Subject: [PATCH 2793/8282] refactor: use $this->regex --- system/Database/MigrationRunner.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index 5550f8765a9d..569be22807e0 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -532,9 +532,9 @@ public function setSilent(bool $silent) */ protected function getMigrationNumber(string $migration): string { - preg_match('/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}/', $migration, $matches); + preg_match($this->regex, $migration, $matches); - return count($matches) ? $matches[0] : '0'; + return count($matches) ? $matches[1] : '0'; } /** From 1f71d41266edee43bef4ea4fcbb1d94df4d35295 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:51:09 +0900 Subject: [PATCH 2794/8282] test: update test cases --- tests/system/Database/Migrations/MigrationRunnerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index aa5fdd80c6ff..9872080b8719 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -192,7 +192,7 @@ public function testGetMigrationNameDashes() $method = $this->getPrivateMethodInvoker($runner, 'getMigrationName'); - $this->assertSame('Foo', $method('2019-08-06-235100_Foo')); + $this->assertSame('Foo_bar', $method('2019-08-06-235100_Foo_bar')); } public function testGetMigrationNameUnderscores() @@ -201,7 +201,7 @@ public function testGetMigrationNameUnderscores() $method = $this->getPrivateMethodInvoker($runner, 'getMigrationName'); - $this->assertSame('Foo', $method('2019_08_06_235100_Foo')); + $this->assertSame('Foo_bar', $method('2019_08_06_235100_Foo_bar')); } public function testSetSilentStoresValue() From ea126107453df5ae48af0caa6ff3cba02cebb3df Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Dec 2022 15:58:22 +0900 Subject: [PATCH 2795/8282] docs: fix by proofreading Co-authored-by: Michal Sniatala --- user_guide_src/source/installation/upgrade_database.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst index b39a6a84ca8d..5dc22ddda820 100644 --- a/user_guide_src/source/installation/upgrade_database.rst +++ b/user_guide_src/source/installation/upgrade_database.rst @@ -14,7 +14,7 @@ Documentations What has been changed ===================== - The functionality in CI3 is basically the same as in CI4. -- `Database Caching `_ in CI3 is removed. +- `Database Caching `_ functionality known from CI3 was removed. - The method names have changed to camelCase and the :doc:`Query Builder <../database/query_builder>` now needs to be initialized before you can run queries on it. From e9b627f8c1f248407bc1290c7007fccd71067376 Mon Sep 17 00:00:00 2001 From: michalsn Date: Fri, 30 Dec 2022 08:55:38 +0100 Subject: [PATCH 2796/8282] fix: save object when useAutoIncrement is disabled --- system/Model.php | 8 ++++++-- tests/system/Models/SaveModelTest.php | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/system/Model.php b/system/Model.php index 55b3b881de37..d91433914a1b 100644 --- a/system/Model.php +++ b/system/Model.php @@ -685,8 +685,12 @@ public function insert($data = null, bool $returnID = true) } } - if ($this->useAutoIncrement === false && isset($data[$this->primaryKey])) { - $this->tempPrimaryKeyValue = $data[$this->primaryKey]; + if ($this->useAutoIncrement === false) { + if (is_array($data) && isset($data[$this->primaryKey])) { + $this->tempPrimaryKeyValue = $data[$this->primaryKey]; + } elseif (is_object($data) && isset($data->{$this->primaryKey})) { + $this->tempPrimaryKeyValue = $data->{$this->primaryKey}; + } } $this->escape = $this->tempData['escape'] ?? []; diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php index 287e96bec275..ad9311cec0e9 100644 --- a/tests/system/Models/SaveModelTest.php +++ b/tests/system/Models/SaveModelTest.php @@ -322,4 +322,27 @@ public function testUseAutoIncrementSetToFalseSave(): void $this->assertSame($insert['key'], $this->model->getInsertID()); $this->seeInDatabase('without_auto_increment', $update); } + + public function testUseAutoIncrementSetToFalseSaveObject(): void + { + $this->createModel(WithoutAutoIncrementModel::class); + + $insert = [ + 'key' => 'some_random_key', + 'value' => 'some value', + ]; + $this->model->save((object) $insert); + + $this->assertSame($insert['key'], $this->model->getInsertID()); + $this->seeInDatabase('without_auto_increment', $insert); + + $update = [ + 'key' => 'some_random_key', + 'value' => 'some different value', + ]; + $this->model->save((object) $update); + + $this->assertSame($insert['key'], $this->model->getInsertID()); + $this->seeInDatabase('without_auto_increment', $update); + } } From a93b8de14c669fae6ecbd66eef9f11efc61df070 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 31 Dec 2022 08:58:02 +0900 Subject: [PATCH 2797/8282] docs: add two bug fixes --- user_guide_src/source/changelogs/v4.2.12.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.2.12.rst b/user_guide_src/source/changelogs/v4.2.12.rst index 38b18be92308..1b60f46dd481 100644 --- a/user_guide_src/source/changelogs/v4.2.12.rst +++ b/user_guide_src/source/changelogs/v4.2.12.rst @@ -14,5 +14,7 @@ Bugs Fixed - Fixed ``Request::getIPaddress()`` causes an error on CLI. - Fixed ``link_tag()`` missing ``type="application/rss+xml"``. +- Fixed ``spark migrate:status`` shows incorrect filenames when format is ``Y_m_d_His_``. +- Fixed an error when ``Model::save()`` saves an object if ``$useAutoIncrement`` is false. See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. From 174f5f0c0d2081caa2b5de757e36eff18a389c7d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 31 Dec 2022 17:35:26 +0900 Subject: [PATCH 2798/8282] chore: add PHP 8.2 and remove 7.3 --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 975c611a61c3..17e6b415ba0d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -25,10 +25,10 @@ body: description: Which PHP versions did you run your code? multiple: true options: - - '7.3' - '7.4' - '8.0' - '8.1' + - '8.2' validations: required: true From fae617951793156f24d6cf263d447a37f6b3c6d5 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 1 Jan 2023 00:39:05 +0100 Subject: [PATCH 2799/8282] Typo: Products to Helloworld Typo: Changed the controller name "Products" to "Helloworld" as described in explanation. --- user_guide_src/source/incoming/controllers/007.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/controllers/007.php b/user_guide_src/source/incoming/controllers/007.php index 7c2e9b7091ea..e943c78bfcca 100644 --- a/user_guide_src/source/incoming/controllers/007.php +++ b/user_guide_src/source/incoming/controllers/007.php @@ -2,7 +2,7 @@ namespace App\Controllers; -class Products extends BaseController +class Helloworld extends BaseController { protected function utility() { From 5764d0c75565443315026731db1e113ece1af371 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 3 Jan 2023 19:22:27 +0800 Subject: [PATCH 2800/8282] refactor: change getFile() function to static. --- system/Events/Events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Events/Events.php b/system/Events/Events.php index 3117969882df..064f01ab4104 100644 --- a/system/Events/Events.php +++ b/system/Events/Events.php @@ -246,7 +246,7 @@ public static function setFiles(array $files) * * @return string[] */ - public function getFiles() + public static function getFiles() { return static::$files; } From 5148921b3a730411d70af92663cfb5b43a337118 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 3 Jan 2023 20:29:46 +0800 Subject: [PATCH 2801/8282] refactor: replace $this->manange to MockEvents --- tests/system/Events/EventsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index b6a8aa1a4cb7..82f4580f21e7 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -55,21 +55,21 @@ public function testInitialize() // it should start out empty MockEvents::setFiles([]); - $this->assertEmpty($this->manager->getFiles()); + $this->assertEmpty(MockEvents::getFiles()); // make sure we have a default events file $default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php']; $this->manager->unInitialize(); MockEvents::initialize(); - $this->assertSame($default, $this->manager->getFiles()); + $this->assertSame($default, MockEvents::getFiles()); // but we should be able to change it through the backdoor MockEvents::setFiles(['/peanuts']); - $this->assertSame(['/peanuts'], $this->manager->getFiles()); + $this->assertSame(['/peanuts'], MockEvents::getFiles()); // re-initializing should have no effect MockEvents::initialize(); - $this->assertSame(['/peanuts'], $this->manager->getFiles()); + $this->assertSame(['/peanuts'], MockEvents::getFiles()); } public function testPerformance() From 76610375748e7c90e86b7e086e1c1769d7761dd2 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 4 Jan 2023 20:36:32 +0800 Subject: [PATCH 2802/8282] Revert "refactor: replace $this->manange to MockEvents" This reverts commit 5148921b3a730411d70af92663cfb5b43a337118. --- tests/system/Events/EventsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index 82f4580f21e7..b6a8aa1a4cb7 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -55,21 +55,21 @@ public function testInitialize() // it should start out empty MockEvents::setFiles([]); - $this->assertEmpty(MockEvents::getFiles()); + $this->assertEmpty($this->manager->getFiles()); // make sure we have a default events file $default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php']; $this->manager->unInitialize(); MockEvents::initialize(); - $this->assertSame($default, MockEvents::getFiles()); + $this->assertSame($default, $this->manager->getFiles()); // but we should be able to change it through the backdoor MockEvents::setFiles(['/peanuts']); - $this->assertSame(['/peanuts'], MockEvents::getFiles()); + $this->assertSame(['/peanuts'], $this->manager->getFiles()); // re-initializing should have no effect MockEvents::initialize(); - $this->assertSame(['/peanuts'], MockEvents::getFiles()); + $this->assertSame(['/peanuts'], $this->manager->getFiles()); } public function testPerformance() From 71d4b5bb85f9d4cf2000f721d0e700ef94e27d6e Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 4 Jan 2023 23:26:11 +0800 Subject: [PATCH 2803/8282] refactor: change $this->manage to Event class. --- tests/system/Events/EventsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index b6a8aa1a4cb7..1a106aca3548 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -55,21 +55,21 @@ public function testInitialize() // it should start out empty MockEvents::setFiles([]); - $this->assertEmpty($this->manager->getFiles()); + $this->assertEmpty(Events::getFiles()); // make sure we have a default events file $default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php']; $this->manager->unInitialize(); MockEvents::initialize(); - $this->assertSame($default, $this->manager->getFiles()); + $this->assertSame($default, Events::getFiles()); // but we should be able to change it through the backdoor MockEvents::setFiles(['/peanuts']); - $this->assertSame(['/peanuts'], $this->manager->getFiles()); + $this->assertSame(['/peanuts'], Events::getFiles()); // re-initializing should have no effect MockEvents::initialize(); - $this->assertSame(['/peanuts'], $this->manager->getFiles()); + $this->assertSame(['/peanuts'], Events::getFiles()); } public function testPerformance() From e329c1e28c3a4f876c437f06013869cda112266a Mon Sep 17 00:00:00 2001 From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com> Date: Wed, 4 Jan 2023 22:12:14 +0200 Subject: [PATCH 2804/8282] tada New Year 2022 tada --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 31425034e8e9..0119e5f554b3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ The MIT License (MIT) Copyright (c) 2014-2019 British Columbia Institute of Technology -Copyright (c) 2019-2022 CodeIgniter Foundation +Copyright (c) 2019-2023 CodeIgniter Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From ec9a589c5939f9e7b24d1bf1f64c1fd1bdf1e668 Mon Sep 17 00:00:00 2001 From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com> Date: Wed, 4 Jan 2023 22:15:14 +0200 Subject: [PATCH 2805/8282] New Year 2023 --- user_guide_src/source/license.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst index 40505f1b73ba..4320bd96ccae 100644 --- a/user_guide_src/source/license.rst +++ b/user_guide_src/source/license.rst @@ -3,7 +3,7 @@ The MIT License (MIT) ##################### | Copyright (c) 2014-2019 British Columbia Institute of Technology -| Copyright (c) 2019-2022 CodeIgniter Foundation +| Copyright (c) 2019-2023 CodeIgniter Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From e035451da3eb295446e538e7a1a4366560415420 Mon Sep 17 00:00:00 2001 From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com> Date: Wed, 4 Jan 2023 22:19:54 +0200 Subject: [PATCH 2806/8282] New Year 2023 --- user_guide_src/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index b5c4bcbc8c12..a839d7225716 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -18,7 +18,7 @@ project = 'CodeIgniter' author = 'CodeIgniter Foundation' -copyright = '2019-2022 CodeIgniter Foundation' +copyright = '2019-2023 CodeIgniter Foundation' # The short X.Y version. version = '4.2' From 265a0477ba2d8a04e4d3ce7fb090cf4900927112 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 5 Jan 2023 08:23:00 +0700 Subject: [PATCH 2807/8282] docs: fix boolean type to follow PSR-5 --- app/Config/Cache.php | 2 +- system/Encryption/Encryption.php | 2 +- system/Test/Interfaces/FabricatorModel.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Config/Cache.php b/app/Config/Cache.php index 2d1fea90c9d1..e76c02d8ff0b 100644 --- a/app/Config/Cache.php +++ b/app/Config/Cache.php @@ -134,7 +134,7 @@ class Cache extends BaseConfig * * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached * - * @var array + * @var array */ public $memcached = [ 'host' => '127.0.0.1', diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php index 35eb323b0469..81b25eeff5f5 100644 --- a/system/Encryption/Encryption.php +++ b/system/Encryption/Encryption.php @@ -71,7 +71,7 @@ class Encryption /** * Handlers that are to be installed * - * @var array + * @var array */ protected $handlers = []; diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php index 04976a07d24c..7173838a6a2e 100644 --- a/system/Test/Interfaces/FabricatorModel.php +++ b/system/Test/Interfaces/FabricatorModel.php @@ -67,7 +67,7 @@ public function insert($data = null, bool $returnID = true); * Sets $useSoftDeletes value so that we can temporarily override * the softdeletes settings. Can be used for all find* methods. * - * @param boolean $val + * @param bool $val * * @return Model */ From ed85aa522c5715b1a53559903ca86d1afecceda7 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Thu, 5 Jan 2023 10:14:59 +0100 Subject: [PATCH 2808/8282] fix: define of STDOUT in CLI init() --- system/CLI/CLI.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index ff1d32995a0b..5d359276eb7c 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -164,7 +164,9 @@ public static function init() } else { // If the command is being called from a controller // we need to define STDOUT ourselves - define('STDOUT', 'php://output'); // @codeCoverageIgnore + if (! defined('STDOUT')) { + define('STDOUT', 'php://output'); // @codeCoverageIgnore + } } } From 6c49d2d1b6ead557de443d4561218fc1c7629b98 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Thu, 5 Jan 2023 10:47:25 +0100 Subject: [PATCH 2809/8282] style: run rector --- system/CLI/CLI.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 5d359276eb7c..d9dc58fe9378 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -150,23 +150,16 @@ public static function init() // much more bash-like. // http://www.php.net/manual/en/readline.installation.php static::$readline_support = extension_loaded('readline'); - // clear segments & options to keep testing clean static::$segments = []; static::$options = []; - // Check our stream resource for color support static::$isColored = static::hasColorSupport(STDOUT); - static::parseCommandLine(); - static::$initialized = true; - } else { - // If the command is being called from a controller - // we need to define STDOUT ourselves - if (! defined('STDOUT')) { - define('STDOUT', 'php://output'); // @codeCoverageIgnore - } + } elseif (! defined('STDOUT')) { + define('STDOUT', 'php://output'); + // @codeCoverageIgnore } } From 018c84fb3f82c4ce87f1ca5840afb0734ef5cdc7 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Thu, 5 Jan 2023 12:18:51 +0100 Subject: [PATCH 2810/8282] revert line deletion --- system/CLI/CLI.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index d9dc58fe9378..c3c561087eba 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -150,16 +150,22 @@ public static function init() // much more bash-like. // http://www.php.net/manual/en/readline.installation.php static::$readline_support = extension_loaded('readline'); + // clear segments & options to keep testing clean static::$segments = []; static::$options = []; + // Check our stream resource for color support static::$isColored = static::hasColorSupport(STDOUT); + static::parseCommandLine(); + static::$initialized = true; + // See: https://github.com/codeigniter4/CodeIgniter4/issues/7047 } elseif (! defined('STDOUT')) { + // @codeCoverageIgnoreStart define('STDOUT', 'php://output'); - // @codeCoverageIgnore + // @codeCoverageIgnoreEnd } } From 378340a621c18418f631767f05b9425b02884102 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Thu, 5 Jan 2023 12:21:11 +0100 Subject: [PATCH 2811/8282] add comments --- system/CLI/CLI.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index c3c561087eba..92e695a310a6 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -161,8 +161,10 @@ public static function init() static::parseCommandLine(); static::$initialized = true; - // See: https://github.com/codeigniter4/CodeIgniter4/issues/7047 } elseif (! defined('STDOUT')) { + // If the command is being called from a controller + // we need to define STDOUT ourselves + // For "! defined('STDOUT')" see: https://github.com/codeigniter4/CodeIgniter4/issues/7047 // @codeCoverageIgnoreStart define('STDOUT', 'php://output'); // @codeCoverageIgnoreEnd From 06a1ce9b89b55273399cdb0fbb0242097d2e5966 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Thu, 5 Jan 2023 13:57:11 +0100 Subject: [PATCH 2812/8282] @codeCoverageIgnore beside define --- system/CLI/CLI.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 92e695a310a6..f3488f50265a 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -165,9 +165,7 @@ public static function init() // If the command is being called from a controller // we need to define STDOUT ourselves // For "! defined('STDOUT')" see: https://github.com/codeigniter4/CodeIgniter4/issues/7047 - // @codeCoverageIgnoreStart - define('STDOUT', 'php://output'); - // @codeCoverageIgnoreEnd + define('STDOUT', 'php://output'); // @codeCoverageIgnore } } From 5137cb65b98c93a69c335e6008842da9cf84c89f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 6 Jan 2023 09:23:20 +0900 Subject: [PATCH 2813/8282] fix: add fallback to use gethostname() [127.0.0.1] is not valid domain parameter. --- system/Email/Email.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/Email/Email.php b/system/Email/Email.php index 384d22fcc63b..dffe4e0e6803 100644 --- a/system/Email/Email.php +++ b/system/Email/Email.php @@ -2101,6 +2101,11 @@ protected function getHostname() return '[' . $_SERVER['SERVER_ADDR'] . ']'; } + $hostname = gethostname(); + if ($hostname !== false) { + return $hostname; + } + return '[127.0.0.1]'; } From 7558424fa2e6d8fd7c6bd41b130cfb271c8f81a5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 6 Jan 2023 09:46:23 +0900 Subject: [PATCH 2814/8282] chore: update Kint to 5.0.2 --- system/ThirdParty/Kint/Parser/XmlPlugin.php | 5 --- system/ThirdParty/Kint/Zval/BlobValue.php | 9 ++++- .../SplFileInfoRepresentation.php | 37 +++++++++++-------- system/ThirdParty/Kint/init.php | 6 ++- user_guide_src/source/changelogs/v4.3.0.rst | 2 +- 5 files changed, 35 insertions(+), 24 deletions(-) diff --git a/system/ThirdParty/Kint/Parser/XmlPlugin.php b/system/ThirdParty/Kint/Parser/XmlPlugin.php index 4e5671fb7273..a5a31abd4361 100644 --- a/system/ThirdParty/Kint/Parser/XmlPlugin.php +++ b/system/ThirdParty/Kint/Parser/XmlPlugin.php @@ -113,11 +113,6 @@ protected static function xmlToSimpleXML(string $var, ?string $parent_path): ?ar /** * Get the DOMDocument info. * - * The documentation of DOMDocument::loadXML() states that while you can - * call it statically, it will give an E_STRICT warning. On my system it - * actually gives an E_DEPRECATED warning, but it works so we'll just add - * an error-silencing '@' to the access path. - * * If it errors loading then we wouldn't have gotten this far in the first place. * * @psalm-param non-empty-string $var The XML string diff --git a/system/ThirdParty/Kint/Zval/BlobValue.php b/system/ThirdParty/Kint/Zval/BlobValue.php index cfee55e60ac8..ff5a6a24cfc9 100644 --- a/system/ThirdParty/Kint/Zval/BlobValue.php +++ b/system/ThirdParty/Kint/Zval/BlobValue.php @@ -74,8 +74,11 @@ class BlobValue extends Value * windows-125x and iso-8859-x which have practically undetectable * differences because they use every single byte available. * - * This is *NOT* reliable and should not be trusted implicitly. As - * with char_encodings, the order of the charsets is significant. + * This is *NOT* reliable and should not be trusted implicitly. Since it + * works by triggering and suppressing conversion warnings, your error + * handler may complain. + * + * As with char_encodings, the order of the charsets is significant. * * This depends on the iconv extension */ @@ -182,6 +185,8 @@ public static function detectEncoding(string $string) if (\function_exists('iconv')) { foreach (self::$legacy_encodings as $encoding) { + // Iconv detection works by triggering + // "Detected an illegal character in input string" warnings if (@\iconv($encoding, $encoding, $string) === $string) { return $encoding; } diff --git a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php index 607877e5aee8..44980d7e359a 100644 --- a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php +++ b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php @@ -28,6 +28,7 @@ namespace Kint\Zval\Representation; use Kint\Utils; +use RuntimeException; use SplFileInfo; class SplFileInfoRepresentation extends Representation @@ -53,24 +54,30 @@ public function __construct(SplFileInfo $fileInfo) { parent::__construct('SplFileInfo'); - if ($fileInfo->getRealPath()) { - $this->realpath = $fileInfo->getRealPath(); - $this->perms = $fileInfo->getPerms(); - $this->size = $fileInfo->getSize(); - $this->owner = $fileInfo->getOwner(); - $this->group = $fileInfo->getGroup(); - $this->ctime = $fileInfo->getCTime(); - $this->mtime = $fileInfo->getMTime(); - } - $this->path = $fileInfo->getPathname(); - $this->is_dir = $fileInfo->isDir(); - $this->is_file = $fileInfo->isFile(); - $this->is_link = $fileInfo->isLink(); + try { + if ($fileInfo->getRealPath()) { + $this->perms = $fileInfo->getPerms(); + $this->size = $fileInfo->getSize(); + $this->owner = $fileInfo->getOwner(); + $this->group = $fileInfo->getGroup(); + $this->ctime = $fileInfo->getCTime(); + $this->mtime = $fileInfo->getMTime(); + $this->realpath = $fileInfo->getRealPath(); + } + + $this->is_dir = $fileInfo->isDir(); + $this->is_file = $fileInfo->isFile(); + $this->is_link = $fileInfo->isLink(); - if ($this->is_link) { - $this->linktarget = $fileInfo->getLinkTarget(); + if ($this->is_link) { + $this->linktarget = $fileInfo->getLinkTarget(); + } + } catch (RuntimeException $e) { + if (false === \strpos($e->getMessage(), ' open_basedir ')) { + throw $e; + } } switch ($this->perms & 0xF000) { diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php index 4c3a22bb500b..7605415b6e6e 100644 --- a/system/ThirdParty/Kint/init.php +++ b/system/ThirdParty/Kint/init.php @@ -53,8 +53,12 @@ if (isset($_SERVER['DOCUMENT_ROOT'])) { Kint::$app_root_dirs = [ $_SERVER['DOCUMENT_ROOT'] => '', - \realpath($_SERVER['DOCUMENT_ROOT']) => '', ]; + + // Suppressed for unreadable document roots (related to open_basedir) + if (false !== @\realpath($_SERVER['DOCUMENT_ROOT'])) { + Kint::$app_root_dirs[\realpath($_SERVER['DOCUMENT_ROOT'])] = ''; + } } Utils::composerSkipFlags(); diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 4ea3b567cf68..2fe99ab82722 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -322,7 +322,7 @@ Others - **Validation:** Added Closure validation rule. See :ref:`validation-using-closure-rule` for details. - **Config:** Now you can specify Composer packages to auto-discover manually. See :ref:`Code Modules `. - **Config:** Added ``Config\Session`` class to handle session configuration. -- **Debug:** Kint has been updated to 5.0.1. +- **Debug:** Kint has been updated to 5.0.2. - **Request:** Added new ``$request->getRawInputVar()`` method to return a specified variable from raw stream. See :ref:`Retrieving Raw data `. - **Request:** Added new ``$request->is()`` method to query the request type. See :ref:`Determining Request Type `. From 7e5d886a0257134f3aa74ce69a6319c0dca72d8d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 6 Jan 2023 20:16:55 +0900 Subject: [PATCH 2815/8282] chore: update copyright year --- user_guide_src/source/conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index a839d7225716..2c5f54865d00 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -12,13 +12,15 @@ # # import os # import sys +import datetime # sys.path.insert(0, os.path.abspath('.')) # -- Project information ----------------------------------------------------- project = 'CodeIgniter' author = 'CodeIgniter Foundation' -copyright = '2019-2023 CodeIgniter Foundation' +year_now = datetime.date.today().year +copyright = '2019-' + str(year_now) + ' CodeIgniter Foundation' # The short X.Y version. version = '4.2' @@ -137,4 +139,4 @@ epub_title = 'CodeIgniter4' epub_author = 'CodeIgniter Foundation' epub_publisher = 'CodeIgniter Foundation' -epub_copyright = '2019-2022 CodeIgniter Foundation' +epub_copyright = copyright From 06357d439a26d00b282a3393b7e68ef4dd12a7fc Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 7 Jan 2023 09:40:02 +0900 Subject: [PATCH 2816/8282] chore: copy files from codeigniter4/userguide --- admin/userguide/.github/scripts/deploy | 15 +++++++++++++ admin/userguide/.github/workflows/deploy.yml | 22 +++++++++++++++++++ admin/userguide/.gitignore | 17 +++++++++++++++ admin/userguide/LICENSE | 21 ++++++++++++++++++ admin/userguide/README.md | 23 ++++++++------------ admin/userguide/composer.json | 16 -------------- 6 files changed, 84 insertions(+), 30 deletions(-) create mode 100755 admin/userguide/.github/scripts/deploy create mode 100644 admin/userguide/.github/workflows/deploy.yml create mode 100644 admin/userguide/.gitignore create mode 100644 admin/userguide/LICENSE delete mode 100644 admin/userguide/composer.json diff --git a/admin/userguide/.github/scripts/deploy b/admin/userguide/.github/scripts/deploy new file mode 100755 index 000000000000..0347c004dfff --- /dev/null +++ b/admin/userguide/.github/scripts/deploy @@ -0,0 +1,15 @@ +#!/bin/sh -e + +# Deploys the User Guide to the production +# website. Triggered by updates to the GitHub +# repo's master branch. + +REPO=/opt/userguide +SITE=/home/public_html/userguides/userguide4 + +cd "$REPO" +git switch master +git pull + +rm -rf "$SITE" +cp -R "$REPO/docs" "$SITE" diff --git a/admin/userguide/.github/workflows/deploy.yml b/admin/userguide/.github/workflows/deploy.yml new file mode 100644 index 000000000000..ac8027fc7410 --- /dev/null +++ b/admin/userguide/.github/workflows/deploy.yml @@ -0,0 +1,22 @@ +# Deploys the User Guide to the production +# website whenever master branch is updated +name: Deploy Production + +on: + push: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: executing remote ssh commands using ssh key + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ${{ secrets.USERNAME }} + key: ${{ secrets.KEY }} + port: ${{ secrets.PORT }} + script: /opt/userguide/.github/scripts/deploy diff --git a/admin/userguide/.gitignore b/admin/userguide/.gitignore new file mode 100644 index 000000000000..bfea17cdc5bb --- /dev/null +++ b/admin/userguide/.gitignore @@ -0,0 +1,17 @@ +*/config/development +*/logs/log-*.php +!*/logs/index.html +*/cache/* +!*/cache/index.html +!*/cache/.htaccess + +user_guide_src/build/* +user_guide_src/cilexer/build/* +user_guide_src/cilexer/dist/* +user_guide_src/cilexer/pycilexer.egg-info/* + +#codeigniter 3 +application/logs/* +!application/logs/index.html +!application/logs/.htaccess +/vendor/ diff --git a/admin/userguide/LICENSE b/admin/userguide/LICENSE new file mode 100644 index 000000000000..81ddccc3d847 --- /dev/null +++ b/admin/userguide/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2018 CodeIgniter 4 web framework + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/admin/userguide/README.md b/admin/userguide/README.md index 10d85692bc38..0ea07075db61 100644 --- a/admin/userguide/README.md +++ b/admin/userguide/README.md @@ -1,20 +1,15 @@ # CodeIgniter 4 User Guide -## What is CodeIgniter? - -CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure. +CodeIgniter 4 is a PHP web framework that is light, fast, flexible, and secure. More information can be found at the [official site](http://codeigniter.com). -This repository holds a composer-installable pre-built user guide for the framework. -It has been built from the -[development repository](https://github.com/codeigniter4/CodeIgniter4). - -More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums. - -## Installation & updates +**This is a read-only repository used to publish the user guide for the current release.** +It is built automatically as part of the framework release workflow, and pull +requests are not accepted here. -`composer require codeigniter4/userguide` will install a copy -of the user guide inside your project, at -`vendor/codeigniter4/userguide`. You can then `composer update` whenever -there is a new release of the framework. +Development is done in the [main repository](https://github.com/codeigniter4/codeigniter4). +If you find problems with the user guide, please submit a correcting pull request there. +If you feel that features are missing or unclear, please comment on our +[forum](https://forum.codeigniter.com/index.php), +in the appropriate CodeIgniter4 subforum. diff --git a/admin/userguide/composer.json b/admin/userguide/composer.json deleted file mode 100644 index 007664b9b2ec..000000000000 --- a/admin/userguide/composer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "codeigniter4/userguide", - "type": "project", - "description": "CodeIgniter4 user guide", - "homepage": "https://codeigniter.com", - "license": "MIT", - "require": { - "php": "^7.4 || ^8.0", - "codeigniter4/framework": "^4" - }, - "support": { - "forum": "https://forum.codeigniter.com/", - "source": "https://github.com/codeigniter4/CodeIgniter4", - "slack": "https://codeigniterchat.slack.com" - } -} From 4c4dc80b40b9b38b468643bd2400ef7b849b79df Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 7 Jan 2023 09:45:26 +0900 Subject: [PATCH 2817/8282] chore: copy files in this repo to userguide --- .github/scripts/deploy-userguide | 6 ++++++ admin/userguide/LICENSE | 21 --------------------- 2 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 admin/userguide/LICENSE diff --git a/.github/scripts/deploy-userguide b/.github/scripts/deploy-userguide index abbb768a5017..7ad20ba82e2d 100755 --- a/.github/scripts/deploy-userguide +++ b/.github/scripts/deploy-userguide @@ -23,6 +23,12 @@ cd $TARGET git checkout master rm -rf docs +# Copy common files +cp -Rf ${SOURCE}/LICENSE ./ + +# Copy repo-specific files +cp -Rf ${SOURCE}/admin/userguid/. ./ + # Copy files cp -Rf ${SOURCE}/user_guide_src/build/html ./docs cp -Rf ${SOURCE}/user_guide_src/build/epub/CodeIgniter.epub ./CodeIgniter${VERSION}.epub diff --git a/admin/userguide/LICENSE b/admin/userguide/LICENSE deleted file mode 100644 index 81ddccc3d847..000000000000 --- a/admin/userguide/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 CodeIgniter 4 web framework - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From bb2aea6c65a18c638fd008614ab09cb5c3b11c92 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 7 Jan 2023 10:09:33 +0900 Subject: [PATCH 2818/8282] chore: remove items for codeigniter 3 --- admin/userguide/.gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin/userguide/.gitignore b/admin/userguide/.gitignore index bfea17cdc5bb..d0eba7f4bdaa 100644 --- a/admin/userguide/.gitignore +++ b/admin/userguide/.gitignore @@ -10,8 +10,4 @@ user_guide_src/cilexer/build/* user_guide_src/cilexer/dist/* user_guide_src/cilexer/pycilexer.egg-info/* -#codeigniter 3 -application/logs/* -!application/logs/index.html -!application/logs/.htaccess /vendor/ From a0eb83124c43a53c47d62817a059f71cadf73868 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 7 Jan 2023 10:10:46 +0900 Subject: [PATCH 2819/8282] chore: fix typo --- .github/scripts/deploy-userguide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/deploy-userguide b/.github/scripts/deploy-userguide index 7ad20ba82e2d..b67c1da94c13 100755 --- a/.github/scripts/deploy-userguide +++ b/.github/scripts/deploy-userguide @@ -27,7 +27,7 @@ rm -rf docs cp -Rf ${SOURCE}/LICENSE ./ # Copy repo-specific files -cp -Rf ${SOURCE}/admin/userguid/. ./ +cp -Rf ${SOURCE}/admin/userguide/. ./ # Copy files cp -Rf ${SOURCE}/user_guide_src/build/html ./docs From fa27b951ee256ee6126182e2d6bcbf510edc94d0 Mon Sep 17 00:00:00 2001 From: baycik Date: Sat, 7 Jan 2023 13:47:14 +0300 Subject: [PATCH 2820/8282] Fixing bug with legacy autoRoute When legacy autoRoute is used in case of using controller that sits in sub directory, that directory is determined and stored in $this->directory and new AutoRouter class. But if we subsequently try to load controller without that is not in a directory, then codeigniter can't find it because the $this->directory var in AutoRoute instance is still holding reference to previous directory. This only happens when we load several controllers from console. In my case after upgrading to 4.2.11 my tests fail because of it. I suggest to remove this return; statement to reset directory in AutoRoute instance also. --- system/Router/Router.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/Router/Router.php b/system/Router/Router.php index 0be0e4383032..8593cdfd0266 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -574,8 +574,6 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va { if (empty($dir)) { $this->directory = null; - - return; } if ($this->autoRouter instanceof AutoRouter) { From 6efb825624cbbcc0c15a8b1d1dc034b0604da568 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 7 Jan 2023 21:29:52 +0900 Subject: [PATCH 2821/8282] docs: add link --- user_guide_src/source/general/urls.rst | 2 ++ user_guide_src/source/installation/troubleshooting.rst | 1 + 2 files changed, 3 insertions(+) diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index ec8ce76c15af..25d7b577d977 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -50,6 +50,8 @@ Route /blog/news/2022/10 Query page=2 ======== ==================================== +.. _urls-remove-index-php: + Removing the index.php file =========================== diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst index 426769938a49..30a8d0f55184 100644 --- a/user_guide_src/source/installation/troubleshooting.rst +++ b/user_guide_src/source/installation/troubleshooting.rst @@ -27,6 +27,7 @@ If a URL like ``/mypage/find/apple`` doesn't work, but the similar URL ``/index.php/mypage/find/apple`` does, that sounds like your **.htaccess** rules (for Apache) are not set up properly, or the ``mod_rewrite`` extension in Apache's **httpd.conf** is commented out. +See :ref:`urls-remove-index-php`. Only the default page loads --------------------------- From a7f85d345aa29a211f0473e19cf76856c9bbf9c1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 9 Jan 2023 09:28:26 +0900 Subject: [PATCH 2822/8282] Prep for 4.2.12 release --- CHANGELOG.md | 19 +++++++++++++++++++ system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/v4.2.12.rst | 2 +- user_guide_src/source/conf.py | 2 +- .../source/installation/upgrade_4212.rst | 6 ++++-- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f245bfd6b062..7837363ab950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [v4.2.12](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.12) (2023-01-09) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.11...v4.2.12) + +### Fixed Bugs +* docs: fix request.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7014 +* fix: `link_tag()` missing `type="application/rss+xml"` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7022 +* fix: Request::getIPaddress() causes error on CLI by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7030 +* docs: fix upgrade_database.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7036 +* fix: `spark migrate:status` shows incorrect filename when format is `Y_m_d_His_` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7038 +* fix: Model::save() object when useAutoIncrement is disabled by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/7042 +* fix: define of STDOUT in CLI init() method by @jozefrebjak in https://github.com/codeigniter4/CodeIgniter4/pull/7052 +* fix: change `getFile()` function of \CodeIgniter\Events\Events to static. by @ping-yee in https://github.com/codeigniter4/CodeIgniter4/pull/7046 +* fix: [Email] add fallback to use gethostname() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7053 +* Fixing bug with legacy autoRoute when testing by @baycik in https://github.com/codeigniter4/CodeIgniter4/pull/7060 + +### Refactoring +* refactor: RequestTrait by rector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7006 +* refactor: update sass output by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7026 + ## [v4.2.11](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.11) (2022-12-21) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.10...v4.2.11) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index e7076c4ba167..79c9ebbf5eae 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -47,7 +47,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.2.11'; + public const CI_VERSION = '4.2.12'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/v4.2.12.rst b/user_guide_src/source/changelogs/v4.2.12.rst index 1b60f46dd481..d3239378f431 100644 --- a/user_guide_src/source/changelogs/v4.2.12.rst +++ b/user_guide_src/source/changelogs/v4.2.12.rst @@ -1,7 +1,7 @@ Version 4.2.12 ############## -Release Date: Unreleased +Release Date: January 9, 2023 **4.2.12 release of CodeIgniter4** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 2c5f54865d00..89b2532c015d 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -26,7 +26,7 @@ version = '4.2' # The full version, including alpha/beta/rc tags. -release = '4.2.11' +release = '4.2.12' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_4212.rst b/user_guide_src/source/installation/upgrade_4212.rst index 233f8881ce96..ff6005d641d3 100644 --- a/user_guide_src/source/installation/upgrade_4212.rst +++ b/user_guide_src/source/installation/upgrade_4212.rst @@ -23,5 +23,7 @@ All Changes This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: -* app/Controllers/BaseController.php -* composer.json +* app/Config/Cache.php +* app/Config/Migrations.php +* app/Controllers/BaseController.php +* composer.json From 32beca197ceb53ea99815a7f04f56a2026630452 Mon Sep 17 00:00:00 2001 From: Noritaka IZUMI Date: Mon, 9 Jan 2023 11:24:42 +0900 Subject: [PATCH 2823/8282] docs: fix the expression of the validation rule "is_unique" --- user_guide_src/source/libraries/validation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 8c624fc6d434..773cf16f6749 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -668,8 +668,8 @@ is_not_unique Yes Checks the database to see if the given value filter (currently accept only one filter). is_unique Yes Checks if this field value exists in the is_unique[table.field,ignore_field,ignore_value] database. Optionally set a column and value - value to ignore, useful when updating records - to ignore itself. + to ignore, useful when updating records to + ignore itself. less_than Yes Fails if field is greater than or equal to less_than[8] the parameter value or not numeric. less_than_equal_to Yes Fails if field is greater than the parameter less_than_equal_to[8] From 04d4cbc3f2579e03d303cd859620f1c1f1da0706 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 01:54:57 +0000 Subject: [PATCH 2824/8282] chore(deps-dev): update rector/rector requirement from 0.15.2 to 0.15.3 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.2...0.15.3) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 50bd5e6dacac..b597ada4b887 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.2", + "rector/rector": "0.15.3", "vimeo/psalm": "^5.0" }, "suggest": { From d01d5bece0cdc45ec62218bde72e01cdfe5943eb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 10 Jan 2023 11:14:21 +0900 Subject: [PATCH 2825/8282] Prep for 4.3.0 release --- CHANGELOG.md | 110 ++++++++++++++++++ system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/v4.3.0.rst | 2 +- user_guide_src/source/conf.py | 4 +- .../source/installation/upgrade_430.rst | 52 ++++++++- 5 files changed, 160 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7837363ab950..60e6e3b4ed00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,115 @@ # Changelog +## [v4.3.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.0) (2023-01-10) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.2.12...v4.3.0) + +### Breaking Changes + +* fix: throws DatabaseException in DB connections by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6163 +* config: DB Error always throws Exception CI_DBUG by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6183 +* Config Property Types by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6214 +* refactor: loading app/Config/routes.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6293 +* fix: exceptionHandler may return invalid HTTP status code by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6228 +* feat: add Form helpers for Validation Errors by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6384 +* fix: ValidationInterface by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6253 +* [Reverted] Make Unique Index Name Unique by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6516 +* fix: types in database classes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6527 +* fix: ResponseInterface (1) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6556 +* Improve BaseConnection::getForeignKeyData() and Forge::addForeignKey() by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6468 +* Refactor BaseBuilder *Batch() Methods by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/6536 +* refactor: remove `type="text/javascript"` in ', ]; - $template = '{! title!}'; + $template = '{! title !}'; $this->parser->setData($data); $this->assertSame('', $this->parser->renderString($template)); } From 43d3f8d2c73195a1394266785e1fa3d670064a65 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 17:41:44 +0900 Subject: [PATCH 2929/8282] docs: add test case --- tests/system/View/ParserTest.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index e04991146f98..cfa2ab1e81e8 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -605,6 +605,19 @@ public function testParserNoEscape() $this->assertSame('', $this->parser->renderString($template)); } + public function testParserNoEscapeAndDelimiterChange() + { + $this->parser->setDelimiters('{{', '}}'); + + $data = [ + 'title' => '', + ]; + $this->parser->setData($data); + + $template = '{{! title !}}'; + $this->assertSame('', $this->parser->renderString($template)); + } + public function testIgnoresComments() { $data = [ From 8451f913b3fd80b540c05b5200d0b454228ab183 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 17:42:05 +0900 Subject: [PATCH 2930/8282] style: break long line --- system/View/Parser.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/View/Parser.php b/system/View/Parser.php index 8d0331a9e1cf..7f483183b1ab 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -257,7 +257,9 @@ protected function parse(string $template, array $data = [], ?array $options = n */ protected function parseSingle(string $key, string $val): array { - $pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#') . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ums'; + $pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#') + . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' + . $this->rightDelimiter . '#ums'; return [$pattern => $val]; } From a5bce2ff9c5af0c8fa733c5915ca76efd6639dcc Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 17:43:23 +0900 Subject: [PATCH 2931/8282] fix: ! for no escape does not work if delimiter is changed --- system/View/Parser.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/View/Parser.php b/system/View/Parser.php index 7f483183b1ab..b9abf91edb5f 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -508,7 +508,10 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f // Replace the content in the template return preg_replace_callback($pattern, function ($matches) use ($content, $escape) { // Check for {! !} syntax to not escape this one. - if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}') { + if ( + strpos($matches[0], $this->leftDelimiter . '!') === 0 + && substr($matches[0], -1 - strlen($this->rightDelimiter)) === '!' . $this->rightDelimiter + ) { $escape = false; } From 238517bdad454ce14f19641f4e39bd44d84cf78c Mon Sep 17 00:00:00 2001 From: Toto Date: Tue, 17 Jan 2023 18:09:02 +0700 Subject: [PATCH 2932/8282] add `application/vnd.microsoft.portable-executable` and `application/x-dosexec` --- app/Config/Mimes.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php index 6b06c4e3a3f5..99d28e5f8f86 100644 --- a/app/Config/Mimes.php +++ b/app/Config/Mimes.php @@ -53,6 +53,8 @@ class Mimes 'lzh' => 'application/octet-stream', 'exe' => [ 'application/octet-stream', + 'application/vnd.microsoft.portable-executable', + 'application/x-dosexec', 'application/x-msdownload', ], 'class' => 'application/octet-stream', From 4e5cf20b70bbeb8dadf11ed7c3975a2ac75ff75d Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 17 Jan 2023 12:35:25 -0800 Subject: [PATCH 2933/8282] Fix logic for RawSql Allow RawSql for both key and value. When key only and value is null then we treat a little different. --- system/Database/BaseBuilder.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 9e2c634cb7f2..3eb0aaaadc86 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -728,9 +728,16 @@ public function orWhere($key, $value = null, ?bool $escape = null) */ protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null) { + $rawSqlOnly = false; + if ($key instanceof RawSql) { - $keyValue = [(string) $key => $key]; - $escape = false; + if ($value === null) { + $keyValue = [(string) $key => $key]; + $rawSqlOnly = true; + } else { + $keyValue = [(string) $key => $value]; + } + $escape = false; } elseif (! is_array($key)) { $keyValue = [$key => $value]; } else { @@ -745,7 +752,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type foreach ($keyValue as $k => $v) { $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type); - if ($v instanceof RawSql) { + if ($rawSqlOnly === true) { $k = ''; $op = ''; } elseif ($v !== null) { From 2a267ea09ac16be5c3fa80d1a450d6d3832325e2 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 17 Jan 2023 12:36:04 -0800 Subject: [PATCH 2934/8282] Add test for different uses of RawSql --- tests/system/Database/Builder/WhereTest.php | 45 +++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index 4d5884dc05a0..9a5b412adc99 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -174,6 +174,51 @@ public function testWhereRawSql() $this->assertSame($expectedBinds, $builder->getBinds()); } + public function testWhereValueRawSql() + { + $sql = $this->db->table('auth_bearer') + ->select('*') + ->where('expires', new RawSql('DATE_ADD(NOW(), INTERVAL 2 HOUR)')) + ->getCompiledSelect(true); + + $expected = <<<'SQL' + SELECT * + FROM "auth_bearer" + WHERE "expires" = DATE_ADD(NOW(), INTERVAL 2 HOUR) + SQL; + $this->assertSame($expected, $sql); + } + + public function testWhereKeyAndValueRawSql() + { + $sql = $this->db->table('auth_bearer') + ->select('*') + ->where(new RawSql('CURRENT_TIMESTAMP()'), new RawSql('DATE_ADD(column, INTERVAL 2 HOUR)')) + ->getCompiledSelect(true); + + $expected = <<<'SQL' + SELECT * + FROM "auth_bearer" + WHERE CURRENT_TIMESTAMP() = DATE_ADD(column, INTERVAL 2 HOUR) + SQL; + $this->assertSame($expected, $sql); + } + + public function testWhereKeyAndValueRawSqlWithOperator() + { + $sql = $this->db->table('auth_bearer') + ->select('*') + ->where(new RawSql('CURRENT_TIMESTAMP() >='), new RawSql('DATE_ADD(column, INTERVAL 2 HOUR)')) + ->getCompiledSelect(true); + + $expected = <<<'SQL' + SELECT * + FROM "auth_bearer" + WHERE CURRENT_TIMESTAMP() >= DATE_ADD(column, INTERVAL 2 HOUR) + SQL; + $this->assertSame($expected, $sql); + } + public function testWhereValueSubQuery() { $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)'; From c12600cbb75bbbc1c0da391722271d180341fb94 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 17 Jan 2023 12:44:25 -0800 Subject: [PATCH 2935/8282] Remove Escape RawSql already avoids escape. This was removed for instances where key is RawSql and value isn't --- system/Database/BaseBuilder.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 3eb0aaaadc86..a7aabc7b97c8 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -737,7 +737,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type } else { $keyValue = [(string) $key => $value]; } - $escape = false; } elseif (! is_array($key)) { $keyValue = [$key => $value]; } else { From a79f8b3261ee9ede3b91ac997d8607cb769d7366 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 17 Jan 2023 12:46:00 -0800 Subject: [PATCH 2936/8282] Revert prior commit escape is being set false here not to true. --- system/Database/BaseBuilder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index a7aabc7b97c8..3eb0aaaadc86 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -737,6 +737,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type } else { $keyValue = [(string) $key => $value]; } + $escape = false; } elseif (! is_array($key)) { $keyValue = [$key => $value]; } else { From 8d0e216853541656d6e51ebe92602aed2ae46062 Mon Sep 17 00:00:00 2001 From: sclubricants Date: Tue, 17 Jan 2023 16:00:40 -0800 Subject: [PATCH 2937/8282] Removed $escape = false; again Added another test where this makes a difference. --- system/Database/BaseBuilder.php | 1 - tests/system/Database/Builder/WhereTest.php | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 3eb0aaaadc86..a7aabc7b97c8 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -737,7 +737,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type } else { $keyValue = [(string) $key => $value]; } - $escape = false; } elseif (! is_array($key)) { $keyValue = [$key => $value]; } else { diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index 9a5b412adc99..a4b592ffd28c 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -189,6 +189,21 @@ public function testWhereValueRawSql() $this->assertSame($expected, $sql); } + public function testWhereKeyOnlyRawSql() + { + $sql = $this->db->table('auth_bearer') + ->select('*') + ->where(new RawSql('DATE_ADD(NOW(), INTERVAL 2 HOUR)'), '2023-01-01') + ->getCompiledSelect(true); + + $expected = <<<'SQL' + SELECT * + FROM "auth_bearer" + WHERE DATE_ADD(NOW(), INTERVAL 2 HOUR) = '2023-01-01' + SQL; + $this->assertSame($expected, $sql); + } + public function testWhereKeyAndValueRawSql() { $sql = $this->db->table('auth_bearer') From 11e6d1a6e982ade5a4dbf2823878a1118cef16f6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 18 Jan 2023 10:04:51 +0900 Subject: [PATCH 2938/8282] fix: RawSql disappear without error Throws an exception. --- system/Database/BaseBuilder.php | 4 ++++ tests/system/Database/Builder/InsertTest.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 9e2c634cb7f2..7331cc85c75e 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -3209,6 +3209,10 @@ protected function objectToArray($object) return $object; } + if ($object instanceof RawSql) { + throw new InvalidArgumentException('RawSql "' . $object . '" cannot be used here.'); + } + $array = []; foreach (get_object_vars($object) as $key => $val) { diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index 6601c6847366..b0fc3890cc3c 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -16,6 +16,7 @@ use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use InvalidArgumentException; /** * @internal @@ -279,4 +280,22 @@ public function testInsertBatchThrowsExceptionOnEmptyData() $this->expectExceptionMessage('insertBatch() has no data.'); $builder->insertBatch([]); } + + public function testSetIncorrectRawSqlUsage() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage( + 'RawSql "expires = DATE_ADD(NOW(), INTERVAL 2 HOUR)" cannot be used here.' + ); + + $builder = $this->db->table('auth_bearer'); + + $builder->testMode() + ->set([ + 'jti' => 'jti', + 'proctorID' => '12', + ]) + ->set(new RawSql('expires = DATE_ADD(NOW(), INTERVAL 2 HOUR)')) + ->insert(); + } } From 9f35ec5dd10784bf4f3808ded1f8e275c9516188 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Wed, 18 Jan 2023 09:05:53 +0700 Subject: [PATCH 2939/8282] fix: ordering validation show error by call set rule --- system/Validation/Validation.php | 2 +- tests/system/Validation/ValidationTest.php | 47 ++++++++++++++++++++-- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 41aaa4a098fb..c22f38ae2413 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -443,7 +443,7 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [ $ruleSet[$field]['errors'] = $errors; } - $this->setRules($ruleSet + $this->getRules(), $this->customErrors); + $this->setRules(array_merge($this->getRules(), $ruleSet), $this->customErrors); return $this; } diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index 6597866b3f88..2c6d52337fe9 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -102,6 +102,27 @@ public function testSetRuleStoresRule() ], $this->validation->getRules()); } + public function testSetRuleMultipleWithIndividual() + { + $this->validation->setRule('username', 'Username', 'required|min_length[3]'); + $this->validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']); + + $this->assertSame([ + 'username' => [ + 'label' => 'Username', + 'rules' => 'required|min_length[3]', + ], + 'password' => [ + 'label' => 'Password', + 'rules' => [ + 'required', + 'min_length[8]', + 'alpha_numeric_punct', + ], + ], + ], $this->validation->getRules()); + } + public function testSetRuleAddsRule() { $this->validation->setRules([ @@ -113,14 +134,14 @@ public function testSetRuleAddsRule() $this->validation->setRule('foo', null, 'foo|foz'); $this->assertSame([ - 'foo' => [ - 'label' => null, - 'rules' => 'foo|foz', - ], 'bar' => [ 'label' => null, 'rules' => 'bar|baz', ], + 'foo' => [ + 'label' => null, + 'rules' => 'foo|foz', + ], ], $this->validation->getRules()); } @@ -142,6 +163,24 @@ public function testSetRuleOverwritesRule() ], $this->validation->getRules()); } + public function testSetRuleOverwritesRuleReverse() + { + $this->validation->setRule('foo', null, 'foo|foz'); + $this->validation->setRules([ + 'foo' => [ + 'label' => null, + 'rules' => 'bar|baz', + ], + ]); + + $this->assertSame([ + 'foo' => [ + 'label' => null, + 'rules' => 'bar|baz', + ], + ], $this->validation->getRules()); + } + /** * @dataProvider setRuleRulesFormatCaseProvider * From 4e2a8505ba3545647ce98c3cb2bb7e0e095ce581 Mon Sep 17 00:00:00 2001 From: totoprayogo1916 Date: Wed, 18 Jan 2023 05:42:12 +0700 Subject: [PATCH 2940/8282] update close-pull-request.yml - add types for pull_request_target - add permission - use GitHub CLI --- .../.github/workflows/close-pull-request.yml | 14 ++++++++++---- .../.github/workflows/close-pull-request.yml | 14 ++++++++++---- .../.github/workflows/close-pull-request.yml | 14 ++++++++++---- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/admin/framework/.github/workflows/close-pull-request.yml b/admin/framework/.github/workflows/close-pull-request.yml index 4e01f30f5138..7106224836f6 100644 --- a/admin/framework/.github/workflows/close-pull-request.yml +++ b/admin/framework/.github/workflows/close-pull-request.yml @@ -2,17 +2,23 @@ name: Close Pull Request on: pull_request_target: - types: [opened] + types: [opened, reopened] + +permissions: + pull-requests: write jobs: main: runs-on: ubuntu-latest steps: - name: Close PR with nice message - uses: superbrothers/close-pull-request@v3 - with: - comment: > + run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}" + working-directory: ${{ github.workspace }} + env: + COMMENT: > Thank you for your pull request. However, you have submitted your PR on a read-only split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ISSUE: ${{ github.event.pull_request.html_url }} diff --git a/admin/starter/.github/workflows/close-pull-request.yml b/admin/starter/.github/workflows/close-pull-request.yml index 4e01f30f5138..7106224836f6 100644 --- a/admin/starter/.github/workflows/close-pull-request.yml +++ b/admin/starter/.github/workflows/close-pull-request.yml @@ -2,17 +2,23 @@ name: Close Pull Request on: pull_request_target: - types: [opened] + types: [opened, reopened] + +permissions: + pull-requests: write jobs: main: runs-on: ubuntu-latest steps: - name: Close PR with nice message - uses: superbrothers/close-pull-request@v3 - with: - comment: > + run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}" + working-directory: ${{ github.workspace }} + env: + COMMENT: > Thank you for your pull request. However, you have submitted your PR on a read-only split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ISSUE: ${{ github.event.pull_request.html_url }} diff --git a/admin/userguide/.github/workflows/close-pull-request.yml b/admin/userguide/.github/workflows/close-pull-request.yml index 4e01f30f5138..7106224836f6 100644 --- a/admin/userguide/.github/workflows/close-pull-request.yml +++ b/admin/userguide/.github/workflows/close-pull-request.yml @@ -2,17 +2,23 @@ name: Close Pull Request on: pull_request_target: - types: [opened] + types: [opened, reopened] + +permissions: + pull-requests: write jobs: main: runs-on: ubuntu-latest steps: - name: Close PR with nice message - uses: superbrothers/close-pull-request@v3 - with: - comment: > + run: gh pr close ${{ env.ISSUE }} -c "${{ env.COMMENT }}" + working-directory: ${{ github.workspace }} + env: + COMMENT: > Thank you for your pull request. However, you have submitted your PR on a read-only split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ISSUE: ${{ github.event.pull_request.html_url }} From 4908a4712806e143f7b6cdbf0f18bc4af4301993 Mon Sep 17 00:00:00 2001 From: totoprayogo1916 Date: Wed, 18 Jan 2023 11:33:56 +0700 Subject: [PATCH 2941/8282] add tag `code` --- admin/framework/.github/workflows/close-pull-request.yml | 2 +- admin/starter/.github/workflows/close-pull-request.yml | 2 +- admin/userguide/.github/workflows/close-pull-request.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/framework/.github/workflows/close-pull-request.yml b/admin/framework/.github/workflows/close-pull-request.yml index 4e01f30f5138..3a7d2769c88b 100644 --- a/admin/framework/.github/workflows/close-pull-request.yml +++ b/admin/framework/.github/workflows/close-pull-request.yml @@ -13,6 +13,6 @@ jobs: with: comment: > Thank you for your pull request. However, you have submitted your PR on a read-only - split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does + split of codeigniter4/CodeIgniter4. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. diff --git a/admin/starter/.github/workflows/close-pull-request.yml b/admin/starter/.github/workflows/close-pull-request.yml index 4e01f30f5138..3a7d2769c88b 100644 --- a/admin/starter/.github/workflows/close-pull-request.yml +++ b/admin/starter/.github/workflows/close-pull-request.yml @@ -13,6 +13,6 @@ jobs: with: comment: > Thank you for your pull request. However, you have submitted your PR on a read-only - split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does + split of codeigniter4/CodeIgniter4. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. diff --git a/admin/userguide/.github/workflows/close-pull-request.yml b/admin/userguide/.github/workflows/close-pull-request.yml index 4e01f30f5138..3a7d2769c88b 100644 --- a/admin/userguide/.github/workflows/close-pull-request.yml +++ b/admin/userguide/.github/workflows/close-pull-request.yml @@ -13,6 +13,6 @@ jobs: with: comment: > Thank you for your pull request. However, you have submitted your PR on a read-only - split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does + split of codeigniter4/CodeIgniter4. This repository, unfortunately, does not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 repository.

      Thank you. From d5f03cd10d46980a90caccaa0276fd7e99f26fba Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 18 Jan 2023 20:35:02 +0900 Subject: [PATCH 2942/8282] docs: add section titles --- user_guide_src/source/database/queries.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst index cefc49c705f5..4efa3ffe7791 100644 --- a/user_guide_src/source/database/queries.rst +++ b/user_guide_src/source/database/queries.rst @@ -56,17 +56,26 @@ fetchable results. Working with Database Prefixes Manually *************************************** +$db->prefixTable() +================== + If you have configured a database prefix and would like to prepend it to a table name for use in a native SQL query for example, then you can use the following: .. literalinclude:: queries/004.php +$db->setPrefix() +================ + If for any reason you would like to change the prefix programmatically without needing to create a new connection you can use this method: .. literalinclude:: queries/005.php +$db->getPrefix() +================ + You can get the current prefix any time with this method: .. literalinclude:: queries/006.php @@ -75,6 +84,9 @@ You can get the current prefix any time with this method: Protecting Identifiers ********************** +$db->protectIdentifiers() +========================= + In many databases, it is advisable to protect table and field names - for example with backticks in MySQL. **Query Builder queries are automatically protected**, but if you need to manually protect an From 2e80e28570dabb47d53d58683050f14d168d265b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 18 Jan 2023 20:35:26 +0900 Subject: [PATCH 2943/8282] docs: improve section titles --- user_guide_src/source/database/queries.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst index 4efa3ffe7791..67480a5ac17d 100644 --- a/user_guide_src/source/database/queries.rst +++ b/user_guide_src/source/database/queries.rst @@ -269,8 +269,10 @@ hasError() Returns boolean true/false if the last ``execute()`` call created any errors. -getErrorCode() getErrorMessage() --------------------------------- +getErrorCode() +-------------- +getErrorMessage() +----------------- If any errors were encountered these methods can be used to retrieve the error code and string. @@ -283,8 +285,8 @@ Internally, all queries are processed and stored as instances of the parameters, otherwise preparing the query, and storing performance data about its query. -getLastQuery() -============== +$db->getLastQuery() +=================== When you just need to retrieve the last Query object, use the ``getLastQuery()`` method: From 4a9158c665efa0ec3eb17e230cedb77dbb592fea Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 18 Jan 2023 20:36:00 +0900 Subject: [PATCH 2944/8282] docs: add empty lines I don't know why, but without these empty lines, PhpStorm's Structure window does not show correct structure. --- user_guide_src/source/database/queries.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst index 67480a5ac17d..35d8c5ad08df 100644 --- a/user_guide_src/source/database/queries.rst +++ b/user_guide_src/source/database/queries.rst @@ -80,6 +80,7 @@ You can get the current prefix any time with this method: .. literalinclude:: queries/006.php + ********************** Protecting Identifiers ********************** @@ -105,6 +106,7 @@ prefixing set ``true`` (boolean) via the second parameter: .. literalinclude:: queries/008.php + *************** Escaping Values *************** @@ -196,6 +198,7 @@ example: .. literalinclude:: queries/015.php + **************** Prepared Queries **************** From c82a4c7209d84fe0ace91b0fb9888bbbd8edfaa6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 18 Jan 2023 20:38:34 +0900 Subject: [PATCH 2945/8282] docs: remove line break --- user_guide_src/source/database/queries/011.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide_src/source/database/queries/011.php b/user_guide_src/source/database/queries/011.php index e3b1f9033bc9..484bf11e0f76 100644 --- a/user_guide_src/source/database/queries/011.php +++ b/user_guide_src/source/database/queries/011.php @@ -1,5 +1,4 @@ escapeLikeString($search) . "%' ESCAPE '!'"; +$sql = "SELECT id FROM table WHERE column LIKE '%" . $db->escapeLikeString($search) . "%' ESCAPE '!'"; From 9734da61912d04979226ed2d791676945e6816cb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 09:45:04 +0900 Subject: [PATCH 2946/8282] docs: fix section title for consistency --- user_guide_src/source/changelogs/v4.1.4.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst index 60a4a9c21432..08f83142a273 100644 --- a/user_guide_src/source/changelogs/v4.1.4.rst +++ b/user_guide_src/source/changelogs/v4.1.4.rst @@ -12,8 +12,8 @@ Release Date: September 6, 2021 This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new `CodeIgniter Coding Standard `_ (based on PSR-12). -Breaking Changes ----------------- +BREAKING +-------- - The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses: From 00f4400162c5cc1ddbda62d01c5c3306ce04ff8d Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 09:46:10 +0900 Subject: [PATCH 2947/8282] docs: move section for consistency --- user_guide_src/source/changelogs/v4.0.5.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.0.5.rst b/user_guide_src/source/changelogs/v4.0.5.rst index 4c2fd34dabaf..12e2e215e357 100644 --- a/user_guide_src/source/changelogs/v4.0.5.rst +++ b/user_guide_src/source/changelogs/v4.0.5.rst @@ -26,13 +26,6 @@ Changes - System messages defined in **system/Language/en/** are now strictly for internal framework use and are not covered by backwards compatibility (BC) promise. Users may use these messages in their applications but at their own risks. -Bugs Fixed ----------- - -- Fixed a bug in ``Entity`` class where declaring class parameters was preventing data propagation to the ``attributes`` array. -- Handling for the environment variable ``encryption.key`` has changed. Previously, explicit function calls, like ``getenv('encryption.key')`` or ``env('encryption.key')`` where the value has the special prefix ``hex2bin:`` returns an automatically converted binary string. This is now changed to just return the character string with the prefix. This change was due to incompatibility with handling binary strings in environment variables on Windows platforms. However, accessing ``$key`` using ``Encryption`` class config remains unchanged and still returns a binary string. -- ``Config\Services`` (in **app/Config/Services.php**) now extends ``CodeIgniter\Config\BaseService`` to allow proper discovery of third-party services. - Deprecations ------------ @@ -55,3 +48,11 @@ Deprecations - Deprecated ``CodeIgniter\HTTP\Message::getHeader()`` in favor of ``header()`` to prepare for PSR-7 - Deprecated ``CodeIgniter\HTTP\Message::getHeaders()`` in favor of ``headers()`` to prepare for PSR-7 - Deprecated ``Config\Cache::$storePath`` in favor of ``Config\Cache::$file['storePath']`` + +Bugs Fixed +---------- + +- Fixed a bug in ``Entity`` class where declaring class parameters was preventing data propagation to the ``attributes`` array. +- Handling for the environment variable ``encryption.key`` has changed. Previously, explicit function calls, like ``getenv('encryption.key')`` or ``env('encryption.key')`` where the value has the special prefix ``hex2bin:`` returns an automatically converted binary string. This is now changed to just return the character string with the prefix. This change was due to incompatibility with handling binary strings in environment variables on Windows platforms. However, accessing ``$key`` using ``Encryption`` class config remains unchanged and still returns a binary string. +- ``Config\Services`` (in **app/Config/Services.php**) now extends ``CodeIgniter\Config\BaseService`` to allow proper discovery of third-party services. + From 8a9d7817219cfdb195d63497199917fb06fe112e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 17 Jan 2023 09:46:40 +0900 Subject: [PATCH 2948/8282] docs: add or update links to repo's CHANGELOG --- user_guide_src/source/changelogs/v4.0.3.rst | 4 ++++ user_guide_src/source/changelogs/v4.0.4.rst | 4 ++++ user_guide_src/source/changelogs/v4.0.5.rst | 3 +++ user_guide_src/source/changelogs/v4.1.0.rst | 7 +++++++ user_guide_src/source/changelogs/v4.1.1.rst | 4 ++++ user_guide_src/source/changelogs/v4.1.2.rst | 6 ++++-- user_guide_src/source/changelogs/v4.1.3.rst | 4 ++++ user_guide_src/source/changelogs/v4.1.4.rst | 4 ++++ user_guide_src/source/changelogs/v4.1.5.rst | 4 +++- user_guide_src/source/changelogs/v4.1.6.rst | 4 +++- user_guide_src/source/changelogs/v4.1.7.rst | 4 +++- 11 files changed, 43 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.0.3.rst b/user_guide_src/source/changelogs/v4.0.3.rst index 80a93c3100cf..126f01cc06e0 100644 --- a/user_guide_src/source/changelogs/v4.0.3.rst +++ b/user_guide_src/source/changelogs/v4.0.3.rst @@ -31,3 +31,7 @@ Bugs Fixed - Default pagination templates fixed to use the correct locale. - Lots of tweaks and corrections in the user guide. - Fixed locating files in custom namespaces that were occassionally not found. Primarily affected console commands. + +See the repo's +`CHANGELOG_4.0.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.0.4.rst b/user_guide_src/source/changelogs/v4.0.4.rst index 90dddc804c5a..1e8a85c50277 100644 --- a/user_guide_src/source/changelogs/v4.0.4.rst +++ b/user_guide_src/source/changelogs/v4.0.4.rst @@ -65,3 +65,7 @@ Bugs Fixed - Ensure get translation output logic work on selected locale, dashed locale, and fallback "en". - Fix ``is_unique``/``is_not_unique`` validation called on POST/PUT via API in PostgreSQL. - Fixed a bug where filter arguments were not passed to ``after()``. + +See the repo's +`CHANGELOG_4.0.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.0.5.rst b/user_guide_src/source/changelogs/v4.0.5.rst index 12e2e215e357..777e2fd1193b 100644 --- a/user_guide_src/source/changelogs/v4.0.5.rst +++ b/user_guide_src/source/changelogs/v4.0.5.rst @@ -56,3 +56,6 @@ Bugs Fixed - Handling for the environment variable ``encryption.key`` has changed. Previously, explicit function calls, like ``getenv('encryption.key')`` or ``env('encryption.key')`` where the value has the special prefix ``hex2bin:`` returns an automatically converted binary string. This is now changed to just return the character string with the prefix. This change was due to incompatibility with handling binary strings in environment variables on Windows platforms. However, accessing ``$key`` using ``Encryption`` class config remains unchanged and still returns a binary string. - ``Config\Services`` (in **app/Config/Services.php**) now extends ``CodeIgniter\Config\BaseService`` to allow proper discovery of third-party services. +See the repo's +`CHANGELOG_4.0.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.0.rst b/user_guide_src/source/changelogs/v4.1.0.rst index 25fa9a5f6726..eee8abfddc28 100644 --- a/user_guide_src/source/changelogs/v4.1.0.rst +++ b/user_guide_src/source/changelogs/v4.1.0.rst @@ -23,3 +23,10 @@ Deprecations ************ - Deprecated ``Model::fillPlaceholders()`` method, use ``Validation::fillPlaceholders()`` instead. + +Bugs Fixed +********** + +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.1.rst b/user_guide_src/source/changelogs/v4.1.1.rst index a99fb24d3770..aeccef6e3c41 100644 --- a/user_guide_src/source/changelogs/v4.1.1.rst +++ b/user_guide_src/source/changelogs/v4.1.1.rst @@ -15,3 +15,7 @@ Bugs Fixed - Fixed an issue where ``.gitattributes`` was preventing framework downloads. Note that this fix was also applied retroactively to ``4.0.5`` on the **framework** repo. + +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.2.rst b/user_guide_src/source/changelogs/v4.1.2.rst index 572188e6ff94..c25cb11f32b7 100644 --- a/user_guide_src/source/changelogs/v4.1.2.rst +++ b/user_guide_src/source/changelogs/v4.1.2.rst @@ -64,6 +64,8 @@ Deprecations Bugs Fixed ---------- -See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. - - ``BaseConnection::query()`` now returns ``false`` for failed queries (unless ``DBDebug==true``, in which case an exception will be thrown) and returns boolean values for write-type queries as specified in the docs. + +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.3.rst b/user_guide_src/source/changelogs/v4.1.3.rst index 36eb4230d51b..73ae4a4a8380 100644 --- a/user_guide_src/source/changelogs/v4.1.3.rst +++ b/user_guide_src/source/changelogs/v4.1.3.rst @@ -30,3 +30,7 @@ Bugs Fixed - Fixed a bug where CLI mode was not detected under ``cgi-fcgi`` - Fixed a logic bug in Cookie construction - Fixed numerous issues in SQLite3's ``Forge`` class related to an incorrect attribute name + +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst index 08f83142a273..b3fad8dd8b53 100644 --- a/user_guide_src/source/changelogs/v4.1.4.rst +++ b/user_guide_src/source/changelogs/v4.1.4.rst @@ -57,3 +57,7 @@ BREAKING * ``CodeIgniter\Session\Handlers\FileHandler`` * ``CodeIgniter\Session\Handlers\MemcachedHandler`` * ``CodeIgniter\Session\Handlers\RedisHandler`` + +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of changes. diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst index 960d29b8a4f9..02393424dacb 100644 --- a/user_guide_src/source/changelogs/v4.1.5.rst +++ b/user_guide_src/source/changelogs/v4.1.5.rst @@ -45,4 +45,6 @@ Deprecations Bugs Fixed ========== -See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst index 84e4f9f7d39e..14e43d0adc84 100644 --- a/user_guide_src/source/changelogs/v4.1.6.rst +++ b/user_guide_src/source/changelogs/v4.1.6.rst @@ -68,4 +68,6 @@ And the following methods are deprecated: Bugs Fixed ********** -See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/changelogs/v4.1.7.rst b/user_guide_src/source/changelogs/v4.1.7.rst index 5c9d07357858..592358514b09 100644 --- a/user_guide_src/source/changelogs/v4.1.7.rst +++ b/user_guide_src/source/changelogs/v4.1.7.rst @@ -32,4 +32,6 @@ none. Bugs Fixed ********** -See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. +See the repo's +`CHANGELOG_4.1.md `_ +for a complete list of bugs fixed. From 77467afaf62199ee0953ec3960547a10b1f47012 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 19 Jan 2023 17:07:02 +0900 Subject: [PATCH 2949/8282] docs: add versionadded --- user_guide_src/source/database/query_builder.rst | 8 ++++++++ user_guide_src/source/dbmgmt/forge.rst | 3 ++- user_guide_src/source/general/errors.rst | 4 ++++ user_guide_src/source/incoming/controllers.rst | 2 ++ user_guide_src/source/incoming/incomingrequest.rst | 2 +- user_guide_src/source/incoming/routing.rst | 8 ++++++++ user_guide_src/source/libraries/encryption.rst | 2 ++ 7 files changed, 27 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index a53ecc65415c..709e55838941 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -148,6 +148,8 @@ escaping of fields may break them. RawSql ^^^^^^ +.. versionadded:: 4.2.0 + Since v4.2.0, ``$builder->select()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. .. literalinclude:: query_builder/099.php @@ -265,6 +267,8 @@ outer``, and ``right outer``. RawSql ^^^^^^ +.. versionadded:: 4.2.0 + Since v4.2.0, ``$builder->join()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. .. literalinclude:: query_builder/102.php @@ -335,6 +339,8 @@ methods: 5. RawSql ^^^^^^^^^ + .. versionadded:: 4.2.0 + Since v4.2.0, ``$builder->where()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. .. literalinclude:: query_builder/100.php @@ -450,6 +456,8 @@ searches. 3. RawSql ^^^^^^^^^ + .. versionadded:: 4.2.0 + Since v4.2.0, ``$builder->like()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. .. literalinclude:: query_builder/101.php diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index ee5731d85064..3de1c8d4924c 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -122,8 +122,9 @@ The add fields method will accept the above array. Raw Sql Strings as Default Values --------------------------------- -Since v4.2.0, ``$forge->addField()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. +.. versionadded:: 4.2.0 +Since v4.2.0, ``$forge->addField()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings. .. literalinclude:: forge/027.php diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index ee3c09e8c64a..c46aed6572ce 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -119,6 +119,8 @@ redirect code to use instead of the default (``302``, "temporary redirect"): Specify HTTP Status Code in Your Exception ========================================== +.. versionadded:: 4.3.0 + Since v4.3.0, you can specify the HTTP status code for your Exception class to implement ``HTTPExceptionInterface``. @@ -129,6 +131,8 @@ When an exception implementing ``HTTPExceptionInterface`` is caught by CodeIgnit Specify Exit Code in Your Exception =================================== +.. versionadded:: 4.3.0 + Since v4.3.0, you can specify the exit code for your Exception class to implement ``HasExitCodeInterface``. diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index cc9482384089..cd7023653b55 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -153,6 +153,8 @@ Auto-routing also will not work. Auto Routing (Improved) ************************ +.. versionadded:: 4.2.0 + Since v4.2.0, the new more secure Auto Routing has been introduced. .. note:: If you are familiar with Auto Routing, which was enabled by default diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index dbb5c664a734..163a0b46b68a 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -45,7 +45,7 @@ be checked with the ``isAJAX()`` and ``isCLI()`` methods: is() ==== - .. versionadded:: 4.3.0 +.. versionadded:: 4.3.0 Since v4.3.0, you can use the ``is()`` method. It returns boolean. diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index be01d92d3d51..9dbe274b0a0f 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -151,6 +151,8 @@ will only match **product/123** and generate 404 errors for other example. Array Callable Syntax ===================== +.. versionadded:: 4.2.0 + Since v4.2.0, you can use array callable syntax to specify the controller: .. literalinclude:: routing/013.php @@ -427,6 +429,8 @@ You may also supply arguments to be passed to the alias filter's ``before()`` an Classname Filter ^^^^^^^^^^^^^^^^ +.. versionadded:: 4.1.5 + You specify a filter classname for the filter value: .. literalinclude:: routing/036.php @@ -434,6 +438,8 @@ You specify a filter classname for the filter value: Multiple Filters ^^^^^^^^^^^^^^^^ +.. versionadded:: 4.1.5 + .. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See :ref:`upgrade-415-multiple-filters-for-a-route` for the details. You specify an array for the filter value: @@ -604,6 +610,8 @@ For an example use of lowering the priority see :ref:`routing-priority`: Auto Routing (Improved) *********************** +.. versionadded:: 4.2.0 + Since v4.2.0, the new more secure Auto Routing has been introduced. .. note:: If you are familiar with Auto Routing, which was enabled by default diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index 15086cf69857..86fbbb32eb6f 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -84,6 +84,8 @@ an instance of the ``Config\Encryption`` class. Configuration to Maintain Compatibility with CI3 ------------------------------------------------ +.. versionadded:: 4.3.0 + Since v4.3.0, you can decrypt data encrypted with CI3's Encryption. If you need to decrypt such data, use the following settings to maintain compatibility. From ce8942456ae28e8f6f5768fb2dac587abc8bbb0c Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:33:18 +0900 Subject: [PATCH 2950/8282] docs: update PHPDoc --- system/Common.php | 4 ++-- system/Helpers/url_helper.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/system/Common.php b/system/Common.php index ab148e5d66d1..1b36545ee3f2 100644 --- a/system/Common.php +++ b/system/Common.php @@ -941,14 +941,14 @@ function response(): ResponseInterface if (! function_exists('route_to')) { /** - * Given a controller/method string and any params, + * Given a route name or controller/method string and any params, * will attempt to build the relative URL to the * matching route. * * NOTE: This requires the controller/method to * have a route defined in the routes Config file. * - * @param string $method Named route or Controller::method + * @param string $method Route name or Controller::method * @param int|string ...$params One or more parameters to be passed to the route. * The last parameter allows you to set the locale. * diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 45fd5ad110e6..45addcc1fb22 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -542,14 +542,15 @@ function mb_url_title(string $str, string $separator = '-', bool $lowercase = fa if (! function_exists('url_to')) { /** - * Get the full, absolute URL to a controller method + * Get the full, absolute URL to a route named or controller method * (with additional arguments) * * NOTE: This requires the controller/method to * have a route defined in the routes Config file. * - * @param string $controller Named route or Controller::method - * @param int|string ...$args One or more parameters to be passed to the route + * @param string $controller Route name or Controller::method + * @param int|string ...$args One or more parameters to be passed to the route. + * The last parameter allows you to set the locale. * * @throws RouterException */ From e91af1cfbe2bc450c5aaab2a7044f3096ed7e921 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:42:18 +0900 Subject: [PATCH 2951/8282] test: add test for url_to() with locale --- tests/system/Helpers/URLHelper/MiscUrlTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index fb949f2e9ecc..7f5d9667501a 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -884,4 +884,20 @@ public function urlToMissingRoutesProvider() ], ]; } + + public function testUrlToWithSupportedLocaleInRoute() + { + Services::createRequest(new App()); + $routes = service('routes'); + $routes->add( + '{locale}/path/(:segment)/to/(:num)', + 'myController::goto/$1/$2', + ['as' => 'path-to'] + ); + + $this->assertSame( + 'http://example.com/index.php/en/path/string/to/13', + url_to('path-to', 'string', 13, 'en') + ); + } } From e145c197c2ca932416b6072a8a5fd2b3bb83a5a5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:43:07 +0900 Subject: [PATCH 2952/8282] docs: update user guide --- user_guide_src/source/general/common_functions.rst | 8 +++++--- user_guide_src/source/helpers/url_helper.rst | 8 ++++++-- user_guide_src/source/helpers/url_helper/025.php | 13 +++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 user_guide_src/source/helpers/url_helper/025.php diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 02cc8c5924a1..2c358b89fb51 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -367,8 +367,10 @@ Miscellaneous Functions .. php:function:: route_to($method[, ...$params]) - :param string $method: The named route alias, or name of the controller/method to match. - :param int|string $params: One or more parameters to be passed to be matched in the route. The last parameter allows you to set the locale. + :param string $method: Route name or Controller::method + :param int|string ...$params: One or more parameters to be passed to the route. The last parameter allows you to set the locale. + :returns: a route (URI path) + :rtype: string .. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**. @@ -376,7 +378,7 @@ Miscellaneous Functions .. literalinclude:: common_functions/009.php - Generates a route for you based on a named route alias. + Generates a route for you based on a route name. .. literalinclude:: common_functions/010.php diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 8cb19251888d..7607610d64a5 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -361,8 +361,8 @@ The following functions are available: .. php:function:: url_to($controller[, ...$args]) - :param string $controller: Named route or Controller::method - :param mixed ...$args: One or more parameters to be passed to the route + :param string $controller: Route name or Controller::method + :param mixed ...$args: One or more parameters to be passed to the route. The last parameter allows you to set the locale. :returns: Absolute URL :rtype: string @@ -380,6 +380,10 @@ The following functions are available: This is useful because you can still change your routes after putting links into your views. + Since v4.3.0, when you use ``{locale}`` in your route, you can optionally specify the locale value as the last parameter. + + .. literalinclude:: url_helper/025.php + For full details, see the :ref:`reverse-routing` and :ref:`using-named-routes`. .. php:function:: url_is($path) diff --git a/user_guide_src/source/helpers/url_helper/025.php b/user_guide_src/source/helpers/url_helper/025.php new file mode 100644 index 000000000000..6cabfff15bc1 --- /dev/null +++ b/user_guide_src/source/helpers/url_helper/025.php @@ -0,0 +1,13 @@ +add( + '{locale}/users/(:num)/gallery/(:num)', + 'Galleries::showUserGallery/$1/$2', + ['as' => 'user_gallery'] +); + +?> + +View Gallery + From e9778bcae0205885482bfe68a08e2a321d603389 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:44:46 +0900 Subject: [PATCH 2953/8282] docs: fix sample code / was missing. (:any) matches multiple URI segments, so (:num) is better in this case. --- user_guide_src/source/general/common_functions/009.php | 2 +- user_guide_src/source/general/common_functions/010.php | 2 +- user_guide_src/source/general/common_functions/011.php | 2 +- user_guide_src/source/incoming/routing/029.php | 2 +- user_guide_src/source/incoming/routing/030.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/general/common_functions/009.php b/user_guide_src/source/general/common_functions/009.php index 41c725478d3f..5b8f7ff505d9 100644 --- a/user_guide_src/source/general/common_functions/009.php +++ b/user_guide_src/source/general/common_functions/009.php @@ -1,7 +1,7 @@ get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2'); +$routes->get('users/(:num)/gallery/(:num)', 'Galleries::showUserGallery/$1/$2'); ?> diff --git a/user_guide_src/source/general/common_functions/010.php b/user_guide_src/source/general/common_functions/010.php index 82df6a7dd714..16280ab7b9a9 100644 --- a/user_guide_src/source/general/common_functions/010.php +++ b/user_guide_src/source/general/common_functions/010.php @@ -1,7 +1,7 @@ get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']); +$routes->get('users/(:num)/gallery/(:num)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']); ?> diff --git a/user_guide_src/source/general/common_functions/011.php b/user_guide_src/source/general/common_functions/011.php index 3d354cec2533..0bea6d6d3293 100644 --- a/user_guide_src/source/general/common_functions/011.php +++ b/user_guide_src/source/general/common_functions/011.php @@ -2,7 +2,7 @@ // The route is defined as: $routes->add( - '{locale}/users/(:num)/gallery(:any)', + '{locale}/users/(:num)/gallery/(:num)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery'] ); diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php index 58a0e81e25f3..793a93588475 100644 --- a/user_guide_src/source/incoming/routing/029.php +++ b/user_guide_src/source/incoming/routing/029.php @@ -1,7 +1,7 @@ get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2'); +$routes->get('users/(:num)/gallery/(:num)', 'Galleries::showUserGallery/$1/$2'); ?> diff --git a/user_guide_src/source/incoming/routing/030.php b/user_guide_src/source/incoming/routing/030.php index b17465e4f88b..e98bdef8e441 100644 --- a/user_guide_src/source/incoming/routing/030.php +++ b/user_guide_src/source/incoming/routing/030.php @@ -1,7 +1,7 @@ get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']); +$routes->get('users/(:num)/gallery/(:num)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']); ?> From 6ed8314dd2ef185172f56e5bd3a1f581f1ff6601 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:46:09 +0900 Subject: [PATCH 2954/8282] docs: make a function name linkable --- user_guide_src/source/incoming/routing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 9dbe274b0a0f..efd3f82313db 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -316,7 +316,7 @@ Reverse routing allows you to define the controller and method, as well as any p to, and have the router lookup the current route to it. This allows route definitions to change without you having to update your application code. This is typically used within views to create links. -For example, if you have a route to a photo gallery that you want to link to, you can use the ``url_to()`` helper +For example, if you have a route to a photo gallery that you want to link to, you can use the :php:func:`url_to()` helper function to get the route that should be used. The first parameter is the fully qualified Controller and method, separated by a double colon (``::``), much like you would use when writing the initial route itself. Any parameters that should be passed to the route are passed in next: From e5a3bb936611b1c1e693a05d10f05ef806245026 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 11 Jan 2023 21:46:31 +0900 Subject: [PATCH 2955/8282] docs: fix function name --- user_guide_src/source/incoming/routing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index efd3f82313db..fffa5cb1bdb8 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -329,7 +329,7 @@ Using Named Routes ================== You can name routes to make your application less fragile. This applies a name to a route that can be called -later, and even if the route definition changes, all of the links in your application built with ``route_to()`` +later, and even if the route definition changes, all of the links in your application built with :php:func:`url_to()` will still work without you having to make any changes. A route is named by passing in the ``as`` option with the name of the route: From c9552e4ef0dd9f96e765c3f108e2443f185a566e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 14 Jan 2023 09:13:37 +0900 Subject: [PATCH 2956/8282] docs: make Note more prominent --- user_guide_src/source/general/common_functions.rst | 9 +++++---- user_guide_src/source/general/urls.rst | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 2c358b89fb51..b63ee020d380 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -374,6 +374,11 @@ Miscellaneous Functions .. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**. + .. important:: ``route_to()`` returns a *route*, not a full URI path for your site. + If your **baseURL** contains sub folders, the return value is not the same + as the URI to link. In that case, just use :php:func:`url_to()` instead. + See also :ref:`urls-url-structure`. + Generates a route for you based on a controller::method combination. Will take parameters into effect, if provided. .. literalinclude:: common_functions/009.php @@ -386,10 +391,6 @@ Miscellaneous Functions .. literalinclude:: common_functions/011.php - .. note:: ``route_to()`` returns a route, not a full URI path for your site. - If your **baseURL** contains sub folders, the return value is not the same - as the URI to link. In that case, just use :php:func:`url_to()` instead. - .. php:function:: service($name[, ...$params]) :param string $name: The name of the service to load diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index 25d7b577d977..965328ce817c 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -15,6 +15,8 @@ Your URLs can be defined using the :doc:`URI Routing ` featur The :doc:`URI Library <../libraries/uri>` and the :doc:`URL Helper <../helpers/url_helper>` contain functions that make it easy to work with your URI data. +.. _urls-url-structure: + URL Structure ============= From 56ef12181fcdd67b85081ec39128455c8a419216 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 11:30:24 +0900 Subject: [PATCH 2957/8282] docs: replace SCRIPT_NAME with baseURL It is easier to understand. --- system/HTTP/IncomingRequest.php | 8 ++++---- system/HTTP/URI.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index ef69a08996f6..3304f4664a76 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -62,8 +62,8 @@ class IncomingRequest extends Request * * Note: This WILL NOT match the actual URL in the browser since for * everything this cares about (and the router, etc) is the portion - * AFTER the script name. So, if hosted in a sub-folder this will - * appear different than actual URL. If you need that use getPath(). + * AFTER the baseURL. So, if hosted in a sub-folder this will + * appear different than actual URI path. If you need that use getPath(). * * @deprecated Will be protected. Use getUri() instead. * @@ -72,7 +72,7 @@ class IncomingRequest extends Request public $uri; /** - * The detected path (relative to SCRIPT_NAME). + * The detected URI path (relative to the baseURL). * * Note: current_url() uses this to build its URI, * so this becomes the source for the "current URL" @@ -511,7 +511,7 @@ private function determineHost(App $config, string $baseURL): string } /** - * Returns the path relative to SCRIPT_NAME, + * Returns the URI path relative to baseURL, * running detection as necessary. */ public function getPath(): string diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 23227e98d0f2..009bfdea0f1a 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -90,7 +90,7 @@ class URI * * Note: The constructor of the IncomingRequest class changes the path of * the URI object held by the IncomingRequest class to a path relative - * to the SCRIPT_NAME. If the baseURL contains subfolders, this value + * to the baseURL. If the baseURL contains subfolders, this value * will be different from the current URI path. * * @var string From c455f5e084eb4c5320c3bd725f522de848541dfd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 11:32:09 +0900 Subject: [PATCH 2958/8282] docs: add @return explanations --- system/Common.php | 2 +- system/Router/RouteCollection.php | 2 +- system/Router/RouteCollectionInterface.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Common.php b/system/Common.php index 1b36545ee3f2..f73a4d4d78d8 100644 --- a/system/Common.php +++ b/system/Common.php @@ -952,7 +952,7 @@ function response(): ResponseInterface * @param int|string ...$params One or more parameters to be passed to the route. * The last parameter allows you to set the locale. * - * @return false|string + * @return false|string The route (URI path relative to baseURL) or false if not found. */ function route_to(string $method, ...$params) { diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 30be78a2bce5..9df41b0a8588 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1044,7 +1044,7 @@ public function environment(string $env, Closure $callback): RouteCollectionInte * @param int|string ...$params One or more parameters to be passed to the route. * The last parameter allows you to set the locale. * - * @return false|string + * @return false|string The route (URI path relative to baseURL) or false if not found. */ public function reverseRoute(string $search, ...$params) { diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php index 7044459899c2..00ac88f4b7e2 100644 --- a/system/Router/RouteCollectionInterface.php +++ b/system/Router/RouteCollectionInterface.php @@ -172,7 +172,7 @@ public function getHTTPVerb(); * @param string $search Named route or Controller::method * @param int|string ...$params * - * @return false|string + * @return false|string The route (URI path relative to baseURL) or false if not found. */ public function reverseRoute(string $search, ...$params); From 76d53d631e57cb4f1623ffe05c7115ae2921addb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 11:32:54 +0900 Subject: [PATCH 2959/8282] docs: fix typo --- system/Helpers/url_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 45addcc1fb22..1a3b78de5c91 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -542,7 +542,7 @@ function mb_url_title(string $str, string $separator = '-', bool $lowercase = fa if (! function_exists('url_to')) { /** - * Get the full, absolute URL to a route named or controller method + * Get the full, absolute URL to a route name or controller method * (with additional arguments) * * NOTE: This requires the controller/method to From 243531150004820dd27cb8d0440228ad7de61614 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 11:37:41 +0900 Subject: [PATCH 2960/8282] docs: replace SCRIPT_NAME with baseURL --- user_guide_src/source/incoming/incomingrequest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index 163a0b46b68a..f54b1f9ff741 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -473,7 +473,7 @@ The methods provided by the parent classes that are available are: .. php:method:: getPath() - :returns: The current URI path relative to ``$_SERVER['SCRIPT_NAME']`` + :returns: The current URI path relative to baseURL :rtype: string This is the safest method to determine the "current URI", since ``IncomingRequest::$uri`` From 1ade2e72da6757e8702fac9c461445be3d70330f Mon Sep 17 00:00:00 2001 From: Add-ngr Date: Sun, 15 Jan 2023 21:26:39 +0530 Subject: [PATCH 2961/8282] feat: `renderSection` option to retained data --- system/View/View.php | 9 +++++++-- tests/system/View/ViewTest.php | 10 ++++++++++ .../system/View/Views/extend_reuse_section.php | 9 +++++++++ tests/system/View/Views/layout_welcome.php | 3 +++ user_guide_src/source/outgoing/view_layouts.rst | 17 +++++++++++++++-- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tests/system/View/Views/extend_reuse_section.php create mode 100644 tests/system/View/Views/layout_welcome.php diff --git a/system/View/View.php b/system/View/View.php index 9a39104728df..842c9993414b 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -406,8 +406,11 @@ public function endSection() /** * Renders a section's contents. + * + * @param bool $saveData If true, saves data for subsequent calls, + * if false, cleans the data after displaying. */ - public function renderSection(string $sectionName) + public function renderSection(string $sectionName, bool $saveData = false) { if (! isset($this->sections[$sectionName])) { echo ''; @@ -417,7 +420,9 @@ public function renderSection(string $sectionName) foreach ($this->sections[$sectionName] as $key => $contents) { echo $contents; - unset($this->sections[$sectionName][$key]); + if ($saveData === false) { + unset($this->sections[$sectionName][$key]); + } } } diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index 537740231f66..11b823c80fed 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -387,4 +387,14 @@ public function testRenderNestedSections() $this->assertStringContainsString('

      Second

      ', $content); $this->assertStringContainsString('

      Third

      ', $content); } + + public function testRenderSectionSavingData() + { + $view = new View($this->config, $this->viewsDir, $this->loader); + $expected = "Welcome to CodeIgniter 4!\n

      Welcome to CodeIgniter 4!

      \n

      Hello World

      "; + + $view->setVar('pageTitle', 'Welcome to CodeIgniter 4!'); + $view->setVar('testString', 'Hello World'); + $this->assertSame($expected, $view->render('extend_reuse_section')); + } } diff --git a/tests/system/View/Views/extend_reuse_section.php b/tests/system/View/Views/extend_reuse_section.php new file mode 100644 index 000000000000..f7a5c0a263e2 --- /dev/null +++ b/tests/system/View/Views/extend_reuse_section.php @@ -0,0 +1,9 @@ +extend('layout_welcome') ?> + +section('page_title') ?> + +endSection() ?> + +section('content') ?> + +endSection() ?> diff --git a/tests/system/View/Views/layout_welcome.php b/tests/system/View/Views/layout_welcome.php new file mode 100644 index 000000000000..0eebf376fb7e --- /dev/null +++ b/tests/system/View/Views/layout_welcome.php @@ -0,0 +1,3 @@ +<?= $this->renderSection('page_title', true) ?> +

      renderSection('page_title') ?>

      +

      renderSection('content') ?>

      \ No newline at end of file diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst index 2600b1c08922..daa326c65a01 100644 --- a/user_guide_src/source/outgoing/view_layouts.rst +++ b/user_guide_src/source/outgoing/view_layouts.rst @@ -31,8 +31,21 @@ E.g. **app/Views/default.php**:: -The ``renderSection()`` method only has one argument - the name of the section. That way any child views know -what to name the content section. +The ``renderSection()`` method have two arguments ``$sectionName`` - the name of the section. That way any child views know +what to name the content section. And ``$saveData`` - If true, saves data for subsequent calls, if false, cleans the data after displaying. + +E.g. **app/Views/welcome_message.php**:: + + + + + <?= $this->renderSection('page_title', true) ?> + + +

      renderSection('page_title') ?>

      +

      renderSection('content') ?>

      + + ********************** Using Layouts in Views From af781c9dde78cfedfb4203c66c6a3dd52d8581d0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 13:05:09 +0900 Subject: [PATCH 2962/8282] refactor: do not reassign --- system/HTTP/URI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 23227e98d0f2..b3ac598c2cde 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -1089,9 +1089,9 @@ protected function parseStr(string $query): array ), $query); $params = implode('&', $params); - parse_str($params, $params); + parse_str($params, $result); - foreach ($params as $key => $value) { + foreach ($result as $key => $value) { $return[hex2bin($key)] = $value; } From fb34e69b54919fd58dd381b43e602050815e167f Mon Sep 17 00:00:00 2001 From: Add-ngr Date: Mon, 16 Jan 2023 23:09:28 +0530 Subject: [PATCH 2963/8282] changelog v4.4.0 added --- user_guide_src/source/changelogs/v4.4.0.rst | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 user_guide_src/source/changelogs/v4.4.0.rst diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst new file mode 100644 index 000000000000..bb7579e4c48d --- /dev/null +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -0,0 +1,78 @@ +Version 4.4.0 +############# + +Release Date: Unreleased + +**4.4.0 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 3 + +Highlights +********** + +- TBD + +BREAKING +******** + +Behavior Changes +================ + +Interface Changes +================= + +Method Signature Changes +======================== + +Enhancements +************ + +Commands +======== + +Testing +======= + +Database +======== + +Query Builder +------------- + +Forge +----- + +Others +------ + +Model +===== + +Libraries +========= + +Helpers and Functions +===================== + +Others +====== +- **View:** Added optional 2nd argument on ``renderSection('page_title', true)`` to prevent from auto cleans the data after displaying. See ([#7126](https://github.com/codeigniter4/CodeIgniter4/pull/7126)) for details. + + +Message Changes +*************** + +Changes +******* + +Deprecations +************ + +Bugs Fixed +********** + +See the repo's +`CHANGELOG.md `_ +for a complete list of bugs fixed. From 7cdc8332d3cd44eba52bbb2fc7b00ae1fb8a4aba Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 13:05:33 +0900 Subject: [PATCH 2964/8282] refactor: remove unnecessary assignment --- system/HTTP/URI.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index b3ac598c2cde..93500b58fb42 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -1095,8 +1095,6 @@ protected function parseStr(string $query): array $return[hex2bin($key)] = $value; } - $query = $params = null; - return $return; } } From becb4806dde2aec9447ce8f45d802d5df8570f98 Mon Sep 17 00:00:00 2001 From: Add-ngr Date: Wed, 18 Jan 2023 23:55:56 +0530 Subject: [PATCH 2965/8282] feat: renderSection option to retained data, after 1st review change --- tests/system/View/ViewTest.php | 2 +- tests/system/View/Views/layout_welcome.php | 2 +- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.4.0.rst | 2 +- user_guide_src/source/outgoing/view_layouts.rst | 7 +++++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index 11b823c80fed..61742d943984 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -395,6 +395,6 @@ public function testRenderSectionSavingData() $view->setVar('pageTitle', 'Welcome to CodeIgniter 4!'); $view->setVar('testString', 'Hello World'); - $this->assertSame($expected, $view->render('extend_reuse_section')); + $this->assertStringContainsString($expected, $view->render('extend_reuse_section')); } } diff --git a/tests/system/View/Views/layout_welcome.php b/tests/system/View/Views/layout_welcome.php index 0eebf376fb7e..a3623a4aafad 100644 --- a/tests/system/View/Views/layout_welcome.php +++ b/tests/system/View/Views/layout_welcome.php @@ -1,3 +1,3 @@ <?= $this->renderSection('page_title', true) ?>

      renderSection('page_title') ?>

      -

      renderSection('content') ?>

      \ No newline at end of file +

      renderSection('content') ?>

      diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 9932e8725891..cdffd1cb94f0 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.4.0 v4.3.2 v4.3.1 v4.3.0 diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index bb7579e4c48d..0203732d15e5 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -58,7 +58,7 @@ Helpers and Functions Others ====== -- **View:** Added optional 2nd argument on ``renderSection('page_title', true)`` to prevent from auto cleans the data after displaying. See ([#7126](https://github.com/codeigniter4/CodeIgniter4/pull/7126)) for details. +- **View:** Added optional 2nd argument on ``renderSection('page_title', true)`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. Message Changes diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst index daa326c65a01..f6292d4b95c8 100644 --- a/user_guide_src/source/outgoing/view_layouts.rst +++ b/user_guide_src/source/outgoing/view_layouts.rst @@ -31,8 +31,9 @@ E.g. **app/Views/default.php**:: -The ``renderSection()`` method have two arguments ``$sectionName`` - the name of the section. That way any child views know -what to name the content section. And ``$saveData`` - If true, saves data for subsequent calls, if false, cleans the data after displaying. +The ``renderSection()`` method has two arguments: ``$sectionName`` and ``$saveData``. ``$sectionName`` is the name of +the section used by any child view to name the content section. If the boolean argument ``$saveData`` is set to true, +the method saves data for subsequent calls. Otherwise, the method cleans the data after displaying the contents. E.g. **app/Views/welcome_message.php**:: @@ -47,6 +48,8 @@ E.g. **app/Views/welcome_message.php**:: +.. note:: ``$saveData`` can be used since v4.4.0. + ********************** Using Layouts in Views ********************** From 40d649df4377933bb4f39c9aa244a3af4fc411e1 Mon Sep 17 00:00:00 2001 From: Add-ngr Date: Thu, 19 Jan 2023 08:50:11 +0530 Subject: [PATCH 2966/8282] changelog updated in v4.4.0 --- user_guide_src/source/changelogs/v4.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 0203732d15e5..6632a061c4d1 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -58,7 +58,7 @@ Helpers and Functions Others ====== -- **View:** Added optional 2nd argument on ``renderSection('page_title', true)`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. +- **View:** Added optional 2nd parameter ``$saveData`` on ``renderSection()`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. Message Changes From 29ebd6736727570b7d6045055872874461d2a386 Mon Sep 17 00:00:00 2001 From: Add-ngr Date: Thu, 19 Jan 2023 20:01:13 +0530 Subject: [PATCH 2967/8282] defined a label on **Creating A Layout** section --- user_guide_src/source/outgoing/view_layouts.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst index f6292d4b95c8..6e6c672710fd 100644 --- a/user_guide_src/source/outgoing/view_layouts.rst +++ b/user_guide_src/source/outgoing/view_layouts.rst @@ -12,6 +12,8 @@ any view being rendered. You could create different layouts to support one-colum blog archive pages, and more. Layouts are never directly rendered. Instead, you render a view, which specifies the layout that it wants to extend. +.. _creating-a-layout: + ***************** Creating A Layout ***************** From 8a9b3c3b47857ff0aad6a0f1d123ad8597f8e186 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 17:34:44 +0900 Subject: [PATCH 2968/8282] test: add tests --- tests/system/Database/Builder/WhereTest.php | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index a4b592ffd28c..b4a1b90a59f4 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -160,6 +160,53 @@ public function testWhereCustomString() $this->assertSame($expectedBinds, $builder->getBinds()); } + public function testWhereCustomStringWithOperatorEscapeFalse() + { + $builder = $this->db->table('jobs'); + + $where = 'CURRENT_TIMESTAMP() = DATE_ADD(column, INTERVAL 2 HOUR)'; + $builder->where($where, null, false); + + $expectedSQL = 'SELECT * FROM "jobs" WHERE CURRENT_TIMESTAMP() = DATE_ADD(column, INTERVAL 2 HOUR)'; + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + + $expectedBinds = []; + $this->assertSame($expectedBinds, $builder->getBinds()); + } + + public function testWhereCustomStringWithoutOperatorEscapeFalse() + { + $builder = $this->db->table('jobs'); + + $where = "REPLACE(column, 'somestring', '')"; + $builder->where($where, "''", false); + + $expectedSQL = "SELECT * FROM \"jobs\" WHERE REPLACE(column, 'somestring', '') = ''"; + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + + $expectedBinds = [ + "REPLACE(column, 'somestring', '')" => [ + 0 => "''", + 1 => false, + ], + ]; + $this->assertSame($expectedBinds, $builder->getBinds()); + } + + public function testWhereCustomStringWithBetweenEscapeFalse() + { + $builder = $this->db->table('jobs'); + + $where = "created_on BETWEEN '2022-07-01 00:00:00' AND '2022-12-31 23:59:59'"; + $builder->where($where, null, false); + + $expectedSQL = "SELECT * FROM \"jobs\" WHERE created_on BETWEEN '2022-07-01 00:00:00' AND '2022-12-31 23:59:59'"; + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + + $expectedBinds = []; + $this->assertSame($expectedBinds, $builder->getBinds()); + } + public function testWhereRawSql() { $builder = $this->db->table('jobs'); From aed3ad65c47e3a94cca1d045ede77dea22a2905b Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 18:57:18 +0900 Subject: [PATCH 2969/8282] style: break long line --- system/Database/BaseBuilder.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index a7aabc7b97c8..a96bbc6c862b 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -783,7 +783,15 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') { // value appears not to have been set, assign the test to IS NULL $op = ' IS NULL'; - } elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) { + } elseif ( + // The key ends with !=, =, <>, IS, IS NOT + preg_match( + '/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', + $k, + $match, + PREG_OFFSET_CAPTURE + ) + ) { $k = substr($k, 0, $match[0][1]); $op = $match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL'; } else { From d333c7bd54f7e1e0aa00ce8b2294597c88970315 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 18:57:45 +0900 Subject: [PATCH 2970/8282] docs: add comment --- system/Database/BaseBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index a96bbc6c862b..4e483a6119b1 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -761,9 +761,9 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type $k = trim($k); end($op); - $op = trim(current($op)); + // Does the key end with operator? if (substr($k, -strlen($op)) === $op) { $k = rtrim(substr($k, 0, -strlen($op))); $op = " {$op}"; From 6ecbc309f087278c8ce310cc0ed847078b10d87c Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 20 Jan 2023 19:02:25 +0900 Subject: [PATCH 2971/8282] fix: BaseBuilder::getOperatorFromWhereKey() misses operator EXISTS, BETWEEN --- system/Database/BaseBuilder.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 4e483a6119b1..727637c3c0b3 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -3413,13 +3413,17 @@ private function getOperatorFromWhereKey(string $whereKey) $whereKey = trim($whereKey); $pregOperators = [ - '\s*(?:<|>|!)?=', // =, <=, >=, != - '\s*<>?', // <, <> - '\s*>', // > - '\s+IS NULL', // IS NULL - '\s+IS NOT NULL', // IS NOT NULL - '\s+LIKE', // LIKE - '\s+NOT LIKE', // NOT LIKE + '\s*(?:<|>|!)?=', // =, <=, >=, != + '\s*<>?', // <, <> + '\s*>', // > + '\s+IS NULL', // IS NULL + '\s+IS NOT NULL', // IS NOT NULL + '\s+EXISTS\s*\(.*\)', // EXISTS (sql) + '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS (sql) + '\s+BETWEEN\s+', // BETWEEN value AND value + '\s+IN\s*\(.*\)', // IN (list) + '\s+LIKE', // LIKE + '\s+NOT LIKE', // NOT LIKE ]; return preg_match_all( From bc2d692dd91f1abd09c639cd69d261547479e4b9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 08:48:49 +0900 Subject: [PATCH 2972/8282] docs: align comments --- system/Database/BaseBuilder.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 727637c3c0b3..f6fd1daff6cc 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -3381,16 +3381,16 @@ protected function getOperator(string $str, bool $list = false) : ''; $this->pregOperators = [ '\s*(?:<|>|!)?=\s*', // =, <=, >=, != - '\s*<>?\s*', // <, <> - '\s*>\s*', // > - '\s+IS NULL', // IS NULL - '\s+IS NOT NULL', // IS NOT NULL - '\s+EXISTS\s*\(.*\)', // EXISTS(sql) + '\s*<>?\s*', // <, <> + '\s*>\s*', // >å + '\s+IS NULL', // IS NULL + '\s+IS NOT NULL', // IS NOT NULL + '\s+EXISTS\s*\(.*\)', // EXISTS (sql) '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql) - '\s+BETWEEN\s+', // BETWEEN value AND value - '\s+IN\s*\(.*\)', // IN(list) - '\s+NOT IN\s*\(.*\)', // NOT IN (list) - '\s+LIKE\s+\S.*(' . $_les . ')?', // LIKE 'expr'[ ESCAPE '%s'] + '\s+BETWEEN\s+', // BETWEEN value AND value + '\s+IN\s*\(.*\)', // IN (list) + '\s+NOT IN\s*\(.*\)', // NOT IN (list) + '\s+LIKE\s+\S.*(' . $_les . ')?', // LIKE 'expr'[ ESCAPE '%s'] '\s+NOT LIKE\s+\S.*(' . $_les . ')?', // NOT LIKE 'expr'[ ESCAPE '%s'] ]; } From 83f026d3cd0c1948c86d5325690f9ecb9190f8d5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 09:30:46 +0900 Subject: [PATCH 2973/8282] test: add test --- tests/system/View/ParserFilterTest.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php index 696a16d2a19a..063c97acd972 100644 --- a/tests/system/View/ParserFilterTest.php +++ b/tests/system/View/ParserFilterTest.php @@ -396,6 +396,20 @@ public function testLocalCurrency() $this->assertSame("1.234.567,89\u{a0}€", $parser->renderString($template)); } + public function testLocalCurrencyWithoutFraction() + { + $parser = new Parser($this->config, $this->viewsDir, $this->loader); + + $data = [ + 'mynum' => 1_234_567.8912346, + ]; + + $template = '{ mynum|local_currency(EUR,de_DE) }'; + + $parser->setData($data); + $this->assertSame("1.234.568\u{a0}€", $parser->renderString($template)); + } + public function testParsePairWithAbs() { $parser = new Parser($this->config, $this->viewsDir, $this->loader); From 309ec2f6006a75f296cc71c1f8b854eccb9655ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 09:31:17 +0900 Subject: [PATCH 2974/8282] fix: Passing null to parameter error ErrorException: NumberFormatter::setAttribute(): Passing null to parameter #2 ($value) of type int|float is deprecated --- system/View/Filters.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/View/Filters.php b/system/View/Filters.php index 336a0d08a67c..65dfe6dff943 100644 --- a/system/View/Filters.php +++ b/system/View/Filters.php @@ -171,6 +171,8 @@ public static function local_currency($value, string $currency, ?string $locale { helper('number'); + $fraction ??= 0; + $options = [ 'type' => NumberFormatter::CURRENCY, 'currency' => $currency, From 49e7c040ca90acb53f58227228af3a58439a8357 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 09:38:43 +0900 Subject: [PATCH 2975/8282] docs: fix docs --- user_guide_src/source/outgoing/view_parser.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index b6083ba7054e..206cebdd2698 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -389,8 +389,9 @@ limit_chars limit Limits the number of characters to $limit. limit_words limit Limits the number of words to $limit. { v|limit_words(20) } -local_currency currency, locale Displays a localized version of a currency. "currency" { v|local_currency(EUR,en_US) } - valueis any 3-letter ISO 4217 currency code. +local_currency currency, Displays a localized version of a currency. "currency" { v|local_currency(EUR,en_US) } + locale, valueis any 3-letter ISO 4217 currency code. + fraction local_number type, precision, Displays a localized version of a number. "type" can be { v|local_number(decimal,2,en_US) } locale one of: decimal, currency, percent, scientific, spellout, From 27cc9c9bbd8c6c72b77aeee3425f09fbf16787eb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 13:08:43 +0900 Subject: [PATCH 2976/8282] docs: update Controller code --- user_guide_src/source/outgoing/views/002.php | 4 +--- user_guide_src/source/outgoing/views/009.php | 4 +--- user_guide_src/source/outgoing/views/011.php | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/user_guide_src/source/outgoing/views/002.php b/user_guide_src/source/outgoing/views/002.php index dda8dc67f363..bb44fed77919 100644 --- a/user_guide_src/source/outgoing/views/002.php +++ b/user_guide_src/source/outgoing/views/002.php @@ -2,9 +2,7 @@ namespace App\Controllers; -use CodeIgniter\Controller; - -class Blog extends Controller +class Blog extends BaseController { public function index() { diff --git a/user_guide_src/source/outgoing/views/009.php b/user_guide_src/source/outgoing/views/009.php index 008d1cf85d26..3cb2e017aad9 100644 --- a/user_guide_src/source/outgoing/views/009.php +++ b/user_guide_src/source/outgoing/views/009.php @@ -2,9 +2,7 @@ namespace App\Controllers; -use CodeIgniter\Controller; - -class Blog extends Controller +class Blog extends BaseController { public function index() { diff --git a/user_guide_src/source/outgoing/views/011.php b/user_guide_src/source/outgoing/views/011.php index bb1a5fc21725..a74b670c3e49 100644 --- a/user_guide_src/source/outgoing/views/011.php +++ b/user_guide_src/source/outgoing/views/011.php @@ -2,9 +2,7 @@ namespace App\Controllers; -use CodeIgniter\Controller; - -class Blog extends Controller +class Blog extends BaseController { public function index() { From 55b610dfcbc87d1ed0d814056c2200f693e0f9d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 13:09:07 +0900 Subject: [PATCH 2977/8282] docs: fix header level in HTML sample --- user_guide_src/source/outgoing/views/012.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/views/012.php b/user_guide_src/source/outgoing/views/012.php index 5a3781fe6720..509b548a1813 100644 --- a/user_guide_src/source/outgoing/views/012.php +++ b/user_guide_src/source/outgoing/views/012.php @@ -5,7 +5,7 @@

      -

      My Todo List

      +

      My Todo List

        From 24e82dc635d2a05a2bc31d899a211b62312b5c66 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 13:10:33 +0900 Subject: [PATCH 2978/8282] docs: fix text decoration --- user_guide_src/source/outgoing/views.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 3eb80427fc2a..342223bee842 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -19,7 +19,7 @@ Using the example controller you created in the controller page, let's add a vie Creating a View =============== -Using your text editor, create a file called ``blog_view.php`` and put this in it:: +Using your text editor, create a file called **blog_view.php** and put this in it:: @@ -136,7 +136,7 @@ into the ``$option`` array in the third parameter. .. literalinclude:: views/010.php Additionally, if you would like the default functionality of the ``view()`` function to be that it does clear the data -between calls, you can set ``$saveData`` to **false** in **app/Config/Views.php**. +between calls, you can set ``$saveData`` to ``false`` in **app/Config/Views.php**. Creating Loops ============== From 5e762b43b30717e96a87f0256970fd185db3e822 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 13:11:20 +0900 Subject: [PATCH 2979/8282] docs: update views.rst content --- user_guide_src/source/outgoing/views.rst | 33 +++++++++++++++----- user_guide_src/source/outgoing/views/013.php | 5 +++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 user_guide_src/source/outgoing/views/013.php diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 342223bee842..70bbadcc7504 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -10,7 +10,9 @@ A view is simply a web page, or a page fragment, like a header, footer, sidebar, views can flexibly be embedded within other views (within other views, etc.) if you need this type of hierarchy. -Views are never called directly, they must be loaded by a controller. Remember that in an MVC framework, +Views are never called directly, they must be loaded by a controller or :ref:`view route `. + +Remember that in an MVC framework, the Controller acts as the traffic cop, so it is responsible for fetching a particular view. If you have not read the :doc:`Controllers ` page, you should do so before continuing. @@ -35,19 +37,27 @@ Then save the file in your **app/Views** directory. Displaying a View ================= -To load and display a particular view file you will use the following function: +To load and display a particular view file you will use the following code in your controller: .. literalinclude:: views/001.php + :lines: 2- Where *name* is the name of your view file. -.. important:: If the file extension is omitted, then the views are expected to end with the .php extension. +.. important:: If the file extension is omitted, then the views are expected to end with the **.php** extension. -Now, open the controller file you made earlier called ``Blog.php``, and replace the echo statement with the view function: +Now, create a file called **Blog.php** in the **app/Controllers** directory, +and put this in it: .. literalinclude:: views/002.php -If you visit your site using the URL you did earlier you should see your new view. The URL was similar to this:: +Open the routing file located at **app/Config/Routes.php**, and look for the "Route Definitions". +Add the following code: + +.. literalinclude:: views/013.php + :lines: 2- + +If you visit your site, you should see your new view. The URL was similar to this:: example.com/index.php/blog/ @@ -69,6 +79,7 @@ Your view files can also be stored within sub-directories if you prefer that typ When doing so you will need to include the directory name loading the view. Example: .. literalinclude:: views/004.php + :lines: 2- Namespaced Views ================ @@ -77,8 +88,10 @@ You can store views under a **View** directory that is namespaced, and load that PHP does not support loading non-class files from a namespace, CodeIgniter provides this feature to make it possible to package your views together in a module-like fashion for easy re-use or distribution. -If you have ``example/blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader ` living -under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this +If you have **example/blog** directory that has a PSR-4 mapping set up in the :doc:`Autoloader ` living +under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. + +Following this example, you could load the **blog_view.php** file from **example/blog/Views** by prepending the namespace to the view name: .. literalinclude:: views/005.php @@ -88,15 +101,17 @@ example, you could load the **blog_view.php** file from **example/blog/Views** b Caching Views ============= -You can cache a view with the ``view`` command by passing a ``cache`` option with the number of seconds to cache +You can cache a view with the ``view()`` function by passing a ``cache`` option with the number of seconds to cache the view for, in the third parameter: .. literalinclude:: views/006.php + :lines: 2- By default, the view will be cached using the same name as the view file itself. You can customize this by passing along ``cache_name`` and the cache ID you wish to use: .. literalinclude:: views/007.php + :lines: 2- Adding Dynamic Data to the View =============================== @@ -105,6 +120,7 @@ Data is passed from the controller to the view by way of an array in the second Here's an example: .. literalinclude:: views/008.php + :lines: 2- Let's try it with your controller file. Open it and add this code: @@ -134,6 +150,7 @@ other views, potentially causing issues. If you would prefer to clean the data a into the ``$option`` array in the third parameter. .. literalinclude:: views/010.php + :lines: 2- Additionally, if you would like the default functionality of the ``view()`` function to be that it does clear the data between calls, you can set ``$saveData`` to ``false`` in **app/Config/Views.php**. diff --git a/user_guide_src/source/outgoing/views/013.php b/user_guide_src/source/outgoing/views/013.php new file mode 100644 index 000000000000..2868ed564dba --- /dev/null +++ b/user_guide_src/source/outgoing/views/013.php @@ -0,0 +1,5 @@ +get('blog', [Blog::class, 'index']); From ff10390204b7287136fc8649184d7024fdc505c4 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sat, 21 Jan 2023 18:35:09 +0100 Subject: [PATCH 2980/8282] Throttler::tokenTime fix, use cases --- system/Throttle/Throttler.php | 2 +- tests/system/Throttle/ThrottleTest.php | 132 +++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 1 deletion(-) diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php index bdca42ed8e9f..dc0844fa4cb8 100644 --- a/system/Throttle/Throttler.php +++ b/system/Throttle/Throttler.php @@ -139,7 +139,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1): // How many seconds till a new token is available. // We must have a minimum wait of 1 second for a new token. // Primarily stored to allow devs to report back to users. - $newTokenAvailable = (int) ($refresh - $elapsed - $refresh * $tokens); + $newTokenAvailable = (int) round((1 - $tokens) * $refresh); $this->tokenTime = max(1, $newTokenAvailable); return false; diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 4bff58c01f51..2cfa9680b552 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -187,4 +187,136 @@ public function testFlooding() $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0)); $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1'))); } + + /** + * @dataProvider tokenTimeUsecases + */ + public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void { + $key = 'testkey'; + $throttler = new Throttler($this->cache); + + // clear $key before test start + $throttler->remove($key); + + foreach ($checkInputs as $index => $checkInput) { + $throttler->setTestTime($checkInput['testTime']); + $checkResult = $throttler->check($key, $capacity, $seconds, $checkInput['cost']); + + $this->assertEquals($checkInput['expectedCheckResult'], $checkResult, "Input#$index: Wrong check() result"); + $this->assertEquals($checkInput['expectedTokenTime'], $throttler->getTokenTime(), "Input#$index: Wrong tokenTime"); + } + } + + public function tokenTimeUsecases(): array { + return [ + '2 capacity / 200 seconds (100s refresh, 0.01 tokens/s) -> 5 checks, 1 cost each' => [ + 'capacity' => 2, + 'seconds' => 200, + 'checkInputs' => [ + [ // 2 -> 1 + 'testTime' => 0, + 'cost' => 1, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +3s / 1.03 -> 0.03 + 'testTime' => 3, + 'cost' => 1, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +0s / 0.03 -> 0.03 / (1 - 0.03) * 100 = 97 + 'testTime' => 3, + 'cost' => 1, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 97 + ], + [ // +1m 32s / 0.95 -> 0.95 / (1 - 0.95) * 100 = 5 + 'testTime' => 95, + 'cost' => 1, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 5 + ], + [ // +7s / 1.02 -> 0.02 + 'testTime' => 102, + 'cost' => 1, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +13s / 0.15 / (1 - 0.15) * 100 = 85 + 'testTime' => 115, + 'cost' => 1, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 85 + ] + ] + ], + '1 capacity / 3600 seconds (3600s refresh, 2.77e-4 tokens/s) -> 2 checks with 1 cost each' => [ + 'capacity' => 1, + 'seconds' => 3600, + 'checkInputs' => [ + [ // 1 -> 0 + 'testTime' => 0, + 'cost' => 1, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +6m / 0.1 -> 0.1 / (1 - 0.1) * 3600 = 3240 + 'testTime' => 360, + 'cost' => 1, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 3240 + ] + ] + ], + '10 capacity / 200 seconds (20s refresh, 0.05 tokens/s) -> 7 checks with different costs (RNG)' => [ + 'capacity' => 10, + 'seconds' => 200, + 'checkInputs' => [ + [ // -2t / 10 -> 8 + 'testTime' => 0, + 'cost' => 2, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +19s -2t / 8.95 -> 6.95 + 'testTime' => 19, + 'cost' => 2, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +16s -3t / 7.75 -> 4.75 + 'testTime' => 35, + 'cost' => 3, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +4s -2t / 4.95 -> 2.95 + 'testTime' => 39, + 'cost' => 2, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +13s -5t / 3.6 -> -1.4 (blow allowed) + 'testTime' => 52, + 'cost' => 5, + 'expectedCheckResult' => true, + 'expectedTokenTime' => 0 + ], + [ // +2s -2t / -1.3 -> -1.3 / (1 - (-1.3)) * 20 = 46 + 'testTime' => 54, + 'cost' => 2, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 46 + ], + [ // +7s -2t / -0.95 - -0.95 / (1 - (-0.95)) * 20 = 39 + 'testTime' => 61, + 'cost' => 2, + 'expectedCheckResult' => false, + 'expectedTokenTime' => 39 + ] + ] + ] + ]; + } } From 55626fc140c9e896d5ea4dc60896dab36ee9a9d7 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sat, 21 Jan 2023 19:06:49 +0100 Subject: [PATCH 2981/8282] Fixing coding standard --- tests/system/Throttle/ThrottleTest.php | 126 +++++++++++++------------ 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 2cfa9680b552..c9256a6cf28a 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -191,7 +191,8 @@ public function testFlooding() /** * @dataProvider tokenTimeUsecases */ - public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void { + public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void + { $key = 'testkey'; $throttler = new Throttler($this->cache); @@ -202,121 +203,122 @@ public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $ $throttler->setTestTime($checkInput['testTime']); $checkResult = $throttler->check($key, $capacity, $seconds, $checkInput['cost']); - $this->assertEquals($checkInput['expectedCheckResult'], $checkResult, "Input#$index: Wrong check() result"); - $this->assertEquals($checkInput['expectedTokenTime'], $throttler->getTokenTime(), "Input#$index: Wrong tokenTime"); + $this->assertEquals($checkInput['expectedCheckResult'], $checkResult, "Input#{$index}: Wrong check() result"); + $this->assertEquals($checkInput['expectedTokenTime'], $throttler->getTokenTime(), "Input#{$index}: Wrong tokenTime"); } } - public function tokenTimeUsecases(): array { + public function tokenTimeUsecases(): array + { return [ '2 capacity / 200 seconds (100s refresh, 0.01 tokens/s) -> 5 checks, 1 cost each' => [ - 'capacity' => 2, - 'seconds' => 200, + 'capacity' => 2, + 'seconds' => 200, 'checkInputs' => [ [ // 2 -> 1 - 'testTime' => 0, - 'cost' => 1, + 'testTime' => 0, + 'cost' => 1, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +3s / 1.03 -> 0.03 - 'testTime' => 3, - 'cost' => 1, + 'testTime' => 3, + 'cost' => 1, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +0s / 0.03 -> 0.03 / (1 - 0.03) * 100 = 97 - 'testTime' => 3, - 'cost' => 1, + 'testTime' => 3, + 'cost' => 1, 'expectedCheckResult' => false, - 'expectedTokenTime' => 97 + 'expectedTokenTime' => 97, ], [ // +1m 32s / 0.95 -> 0.95 / (1 - 0.95) * 100 = 5 - 'testTime' => 95, - 'cost' => 1, + 'testTime' => 95, + 'cost' => 1, 'expectedCheckResult' => false, - 'expectedTokenTime' => 5 + 'expectedTokenTime' => 5, ], [ // +7s / 1.02 -> 0.02 - 'testTime' => 102, - 'cost' => 1, + 'testTime' => 102, + 'cost' => 1, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +13s / 0.15 / (1 - 0.15) * 100 = 85 - 'testTime' => 115, - 'cost' => 1, + 'testTime' => 115, + 'cost' => 1, 'expectedCheckResult' => false, - 'expectedTokenTime' => 85 - ] - ] + 'expectedTokenTime' => 85, + ], + ], ], '1 capacity / 3600 seconds (3600s refresh, 2.77e-4 tokens/s) -> 2 checks with 1 cost each' => [ - 'capacity' => 1, - 'seconds' => 3600, + 'capacity' => 1, + 'seconds' => 3600, 'checkInputs' => [ [ // 1 -> 0 - 'testTime' => 0, - 'cost' => 1, + 'testTime' => 0, + 'cost' => 1, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +6m / 0.1 -> 0.1 / (1 - 0.1) * 3600 = 3240 - 'testTime' => 360, - 'cost' => 1, + 'testTime' => 360, + 'cost' => 1, 'expectedCheckResult' => false, - 'expectedTokenTime' => 3240 - ] - ] + 'expectedTokenTime' => 3240, + ], + ], ], '10 capacity / 200 seconds (20s refresh, 0.05 tokens/s) -> 7 checks with different costs (RNG)' => [ - 'capacity' => 10, - 'seconds' => 200, + 'capacity' => 10, + 'seconds' => 200, 'checkInputs' => [ [ // -2t / 10 -> 8 - 'testTime' => 0, - 'cost' => 2, + 'testTime' => 0, + 'cost' => 2, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +19s -2t / 8.95 -> 6.95 - 'testTime' => 19, - 'cost' => 2, + 'testTime' => 19, + 'cost' => 2, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +16s -3t / 7.75 -> 4.75 - 'testTime' => 35, - 'cost' => 3, + 'testTime' => 35, + 'cost' => 3, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +4s -2t / 4.95 -> 2.95 - 'testTime' => 39, - 'cost' => 2, + 'testTime' => 39, + 'cost' => 2, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +13s -5t / 3.6 -> -1.4 (blow allowed) - 'testTime' => 52, - 'cost' => 5, + 'testTime' => 52, + 'cost' => 5, 'expectedCheckResult' => true, - 'expectedTokenTime' => 0 + 'expectedTokenTime' => 0, ], [ // +2s -2t / -1.3 -> -1.3 / (1 - (-1.3)) * 20 = 46 - 'testTime' => 54, - 'cost' => 2, + 'testTime' => 54, + 'cost' => 2, 'expectedCheckResult' => false, - 'expectedTokenTime' => 46 + 'expectedTokenTime' => 46, ], [ // +7s -2t / -0.95 - -0.95 / (1 - (-0.95)) * 20 = 39 - 'testTime' => 61, - 'cost' => 2, + 'testTime' => 61, + 'cost' => 2, 'expectedCheckResult' => false, - 'expectedTokenTime' => 39 - ] - ] - ] + 'expectedTokenTime' => 39, + ], + ], + ], ]; } } From 30df4501e7b9b85bc68fd8098f5678755d962e90 Mon Sep 17 00:00:00 2001 From: Christian Rumpf Date: Sat, 21 Jan 2023 19:39:35 +0100 Subject: [PATCH 2982/8282] More CS fixes --- tests/system/Throttle/ThrottleTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index c9256a6cf28a..2121636baefa 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -193,7 +193,7 @@ public function testFlooding() */ public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void { - $key = 'testkey'; + $key = 'testkey'; $throttler = new Throttler($this->cache); // clear $key before test start @@ -203,8 +203,8 @@ public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $ $throttler->setTestTime($checkInput['testTime']); $checkResult = $throttler->check($key, $capacity, $seconds, $checkInput['cost']); - $this->assertEquals($checkInput['expectedCheckResult'], $checkResult, "Input#{$index}: Wrong check() result"); - $this->assertEquals($checkInput['expectedTokenTime'], $throttler->getTokenTime(), "Input#{$index}: Wrong tokenTime"); + $this->assertSame($checkInput['expectedCheckResult'], $checkResult, "Input#{$index}: Wrong check() result"); + $this->assertSame($checkInput['expectedTokenTime'], $throttler->getTokenTime(), "Input#{$index}: Wrong tokenTime"); } } From 7f9e28e8848d8a53d6782a40d2dca2ef4741043d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 11:27:06 +0900 Subject: [PATCH 2983/8282] chore: update version in API docs --- phpdoc.dist.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml index 157b02055990..b64ce2899051 100644 --- a/phpdoc.dist.xml +++ b/phpdoc.dist.xml @@ -5,12 +5,12 @@ xmlns="https://www.phpdoc.org" xsi:noNamespaceSchemaLocation="https://docs.phpdoc.org/latest/phpdoc.xsd" > - CodeIgniter v4.0.0 API + CodeIgniter v4.3 API api/build/ api/cache/ - + system From 33aa7f08d31b0d3e1fe7ffa55d83d0fc1b2ff0e2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 17:23:15 +0900 Subject: [PATCH 2984/8282] docs: reorganize sections --- user_guide_src/source/dbmgmt/forge.rst | 35 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 3de1c8d4924c..93143ee1d244 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -77,9 +77,9 @@ for the file where the database will be created using the ``--ext`` option. Vali produce a success message but no database file is created. This is because SQLite3 will just use an in-memory database. -**************************** -Creating and Dropping Tables -**************************** +*************** +Creating Tables +*************** There are several things you may wish to do when creating tables. Add fields, add keys to the table, alter columns. CodeIgniter provides a @@ -176,10 +176,6 @@ and unique keys with specific methods: .. note:: When you add a primary key, MySQL and SQLite will assume the name ``PRIMARY`` even if a name is provided. -You may add keys to an existing table by using ``processIndexes()``: - -.. literalinclude:: forge/029.php - .. _adding-foreign-keys: Adding Foreign Keys @@ -216,6 +212,10 @@ You could also pass optional table attributes, such as MySQL's ``ENGINE``: ``createTable()`` will always add them with your configured *charset* and *DBCollat* values, as long as they are not empty (MySQL only). +*************** +Dropping Tables +*************** + Dropping a Table ================ @@ -228,6 +228,10 @@ drivers to handle removal of tables with foreign keys. .. literalinclude:: forge/018.php +**************** +Modifying Tables +**************** + Dropping a Foreign Key ====================== @@ -236,7 +240,7 @@ Execute a DROP FOREIGN KEY. .. literalinclude:: forge/019.php Dropping a Key -====================== +=============== Execute a DROP KEY. @@ -260,10 +264,6 @@ Executes a TABLE rename .. literalinclude:: forge/021.php -**************** -Modifying Tables -**************** - Adding a Column to a Table ========================== @@ -284,7 +284,7 @@ Examples: .. literalinclude:: forge/023.php Dropping Columns From a Table -============================== +============================= .. _db-forge-dropColumn: @@ -311,6 +311,15 @@ change the name, you can add a "name" key into the field defining array. .. literalinclude:: forge/026.php +Adding Keys to a Table +====================== + +.. versionadded:: 4.3.0 + +You may add keys to an existing table by using ``processIndexes()``: + +.. literalinclude:: forge/029.php + *************** Class Reference *************** From e0bdb5302f62e1cfb29386ba440cefa1ed07a0fc Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 17:28:18 +0900 Subject: [PATCH 2985/8282] docs: change section order --- user_guide_src/source/dbmgmt/forge.rst | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 93143ee1d244..43d542b7816d 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -232,38 +232,6 @@ drivers to handle removal of tables with foreign keys. Modifying Tables **************** -Dropping a Foreign Key -====================== - -Execute a DROP FOREIGN KEY. - -.. literalinclude:: forge/019.php - -Dropping a Key -=============== - -Execute a DROP KEY. - -.. literalinclude:: forge/020.php - -.. _dropping-a-primary-key: - -Dropping a Primary Key -====================== - -.. versionadded:: 4.3.0 - -Execute a DROP PRIMARY KEY. - -.. literalinclude:: forge/028.php - -Renaming a Table -================ - -Executes a TABLE rename - -.. literalinclude:: forge/021.php - Adding a Column to a Table ========================== @@ -320,6 +288,38 @@ You may add keys to an existing table by using ``processIndexes()``: .. literalinclude:: forge/029.php +Dropping a Primary Key +====================== + +.. versionadded:: 4.3.0 + +Execute a DROP PRIMARY KEY. + +.. literalinclude:: forge/028.php + +Dropping a Key +=============== + +Execute a DROP KEY. + +.. literalinclude:: forge/020.php + +.. _dropping-a-primary-key: + +Dropping a Foreign Key +====================== + +Execute a DROP FOREIGN KEY. + +.. literalinclude:: forge/019.php + +Renaming a Table +================ + +Executes a TABLE rename + +.. literalinclude:: forge/021.php + *************** Class Reference *************** From 671efc1bf99daac99c3884977ccab1f6ccdbd80f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 17:58:03 +0900 Subject: [PATCH 2986/8282] docs: fix label position --- user_guide_src/source/dbmgmt/forge.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 43d542b7816d..52750ae5ad0a 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -288,6 +288,8 @@ You may add keys to an existing table by using ``processIndexes()``: .. literalinclude:: forge/029.php +.. _dropping-a-primary-key: + Dropping a Primary Key ====================== @@ -304,8 +306,6 @@ Execute a DROP KEY. .. literalinclude:: forge/020.php -.. _dropping-a-primary-key: - Dropping a Foreign Key ====================== From 12883f0ab0397577fd41d5e6e656fe6f32a86f81 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 18:00:35 +0900 Subject: [PATCH 2987/8282] docs: replace "column" in titles with "field" --- user_guide_src/source/dbmgmt/forge.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 52750ae5ad0a..b8da792be9a5 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -232,8 +232,8 @@ drivers to handle removal of tables with foreign keys. Modifying Tables **************** -Adding a Column to a Table -========================== +Adding a Field to a Table +========================= $forge->addColumn() ------------------- @@ -251,8 +251,8 @@ Examples: .. literalinclude:: forge/023.php -Dropping Columns From a Table -============================= +Dropping Fields From a Table +============================ .. _db-forge-dropColumn: @@ -267,8 +267,8 @@ Used to remove multiple columns from a table. .. literalinclude:: forge/025.php -Modifying a Column in a Table -============================= +Modifying a Field in a Table +============================ $forge->modifyColumn() ---------------------- @@ -335,7 +335,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Adds a column to a table. Usage: See `Adding a Column to a Table`_. + Adds a column to a table. Usage: See `Adding a Field to a Table`_. .. php:method:: addField($field) @@ -423,7 +423,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Drops single or multiple columns from a table. Usage: See `Dropping Columns From a Table`_. + Drops single or multiple columns from a table. Usage: See `Dropping Fields From a Table`_. .. php:method:: dropDatabase($dbName) @@ -481,7 +481,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Modifies a table column. Usage: See `Modifying a Column in a Table`_. + Modifies a table column. Usage: See `Modifying a Field in a Table`_. .. php:method:: renameTable($table_name, $new_table_name) From d60a0f7785839fedfac13d02e3cd5781385bdcba Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 18:01:47 +0900 Subject: [PATCH 2988/8282] docs: improve docs --- user_guide_src/source/changelogs/v4.3.0.rst | 2 +- user_guide_src/source/dbmgmt/forge.rst | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.0.rst b/user_guide_src/source/changelogs/v4.3.0.rst index 5911f1686568..d70b9dc66963 100644 --- a/user_guide_src/source/changelogs/v4.3.0.rst +++ b/user_guide_src/source/changelogs/v4.3.0.rst @@ -240,7 +240,7 @@ Query Builder Forge ----- -- Added ``Forge::processIndexes()`` allowing the creation of indexes on an existing table. See :ref:`adding-keys` for the details. +- Added ``Forge::processIndexes()`` allowing the creation of indexes on an existing table. See :ref:`db-forge-adding-keys-to-a-table` for the details. - Added the ability to manually set index names. These methods include: ``Forge::addKey()``, ``Forge::addPrimaryKey()``, and ``Forge::addUniqueKey()`` - The new method ``Forge::dropPrimaryKey()`` allows dropping the primary key on a table. See :ref:`dropping-a-primary-key`. - Fixed ``Forge::dropKey()`` to allow dropping unique indexes. This required the ``DROP CONSTRAINT`` SQL command. diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index b8da792be9a5..88cf7562c642 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -1,3 +1,4 @@ +#################### Database Forge Class #################### @@ -142,7 +143,7 @@ string into the field definitions with ``addField()``: .. note:: Multiple calls to ``addField()`` are cumulative. -Creating an id field +Creating an id Field -------------------- There is a special exception for creating id fields. A field with type @@ -156,6 +157,9 @@ Primary Key. Adding Keys =========== +$forge->addKey() +---------------- + Generally speaking, you'll want your table to have Keys. This is accomplished with ``$forge->addKey('field')``. The optional second parameter set to true will make it a primary key and the third @@ -169,6 +173,12 @@ below is for MySQL. .. literalinclude:: forge/010.php +$forge->addPrimaryKey() +----------------------- + +$forge->addUniqueKey() +---------------------- + To make code reading more objective it is also possible to add primary and unique keys with specific methods: @@ -279,12 +289,15 @@ change the name, you can add a "name" key into the field defining array. .. literalinclude:: forge/026.php +.. _db-forge-adding-keys-to-a-table: + Adding Keys to a Table ====================== .. versionadded:: 4.3.0 -You may add keys to an existing table by using ``processIndexes()``: +You may add keys to an existing table by using ``addKey()``, ``addPrimaryKey()``, +``addUniqueKey()`` or ``addForeignKey()`` and ``processIndexes()``: .. literalinclude:: forge/029.php @@ -467,12 +480,15 @@ Class Reference .. php:method:: processIndexes($table) + .. versionadded:: 4.3.0 + :param string $table: Name of the table to add indexes to :returns: true on success, false on failure :rtype: bool Used following ``addKey()``, ``addPrimaryKey()``, ``addUniqueKey()``, and ``addForeignKey()`` to add indexes to an existing table. + See `Adding Keys to a Table`_. .. php:method:: modifyColumn($table, $field) From 837fc23afa8d2b46523f2bb4716e36afcd79f89b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 18:08:48 +0900 Subject: [PATCH 2989/8282] docs: fix indent --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 88cf7562c642..8e80188a1b69 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -356,7 +356,7 @@ Class Reference :returns: \CodeIgniter\Database\Forge instance (method chaining) :rtype: \CodeIgniter\Database\Forge - Adds a field to the set that will be used to create a table. Usage: See `Adding Fields`_. + Adds a field to the set that will be used to create a table. Usage: See `Adding Fields`_. .. php:method:: addForeignKey($fieldName, $tableName, $tableField[, $onUpdate = '', $onDelete = '', $fkName = '']) From 0bcaf145d2330fa21c5235c679541394e5c6f600 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 18:09:09 +0900 Subject: [PATCH 2990/8282] docs: remove duplicate note --- user_guide_src/source/dbmgmt/forge.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 8e80188a1b69..a3b74e979966 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -369,8 +369,6 @@ Class Reference :returns: \CodeIgniter\Database\Forge instance (method chaining) :rtype: \CodeIgniter\Database\Forge - .. note:: ``$fkName`` can be used since v4.3.0. - Adds a foreign key to the set that will be used to create a table. Usage: See `Adding Foreign Keys`_. .. note:: ``$fkName`` can be used since v4.3.0. From 7217843456883e29e95f2f12c23941c73c803e41 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 22:22:51 +0900 Subject: [PATCH 2991/8282] docs: fix link --- changelogs/CHANGELOG_4.2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/CHANGELOG_4.2.md b/changelogs/CHANGELOG_4.2.md index e472b4b87883..a6eae8a48637 100644 --- a/changelogs/CHANGELOG_4.2.md +++ b/changelogs/CHANGELOG_4.2.md @@ -420,4 +420,4 @@ * Small change to improve code reading by @valmorflores in https://github.com/codeigniter4/CodeIgniter4/pull/6051 * refactor: remove `CodeIgniter\Services` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6053 -See [CHANGELOG_4.1.md](./changelogs/CHANGELOG_4.1.md) +See [CHANGELOG_4.1.md](./CHANGELOG_4.1.md) From 214cf1fcf1958d87d79ed03c6bbade3bd79aee7a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 08:31:37 +0900 Subject: [PATCH 2992/8282] docs: change link to the official user guide codeigniter.com/user_guide/ --- user_guide_src/source/installation/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst index 4807b9a06620..3be12a637dcc 100644 --- a/user_guide_src/source/installation/index.rst +++ b/user_guide_src/source/installation/index.rst @@ -11,7 +11,7 @@ Which is right for you? is known for, choose the manual installation. However you choose to install and run CodeIgniter4, the -`user guide `_ is accessible online. +`user guide `_ is accessible online. .. note:: Before using CodeIgniter 4, make sure that your server meets the :doc:`requirements `, in particular the PHP From cb857030707f8512784b52a424dd0b522a5048d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 08:40:34 +0900 Subject: [PATCH 2993/8282] docs: add note --- user_guide_src/source/installation/installing_composer.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 97c39b34a19b..f415c895cab7 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -9,6 +9,9 @@ Composer can be used in several ways to install CodeIgniter4 on your system. .. important:: CodeIgniter4 requires Composer 2.0.14 or later. +.. note:: If you are not familiar with Composer, we recommend you read + `Basic usage `_ first. + The first technique describes creating a skeleton project using CodeIgniter4, that you would then use as the base for a new webapp. The second technique described below lets you add CodeIgniter4 to an existing From 6faf52c9c99124ff7f70dd7e4fe11100c9b7fa30 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 08:52:21 +0900 Subject: [PATCH 2994/8282] docs: change file decoration --- .../source/installation/installing_composer.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index f415c895cab7..8f8c0f167c52 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -18,7 +18,7 @@ The second technique described below lets you add CodeIgniter4 to an existing webapp, .. note:: If you are using a Git repository to store your code, or for - collaboration with others, then the ``vendor`` folder would normally + collaboration with others, then the **vendor** folder would normally be "git ignored". In such a case, you will need to do a ``composer update`` when you clone the repository to a new system. @@ -39,7 +39,7 @@ In the folder above your project root:: > composer create-project codeigniter4/appstarter project-root -The command above will create a "project-root" folder. +The command above will create a **project-root** folder. If you omit the "project-root" argument, the command will create an "appstarter" folder, which can be renamed as appropriate. @@ -137,8 +137,8 @@ In your project root:: Setting Up ---------- - 1. Copy the ``app``, ``public``, ``tests`` and ``writable`` folders from ``vendor/codeigniter4/framework`` to your project root - 2. Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from ``vendor/codeigniter4/framework`` to your project root + 1. Copy the **app**, **public**, **tests** and **writable** folders from **vendor/codeigniter4/framework** to your project root + 2. Copy the **env**, **phpunit.xml.dist** and **spark** files, from **vendor/codeigniter4/framework** to your project root 3. You will have to adjust the ``$systemDirectory`` property in **app/Config/Paths.php** to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``. Initial Configuration From 535254cced2e4f31a916d078776e8eb65a33b32c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 08:56:05 +0900 Subject: [PATCH 2995/8282] docs: add note for --no-dev when deploying Remove "composer create-project codeigniter4/appstarter --no-dev", because it is not so important. --- .../installation/installing_composer.rst | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 8f8c0f167c52..713fbd22df99 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -48,14 +48,14 @@ If you omit the "project-root" argument, the command will create an The symbols that can be used are ``/``, ``_``, ``.``, ``:``, ``\`` and space. So if you install CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter won't work. -If you don't need or want phpunit installed, and all of its composer -dependencies, then add the ``--no-dev`` option to the end of the above -command line. That will result in only the framework, and the three -trusted dependencies that we bundle, being composer-installed. +.. important:: When you deploy to your production server, don't forget to run the + following command:: -A sample such installation command, using the default project-root "appstarter":: + > composer install --no-dev - > composer create-project codeigniter4/appstarter --no-dev + The above command will removes the Composer packages only for development + that are not needed in the production environment. This will greatly reduce + the folder size. Initial Configuration --------------------- @@ -134,6 +134,15 @@ In your project root:: > composer require codeigniter4/framework +.. important:: When you deploy to your production server, don't forget to run the + following command:: + + > composer install --no-dev + + The above command will removes the Composer packages only for development + that are not needed in the production environment. This will greatly reduce + the folder size. + Setting Up ---------- From e293c6472cf7d9c4df4b92cf74cd93a43777bb77 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 09:17:29 +0900 Subject: [PATCH 2996/8282] chore: add missing items The items in composer.json in main repository. --- admin/framework/composer.json | 5 +++++ admin/starter/composer.json | 24 +++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index f4f974c6d635..2cf6c1c76de2 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -42,6 +42,11 @@ "ext-fileinfo": "Improves mime type detection for files", "ext-readline": "Improves CLI::input() usability" }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, "autoload": { "psr-4": { "CodeIgniter\\": "system/" diff --git a/admin/starter/composer.json b/admin/starter/composer.json index e52218478b04..524cae392d27 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -14,7 +14,29 @@ "phpunit/phpunit": "^9.1" }, "suggest": { - "ext-fileinfo": "Improves mime type detection for files" + "ext-curl": "If you use CURLRequest class", + "ext-imagick": "If you use Image class ImageMagickHandler", + "ext-gd": "If you use Image class GDHandler", + "ext-exif": "If you run Image class tests", + "ext-simplexml": "If you format XML", + "ext-mysqli": "If you use MySQL", + "ext-oci8": "If you use Oracle Database", + "ext-pgsql": "If you use PostgreSQL", + "ext-sqlsrv": "If you use SQL Server", + "ext-sqlite3": "If you use SQLite3", + "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", + "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", + "ext-redis": "If you use Cache class RedisHandler", + "ext-dom": "If you use TestResponse", + "ext-libxml": "If you use TestResponse", + "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()", + "ext-fileinfo": "Improves mime type detection for files", + "ext-readline": "Improves CLI::input() usability" + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true }, "autoload": { "exclude-from-classmap": [ From 57d72d7d847ffa731b873825f88e2fe9dad88569 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 09:30:46 +0900 Subject: [PATCH 2997/8282] test: add tests --- tests/system/AutoReview/ComposerJsonTest.php | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 80ebcaeeb172..dcf2d9487db7 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -27,6 +27,7 @@ final class ComposerJsonTest extends TestCase { private array $devComposer; private array $frameworkComposer; + private array $starterComposer; protected function setUp(): void { @@ -34,6 +35,7 @@ protected function setUp(): void $this->devComposer = $this->getComposerJson(dirname(__DIR__, 3) . '/composer.json'); $this->frameworkComposer = $this->getComposerJson(dirname(__DIR__, 3) . '/admin/framework/composer.json'); + $this->starterComposer = $this->getComposerJson(dirname(__DIR__, 3) . '/admin/starter/composer.json'); } public function testFrameworkRequireIsTheSameWithDevRequire(): void @@ -77,6 +79,33 @@ public function testFrameworkSuggestIsTheSameWithDevSuggest(): void ); } + public function testStarterSuggestIsTheSameWithDevSuggest(): void + { + $this->assertSame( + $this->devComposer['suggest'], + $this->starterComposer['suggest'], + 'The starter\'s "suggest" section is not updated with the main composer.json.' + ); + } + + public function testFrameworkConfigIsTheSameWithDevSuggest(): void + { + $this->assertSame( + $this->devComposer['config'], + $this->frameworkComposer['config'], + 'The framework\'s "config" section is not updated with the main composer.json.' + ); + } + + public function testStarterConfigIsTheSameWithDevSuggest(): void + { + $this->assertSame( + $this->devComposer['config'], + $this->starterComposer['config'], + 'The starter\'s "config" section is not updated with the main composer.json.' + ); + } + private function getComposerJson(string $path): array { try { From 8281b11f3cec3303328b7eb8f3278a4fe749d5e3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 09:36:16 +0900 Subject: [PATCH 2998/8282] test: refactor --- tests/system/AutoReview/ComposerJsonTest.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index dcf2d9487db7..5a7ae9ba2d34 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -81,11 +81,7 @@ public function testFrameworkSuggestIsTheSameWithDevSuggest(): void public function testStarterSuggestIsTheSameWithDevSuggest(): void { - $this->assertSame( - $this->devComposer['suggest'], - $this->starterComposer['suggest'], - 'The starter\'s "suggest" section is not updated with the main composer.json.' - ); + $this->checkStarter('suggest'); } public function testFrameworkConfigIsTheSameWithDevSuggest(): void @@ -98,11 +94,16 @@ public function testFrameworkConfigIsTheSameWithDevSuggest(): void } public function testStarterConfigIsTheSameWithDevSuggest(): void + { + $this->checkStarter('config'); + } + + private function checkStarter(string $section): void { $this->assertSame( - $this->devComposer['config'], - $this->starterComposer['config'], - 'The starter\'s "config" section is not updated with the main composer.json.' + $this->devComposer[$section], + $this->starterComposer[$section], + 'The starter\'s "' . $section . '" section is not updated with the main composer.json.' ); } From ed783e10d10ed0388ce0ec8dffc48ee40b8b3af1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 09:45:12 +0900 Subject: [PATCH 2999/8282] test: refactor --- tests/system/AutoReview/ComposerJsonTest.php | 27 +++++++++----------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 5a7ae9ba2d34..c078487adade 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -40,11 +40,7 @@ protected function setUp(): void public function testFrameworkRequireIsTheSameWithDevRequire(): void { - $this->assertSame( - $this->devComposer['require'], - $this->frameworkComposer['require'], - 'The framework\'s "require" section is not updated with the main composer.json.' - ); + $this->checkFramework('require'); } public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void @@ -72,11 +68,7 @@ public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void public function testFrameworkSuggestIsTheSameWithDevSuggest(): void { - $this->assertSame( - $this->devComposer['suggest'], - $this->frameworkComposer['suggest'], - 'The framework\'s "suggest" section is not updated with the main composer.json.' - ); + $this->checkFramework('suggest'); } public function testStarterSuggestIsTheSameWithDevSuggest(): void @@ -86,11 +78,7 @@ public function testStarterSuggestIsTheSameWithDevSuggest(): void public function testFrameworkConfigIsTheSameWithDevSuggest(): void { - $this->assertSame( - $this->devComposer['config'], - $this->frameworkComposer['config'], - 'The framework\'s "config" section is not updated with the main composer.json.' - ); + $this->checkFramework('config'); } public function testStarterConfigIsTheSameWithDevSuggest(): void @@ -98,6 +86,15 @@ public function testStarterConfigIsTheSameWithDevSuggest(): void $this->checkStarter('config'); } + private function checkFramework(string $section): void + { + $this->assertSame( + $this->devComposer[$section], + $this->frameworkComposer[$section], + 'The framework\'s "' . $section . '" section is not updated with the main composer.json.' + ); + } + private function checkStarter(string $section): void { $this->assertSame( From c160153f64816a010284d26278039cd63dc15ca0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 09:13:06 +0900 Subject: [PATCH 3000/8282] fix: add missing NOT IN --- system/Database/BaseBuilder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index f6fd1daff6cc..bd8c5004b4a6 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -3382,7 +3382,7 @@ protected function getOperator(string $str, bool $list = false) $this->pregOperators = [ '\s*(?:<|>|!)?=\s*', // =, <=, >=, != '\s*<>?\s*', // <, <> - '\s*>\s*', // >å + '\s*>\s*', // > '\s+IS NULL', // IS NULL '\s+IS NOT NULL', // IS NOT NULL '\s+EXISTS\s*\(.*\)', // EXISTS (sql) @@ -3422,6 +3422,7 @@ private function getOperatorFromWhereKey(string $whereKey) '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS (sql) '\s+BETWEEN\s+', // BETWEEN value AND value '\s+IN\s*\(.*\)', // IN (list) + '\s+NOT IN\s*\(.*\)', // NOT IN (list) '\s+LIKE', // LIKE '\s+NOT LIKE', // NOT LIKE ]; From 12f7ea0a06752c86314070b71ca6dbf794660a6e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 12:31:18 +0900 Subject: [PATCH 3001/8282] docs: folder size -> vendor folder size --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 713fbd22df99..1a37329b4936 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -55,7 +55,7 @@ If you omit the "project-root" argument, the command will create an The above command will removes the Composer packages only for development that are not needed in the production environment. This will greatly reduce - the folder size. + the vendor folder size. Initial Configuration --------------------- @@ -141,7 +141,7 @@ In your project root:: The above command will removes the Composer packages only for development that are not needed in the production environment. This will greatly reduce - the folder size. + the vendor folder size. Setting Up ---------- From 0130b06b4fa7b79b552ae2a76bdd2a4be8ebb43f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 12:47:51 +0900 Subject: [PATCH 3002/8282] chore: remove suggest in starter If you run `composer suggest`, it shows framework's. --- admin/starter/composer.json | 20 -------------------- tests/system/AutoReview/ComposerJsonTest.php | 5 ----- 2 files changed, 25 deletions(-) diff --git a/admin/starter/composer.json b/admin/starter/composer.json index 524cae392d27..cec23ba1987e 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -13,26 +13,6 @@ "mikey179/vfsstream": "^1.6", "phpunit/phpunit": "^9.1" }, - "suggest": { - "ext-curl": "If you use CURLRequest class", - "ext-imagick": "If you use Image class ImageMagickHandler", - "ext-gd": "If you use Image class GDHandler", - "ext-exif": "If you run Image class tests", - "ext-simplexml": "If you format XML", - "ext-mysqli": "If you use MySQL", - "ext-oci8": "If you use Oracle Database", - "ext-pgsql": "If you use PostgreSQL", - "ext-sqlsrv": "If you use SQL Server", - "ext-sqlite3": "If you use SQLite3", - "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", - "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", - "ext-redis": "If you use Cache class RedisHandler", - "ext-dom": "If you use TestResponse", - "ext-libxml": "If you use TestResponse", - "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()", - "ext-fileinfo": "Improves mime type detection for files", - "ext-readline": "Improves CLI::input() usability" - }, "config": { "optimize-autoloader": true, "preferred-install": "dist", diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index c078487adade..dc9ad26b9ef8 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -71,11 +71,6 @@ public function testFrameworkSuggestIsTheSameWithDevSuggest(): void $this->checkFramework('suggest'); } - public function testStarterSuggestIsTheSameWithDevSuggest(): void - { - $this->checkStarter('suggest'); - } - public function testFrameworkConfigIsTheSameWithDevSuggest(): void { $this->checkFramework('config'); From 3d251685d2e7f9d6d96cc91efef60fff196f5d49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:01:49 +0000 Subject: [PATCH 3003/8282] chore(deps-dev): update rector/rector requirement from 0.15.7 to 0.15.10 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.7...0.15.10) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5f57c60f6781..60144c6ecb61 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.7", + "rector/rector": "0.15.10", "vimeo/psalm": "^5.0" }, "suggest": { From 299c76e619539c525ad176fe0e947fff0b4c8208 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 24 Jan 2023 09:02:06 +0900 Subject: [PATCH 3004/8282] refactor: remove unneeded code --- app/Views/errors/html/error_exception.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index ae46d3056e89..c40f3ac55b7c 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -283,21 +283,11 @@ - - - - - getName(), 'html') ?> - getValueLine(), 'html') ?> - - + + + getName(), 'html') ?> + getValueLine(), 'html') ?> + @@ -332,7 +322,7 @@ - $value) : ?> + $header) : ?> getHeaderLine($name), 'html') ?> From 8ce15e50be8a4498b6d356c39259857e776a21f3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 24 Jan 2023 11:20:32 +0900 Subject: [PATCH 3005/8282] docs: add about removal of deprecated Config items --- .../source/installation/backward_compatibility_notes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/installation/backward_compatibility_notes.rst b/user_guide_src/source/installation/backward_compatibility_notes.rst index 65d1f9179ebd..e265d5a34968 100644 --- a/user_guide_src/source/installation/backward_compatibility_notes.rst +++ b/user_guide_src/source/installation/backward_compatibility_notes.rst @@ -13,5 +13,7 @@ However, the code is not mature and bug fixes may break compatibility in minor r What are not Breaking Changes ***************************** +- The deprecated Config items are not covered by backwards compatibility (BC) promise. It may be removed in the next + **minor** version or later. - System messages defined in **system/Language/en/** are strictly for internal framework use and are not covered by backwards compatibility (BC) promise. If developers are relying on language string output they should be checking it against the function call (``lang('...')``), not the content. - `Named arguments `_ are not covered by backwards compatibility (BC) promise. We may choose to rename method/function parameter names when necessary in order to improve the codebase. From ad93e936f043b8d328fece2d3a98f72a795b2a19 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 24 Jan 2023 16:09:47 +0900 Subject: [PATCH 3006/8282] fix: Event collector does not collect Timeline data --- phpstan-baseline.neon.dist | 5 ---- system/Debug/Toolbar/Collectors/Events.php | 28 ++++------------------ 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index af189e08b8b1..4259df0cc3ef 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -100,11 +100,6 @@ parameters: count: 13 path: system/Database/SQLSRV/Forge.php - - - message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#" - count: 1 - path: system/Debug/Toolbar/Collectors/Events.php - - message: "#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#" count: 1 diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php index a8a7e7aa4c35..178a886644a5 100644 --- a/system/Debug/Toolbar/Collectors/Events.php +++ b/system/Debug/Toolbar/Collectors/Events.php @@ -11,11 +11,8 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; -use CodeIgniter\View\RendererInterface; -use Config\Services; - /** - * Views collector + * Events collector */ class Events extends BaseCollector { @@ -25,7 +22,7 @@ class Events extends BaseCollector * * @var bool */ - protected $hasTimeline = false; + protected $hasTimeline = true; /** * Whether this collector needs to display @@ -51,21 +48,6 @@ class Events extends BaseCollector */ protected $title = 'Events'; - /** - * Instance of the Renderer service - * - * @var RendererInterface - */ - protected $viewer; - - /** - * Constructor. - */ - public function __construct() - { - $this->viewer = Services::renderer(); - } - /** * Child classes should implement this to return the timeline data * formatted for correct usage. @@ -74,12 +56,12 @@ protected function formatTimelineData(): array { $data = []; - $rows = $this->viewer->getPerformanceData(); + $rows = \CodeIgniter\Events\Events::getPerformanceLogs(); foreach ($rows as $info) { $data[] = [ - 'name' => 'View: ' . $info['view'], - 'component' => 'Views', + 'name' => 'Event: ' . $info['event'], + 'component' => 'Events', 'start' => $info['start'], 'duration' => $info['end'] - $info['start'], ]; From 0afa8a43d51af8022dda751993710ebfff358f36 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 24 Jan 2023 16:11:43 +0900 Subject: [PATCH 3007/8282] fix: DebugBar initializes shared renderer instance A dev cannot create shared renderer instance. --- system/Debug/Toolbar/Collectors/Views.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php index fae3385fffbc..2e036ff19c85 100644 --- a/system/Debug/Toolbar/Collectors/Views.php +++ b/system/Debug/Toolbar/Collectors/Views.php @@ -60,9 +60,9 @@ class Views extends BaseCollector protected $title = 'Views'; /** - * Instance of the Renderer service + * Instance of the shared Renderer service * - * @var RendererInterface + * @var RendererInterface|null */ protected $viewer; @@ -73,12 +73,9 @@ class Views extends BaseCollector */ protected $views = []; - /** - * Constructor. - */ - public function __construct() + private function getViewer(): void { - $this->viewer = Services::renderer(); + $this->viewer ??= Services::renderer(); } /** @@ -87,6 +84,8 @@ public function __construct() */ protected function formatTimelineData(): array { + $this->getViewer(); + $data = []; $rows = $this->viewer->getPerformanceData(); @@ -121,8 +120,9 @@ protected function formatTimelineData(): array */ public function getVarData(): array { - return [ + $this->getViewer(); + return [ 'View Data' => $this->viewer->getData(), ]; } @@ -132,6 +132,8 @@ public function getVarData(): array */ public function getBadgeValue(): int { + $this->getViewer(); + return count($this->viewer->getPerformanceData()); } From fdb72579f1bca467619f6b8b5bb3f2bab6d2b18f Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 23 Jan 2023 23:20:29 +0700 Subject: [PATCH 3008/8282] [Rector] Apply Rector to app/Views --- rector.php | 1 - 1 file changed, 1 deletion(-) diff --git a/rector.php b/rector.php index 095cb2444c62..c2f296f5f8e5 100644 --- a/rector.php +++ b/rector.php @@ -74,7 +74,6 @@ // is there a file you need to skip? $rectorConfig->skip([ - __DIR__ . '/app/Views', __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php', __DIR__ . '/system/ThirdParty', __DIR__ . '/tests/system/Config/fixtures', From ba96124a1ef53714f6512b6e0ffa2b207f57de85 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 25 Jan 2023 09:31:24 +0700 Subject: [PATCH 3009/8282] fix line use statemens --- app/Views/errors/html/error_exception.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index c40f3ac55b7c..f311d910c0fa 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -1,4 +1,9 @@ - + @@ -77,16 +82,16 @@   —   - - ( arguments ) -
        + + ( arguments ) +
        getParameters(); } @@ -189,7 +194,7 @@
        - +
        @@ -297,7 +302,7 @@ setStatusCode(http_response_code()); ?>
        @@ -322,7 +327,7 @@
        - $header) : ?> + @@ -377,7 +382,7 @@

        Displayed at — PHP: — - CodeIgniter: + CodeIgniter:

        From 680ea61a8e18395ee354955278d817e5c0cc9c5a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 13:48:37 +0900 Subject: [PATCH 3010/8282] test: improve test case --- tests/system/Router/RouteCollectionTest.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 70d378467414..6458449a02c9 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -1782,15 +1782,16 @@ public function testGetRegisteredControllersReturnsOneControllerWhenTwoRoutsWith public function testGetRegisteredControllersReturnsAllControllers() { $collection = $this->getCollector(); - $collection->get('test', '\App\Controllers\Hello::get'); - $collection->post('test', '\App\Controllers\Hello::post'); - $collection->post('hello', '\App\Controllers\Test::hello'); + $collection->get('test', '\App\Controllers\HelloGet::get'); + $collection->post('test', '\App\Controllers\HelloPost::post'); + $collection->post('hello', '\App\Controllers\TestPost::hello'); $routes = $collection->getRegisteredControllers('*'); $expects = [ - '\App\Controllers\Hello', - '\App\Controllers\Test', + '\App\Controllers\HelloGet', + '\App\Controllers\HelloPost', + '\App\Controllers\TestPost', ]; $this->assertSame($expects, $routes); } From 74bbf2bcf86712a15683d68e52ddab0b9027ffb0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 14:27:04 +0900 Subject: [PATCH 3011/8282] fix: getRegisteredControllers() may not return all controllers --- system/Router/RouteCollection.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 7dd87701a432..26cedbfc1a65 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1577,31 +1577,32 @@ public function setPrioritize(bool $enabled = true) * Get all controllers in Route Handlers * * @param string|null $verb HTTP verb. `'*'` returns all controllers in any verb. + * + * @return array controller name list + * @phpstan-return list */ public function getRegisteredControllers(?string $verb = '*'): array { - $routes = []; + $handlers = []; if ($verb === '*') { - $rawRoutes = []; - foreach ($this->defaultHTTPMethods as $tmpVerb) { - $rawRoutes = array_merge($rawRoutes, $this->routes[$tmpVerb]); - } - - foreach ($rawRoutes as $route) { - $key = key($route['route']); - $handler = $route['route'][$key]; - - $routes[$key] = $handler; + foreach ($this->routes[$tmpVerb] as $route) { + $key = key($route['route']); + $handlers[] = $route['route'][$key]; + } } } else { $routes = $this->getRoutes($verb); + + foreach ($routes as $handler) { + $handlers[] = $handler; + } } $controllers = []; - foreach ($routes as $handler) { + foreach ($handlers as $handler) { if (! is_string($handler)) { continue; } From 785c10fc1e0ab860ea9afeea7347c2a4bd55ffd6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 14:42:06 +0900 Subject: [PATCH 3012/8282] refactor: reduce foreach --- system/Router/RouteCollection.php | 38 +++++++++++++++++++------------ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 26cedbfc1a65..c688ed88a04f 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1583,36 +1583,46 @@ public function setPrioritize(bool $enabled = true) */ public function getRegisteredControllers(?string $verb = '*'): array { - $handlers = []; + $controllers = []; if ($verb === '*') { foreach ($this->defaultHTTPMethods as $tmpVerb) { foreach ($this->routes[$tmpVerb] as $route) { - $key = key($route['route']); - $handlers[] = $route['route'][$key]; + $routeKey = key($route['route']); + $controller = $this->getControllerName($route['route'][$routeKey]); + if ($controller !== null) { + $controllers[] = $controller; + } } } } else { $routes = $this->getRoutes($verb); foreach ($routes as $handler) { - $handlers[] = $handler; + $controller = $this->getControllerName($handler); + if ($controller !== null) { + $controllers[] = $controller; + } } } - $controllers = []; - - foreach ($handlers as $handler) { - if (! is_string($handler)) { - continue; - } - - [$controller] = explode('::', $handler, 2); + return array_unique($controllers); + } - $controllers[] = $controller; + /** + * @param Closure|string $handler Handler + * + * @return string|null Controller classname + */ + private function getControllerName($handler) + { + if (! is_string($handler)) { + return null; } - return array_unique($controllers); + [$controller] = explode('::', $handler, 2); + + return $controller; } /** From d19c23522291ec9a705578ee54880b0d5314fe21 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 17:08:15 +0900 Subject: [PATCH 3013/8282] fix: spark routes shows incorrect hostname routes --- system/Router/RouteCollection.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 7dd87701a432..3c49b5548b6c 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1316,13 +1316,12 @@ protected function create(string $verb, string $from, $to, ?array $options = nul // Hostname limiting? if (! empty($options['hostname'])) { // @todo determine if there's a way to whitelist hosts? - if (isset($this->httpHost) && strtolower($this->httpHost) !== strtolower($options['hostname'])) { + if (! $this->checkHostname($options['hostname'])) { return; } $overwrite = true; } - // Limiting to subdomains? elseif (! empty($options['subdomain'])) { // If we don't match the current subdomain, then @@ -1395,6 +1394,22 @@ protected function create(string $verb, string $from, $to, ?array $options = nul } } + /** + * Compares the hostname passed in against the current hostname + * on this page request. + * + * @param string $hostname Hostname in route options + */ + private function checkHostname($hostname): bool + { + // CLI calls can't be on hostname. + if (! isset($this->httpHost)) { + return false; + } + + return strtolower($this->httpHost) === strtolower($hostname); + } + private function processArrayCallableSyntax(string $from, array $to): string { // [classname, method] From fb2f80967542e651a42d638afd4a594fe464fe8b Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 08:53:09 +0900 Subject: [PATCH 3014/8282] docs: change "Route" to "Route path" and add description The term "route" is ambiguous. --- user_guide_src/source/general/urls.rst | 30 +++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index 965328ce817c..4f951f866938 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -29,12 +29,15 @@ When you have the Base URL **https://www.example.com/** and imagine the followin We use the following terms: -======== ============================ -Base URL **https://www.example.com/** -URI path /blog/news/2022/10 -Route /blog/news/2022/10 -Query page=2 -======== ============================ +========== ============================ ========================================= +Term Example Description +========== ============================ ========================================= +Base URL **https://www.example.com/** Base URL is often denoted as **baseURL**. +URI path /blog/news/2022/10 +Route path blog/news/2022/10 The URI path relative to the Base URL. + It is also called as **URI string**. +Query page=2 +========== ============================ ========================================= Base URL contains Sub folders ----------------------------- @@ -45,12 +48,15 @@ When you have the Base URL **https://www.example.com/ci-blog/** and imagine the We use the following terms: -======== ==================================== -Base URL **https://www.example.com/ci-blog/** -URI path /ci-blog/blog/news/2022/10 -Route /blog/news/2022/10 -Query page=2 -======== ==================================== +========== ==================================== ========================================= +Term Example Description +========== ==================================== ========================================= +Base URL **https://www.example.com/ci-blog/** Base URL is often denoted as **baseURL**. +URI path /ci-blog/blog/news/2022/10 +Route path blog/news/2022/10 The URI path relative to the Base URL. + It is also called as **URI string**. +Query page=2 +========== ==================================== ========================================= .. _urls-remove-index-php: From 24d7b7f3a8c6ffc3a83ce810cfecc460aa5e8f16 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 09:05:24 +0900 Subject: [PATCH 3015/8282] docs: fix route path example route_to() returns a path with leading `/`. --- user_guide_src/source/general/urls.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst index 4f951f866938..69c3e4869f55 100644 --- a/user_guide_src/source/general/urls.rst +++ b/user_guide_src/source/general/urls.rst @@ -34,7 +34,7 @@ Term Example Description ========== ============================ ========================================= Base URL **https://www.example.com/** Base URL is often denoted as **baseURL**. URI path /blog/news/2022/10 -Route path blog/news/2022/10 The URI path relative to the Base URL. +Route path /blog/news/2022/10 The URI path relative to the Base URL. It is also called as **URI string**. Query page=2 ========== ============================ ========================================= @@ -53,7 +53,7 @@ Term Example Description ========== ==================================== ========================================= Base URL **https://www.example.com/ci-blog/** Base URL is often denoted as **baseURL**. URI path /ci-blog/blog/news/2022/10 -Route path blog/news/2022/10 The URI path relative to the Base URL. +Route path /blog/news/2022/10 The URI path relative to the Base URL. It is also called as **URI string**. Query page=2 ========== ==================================== ========================================= From 6b93671cab10bfc44395c60b03d0bd5cf32d06ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 09:08:52 +0900 Subject: [PATCH 3016/8282] docs: update route_to() explanation --- user_guide_src/source/general/common_functions.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index b63ee020d380..d05bff866598 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -369,12 +369,12 @@ Miscellaneous Functions :param string $method: Route name or Controller::method :param int|string ...$params: One or more parameters to be passed to the route. The last parameter allows you to set the locale. - :returns: a route (URI path) + :returns: a route path (URI path relative to baseURL) :rtype: string .. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**. - .. important:: ``route_to()`` returns a *route*, not a full URI path for your site. + .. important:: ``route_to()`` returns a *route* path, not a full URI path for your site. If your **baseURL** contains sub folders, the return value is not the same as the URI to link. In that case, just use :php:func:`url_to()` instead. See also :ref:`urls-url-structure`. From fc05c01472f7b297b6315f9abaf0a1f5e2ac4991 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 10:33:44 +0900 Subject: [PATCH 3017/8282] docs: fix db group name in sample code It is a property of the Config class. It is not likely PascalCase. --- user_guide_src/source/concepts/factories/004.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories/004.php b/user_guide_src/source/concepts/factories/004.php index 9f6360b8ff5c..dc7dda75f61a 100644 --- a/user_guide_src/source/concepts/factories/004.php +++ b/user_guide_src/source/concepts/factories/004.php @@ -1,4 +1,4 @@ Date: Thu, 26 Jan 2023 10:46:52 +0900 Subject: [PATCH 3018/8282] docs: add explanation --- user_guide_src/source/concepts/factories.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index dff3a92e017b..a254525da052 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -15,6 +15,11 @@ What are Factories? Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code concise yet optimal, without having to pass around object instances between classes. +Factories are similar to CodeIgniter 3's ``$this->load`` in the following points: + +- Load a class +- Share the loaded class instance + At its simplest, Factories provide a common way to create a class instance and access it from anywhere. This is a great way to reuse object states and reduce memory load from keeping From c02a013fddae55e9f89f27685f9f3bfc93f6abce Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 10:47:23 +0900 Subject: [PATCH 3019/8282] docs: improve explanation --- user_guide_src/source/concepts/factories.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index a254525da052..dca07a43707d 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -50,7 +50,7 @@ Take a look at **Models** as an example. You can access the Factory specific to by using the magic static method of the Factories class, ``Factories::models()``. By default, Factories first searches in the ``App`` namespace for the path corresponding to the magic static method name. -``Factories::models()`` searches the path **Models/**. +``Factories::models()`` searches the **app/Models** directory. In the following code, if you have ``App\Models\UserModel``, the instance will be returned: From 804d75e075d69ddf68c06cf21e5c8b8e81ec3909 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 10:48:01 +0900 Subject: [PATCH 3020/8282] docs: fix variable name in sample code --- user_guide_src/source/concepts/factories/010.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories/010.php b/user_guide_src/source/concepts/factories/010.php index 20df61e3b397..90f5f26ef524 100644 --- a/user_guide_src/source/concepts/factories/010.php +++ b/user_guide_src/source/concepts/factories/010.php @@ -1,3 +1,3 @@ false]); +$users = Factories::models('Blog\Models\UserModel', ['preferApp' => false]); From 7655b8998025304745fa2d6658fe10b3bb5aada5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 10:48:38 +0900 Subject: [PATCH 3021/8282] docs: imporve sample code --- user_guide_src/source/concepts/factories.rst | 2 ++ user_guide_src/source/concepts/factories/003.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index dca07a43707d..5111e3c568a2 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -59,6 +59,7 @@ In the following code, if you have ``App\Models\UserModel``, the instance will b Or you could also request a specific class: .. literalinclude:: factories/002.php + :lines: 2- If you have only ``Blog\Models\UserModel``, the instance will be returned. But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, @@ -67,6 +68,7 @@ the instance of ``App\Models\UserModel`` will be returned. If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``: .. literalinclude:: factories/010.php + :lines: 2- See :ref:`factories-options` for the details. diff --git a/user_guide_src/source/concepts/factories/003.php b/user_guide_src/source/concepts/factories/003.php index 44d3b06c55f6..f062aeb33f20 100644 --- a/user_guide_src/source/concepts/factories/003.php +++ b/user_guide_src/source/concepts/factories/003.php @@ -1,5 +1,7 @@ Date: Thu, 26 Jan 2023 11:47:33 +0900 Subject: [PATCH 3022/8282] docs: add about ucfirst() --- user_guide_src/source/concepts/factories.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 5111e3c568a2..941df1a42702 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -126,8 +126,8 @@ Key Type Description ========== ============== ============================================================ =================================================== component string or null The name of the component (if different than the static ``null`` (defaults to the component name) method). This can be used to alias one component to another. -path string or null The relative path within the namespace/folder to look for ``null`` (defaults to the component name) - classes. +path string or null The relative path within the namespace/folder to look for ``null`` (defaults to the component name, + classes. but makes the first character uppercase) instanceOf string or null A required class name to match on the returned instance. ``null`` (no filtering) getShared boolean Whether to return a shared instance of the class or load a ``true`` fresh one. From 4a29526b4c7acbfdc3244b9b02cef38459cd4fbe Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 11:48:27 +0900 Subject: [PATCH 3023/8282] docs: align comments --- user_guide_src/source/concepts/factories/007.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/factories/007.php b/user_guide_src/source/concepts/factories/007.php index 4a3f894c7286..2a7def236420 100644 --- a/user_guide_src/source/concepts/factories/007.php +++ b/user_guide_src/source/concepts/factories/007.php @@ -1,4 +1,4 @@ true]); // Default; will always be the same instance +$users = Factories::models('UserModel', ['getShared' => true]); // Default; will always be the same instance $other = Factories::models('UserModel', ['getShared' => false]); // Will always create a new instance From d15405269def84e849b47e5479e078e10732deb5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 11:50:07 +0900 Subject: [PATCH 3024/8282] docs: add another example --- user_guide_src/source/concepts/factories.rst | 19 +++++++++++++++++++ .../source/concepts/factories/011.php | 12 ++++++++++++ .../source/concepts/factories/012.php | 5 +++++ 3 files changed, 36 insertions(+) create mode 100644 user_guide_src/source/concepts/factories/011.php create mode 100644 user_guide_src/source/concepts/factories/012.php diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 941df1a42702..6a5743b5404f 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -150,6 +150,9 @@ Configurations To set default component options, create a new Config files at **app/Config/Factory.php** that supplies options as an array property that matches the name of the component. +Example: Filters Factories +-------------------------- + For example, if you want to create **Filters** by Factories, the component name wll be ``filters``. And if you want to ensure that each filter is an instance of a class which implements CodeIgniter's ``FilterInterface``, your **app/Config/Factory.php** file might look like this: @@ -162,6 +165,22 @@ and the returned instance will surely be a CodeIgniter's filter. This would prevent conflict of an third-party module which happened to have an unrelated ``Filters`` path in its namespace. +Example: Library Factories +-------------------------- + +If you want to load your library classes in the **app/Libraries** directory with +``Factories::library('SomeLib')``, the path `Libraries` is different from the +default path `Library`. + +In this case, your **app/Config/Factory.php** file will look like this: + +.. literalinclude:: factories/011.php + +Now you can load your libraries with the ``Factories::library()`` method: + +.. literalinclude:: factories/012.php + :lines: 2- + setOptions Method ================= diff --git a/user_guide_src/source/concepts/factories/011.php b/user_guide_src/source/concepts/factories/011.php new file mode 100644 index 000000000000..6e6ce0997884 --- /dev/null +++ b/user_guide_src/source/concepts/factories/011.php @@ -0,0 +1,12 @@ + 'Libraries', + ]; +} diff --git a/user_guide_src/source/concepts/factories/012.php b/user_guide_src/source/concepts/factories/012.php new file mode 100644 index 000000000000..c096ce3b619c --- /dev/null +++ b/user_guide_src/source/concepts/factories/012.php @@ -0,0 +1,5 @@ + Date: Thu, 26 Jan 2023 12:50:44 +0900 Subject: [PATCH 3025/8282] docs: add explanation for component --- user_guide_src/source/concepts/factories.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 6a5743b5404f..8b868b78b434 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -49,6 +49,8 @@ Example Take a look at **Models** as an example. You can access the Factory specific to Models by using the magic static method of the Factories class, ``Factories::models()``. +The static method name is called *component*. + By default, Factories first searches in the ``App`` namespace for the path corresponding to the magic static method name. ``Factories::models()`` searches the **app/Models** directory. From 4ff63e76dbad80f99026ff3051eebf5798e9d0c2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:04:41 +0900 Subject: [PATCH 3026/8282] docs: fix :returns: --- user_guide_src/source/general/common_functions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index b63ee020d380..ed8d41885e19 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -104,7 +104,7 @@ Service Accessors :param string $name: The model classname. :param boolean $getShared: Whether to return a shared instance. :param ConnectionInterface|null $conn: The database connection. - :returns: More simple way of getting model instances + :returns: The model instances :rtype: object See also the :ref:`Using CodeIgniter's Model `. From db475049644eed3b3c7a43e5327f71c595d84f27 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:05:35 +0900 Subject: [PATCH 3027/8282] docs: add explanation and links --- user_guide_src/source/general/common_functions.rst | 5 +++++ user_guide_src/source/models/model.rst | 3 +++ 2 files changed, 8 insertions(+) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index ed8d41885e19..4a4f9744e800 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -107,6 +107,11 @@ Service Accessors :returns: The model instances :rtype: object + More simple way of getting model instances. + + The ``model()`` uses ``Factories::models()`` internally. + See :ref:`factories-example` for details on the first parameter ``$name``. + See also the :ref:`Using CodeIgniter's Model `. .. php:function:: old($key[, $default = null,[, $escape = 'html']]) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index dbdbd214f398..a3782c7205ba 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -28,6 +28,9 @@ You can access models within your classes by creating a new instance or using th .. literalinclude:: model/001.php +The ``model()`` uses ``Factories::models()`` internally. +See :ref:`factories-example` for details on the first parameter. + CodeIgniter's Model ******************* From ca40054bc8875128fc111b9524e8c75d80b8d65c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:06:21 +0900 Subject: [PATCH 3028/8282] docs: change folder decoration --- user_guide_src/source/models/model.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index a3782c7205ba..726c26dac728 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -21,7 +21,7 @@ updating records, deleting records, and more. Accessing Models **************** -Models are typically stored in the ``app/Models`` directory. They should have a namespace that matches their +Models are typically stored in the **app/Models** directory. They should have a namespace that matches their location within the directory, like ``namespace App\Models``. You can access models within your classes by creating a new instance or using the :php:func:`model()` helper function. From 921dbbe37ee5125668001a1eca6146eae575269f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:08:36 +0900 Subject: [PATCH 3029/8282] docs: add other samle code --- user_guide_src/source/models/model/001.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php index 22f30bd5e5ee..d8ef48641ea6 100644 --- a/user_guide_src/source/models/model/001.php +++ b/user_guide_src/source/models/model/001.php @@ -3,11 +3,15 @@ // Create a new class manually. $userModel = new \App\Models\UserModel(); -// Create a new class with the model() function. -$userModel = model('App\Models\UserModel', false); - // Create a shared instance of the model. +$userModel = model('UserModel'); +// or $userModel = model('App\Models\UserModel'); +// or +$userModel = model(App\Models\UserModel::class); + +// Create a new class with the model() function. +$userModel = model('UserModel', false); // Create shared instance with a supplied database connection. // When no namespace is given, it will search through all namespaces From bfffe3d4f526c571ded285cf2fddee9fb926a89a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:09:39 +0900 Subject: [PATCH 3030/8282] docs: remove incorrect comment When a FQCN is given, it may search through all namespaces. And the App namespace is prefered by default. --- user_guide_src/source/models/model/001.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php index d8ef48641ea6..90cdb17d98ea 100644 --- a/user_guide_src/source/models/model/001.php +++ b/user_guide_src/source/models/model/001.php @@ -14,7 +14,5 @@ $userModel = model('UserModel', false); // Create shared instance with a supplied database connection. -// When no namespace is given, it will search through all namespaces -// the system knows about and attempts to locate the UserModel class. $db = db_connect('custom'); $userModel = model('UserModel', true, $db); From 661c070266f39e938ef197d65af8301e13824a95 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 13:57:16 +0900 Subject: [PATCH 3031/8282] docs: remove out-of-dated comment --- app/Config/App.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/Config/App.php b/app/Config/App.php index 0a23462b612e..f598e324152a 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -12,15 +12,10 @@ class App extends BaseConfig * Base Site URL * -------------------------------------------------------------------------- * - * URL to your CodeIgniter root. Typically this will be your base URL, + * URL to your CodeIgniter root. Typically, this will be your base URL, * WITH a trailing slash: * * http://example.com/ - * - * If this is not set then CodeIgniter will try guess the protocol, domain - * and path to your installation. However, you should always configure this - * explicitly and never rely on auto-guessing, especially in production - * environments. */ public string $baseURL = 'http://localhost:8080/'; From 439872a5428194276dd37acbe1ec2255f762bc02 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 15:41:23 +0900 Subject: [PATCH 3032/8282] docs: add about "defined('BASEPATH') OR exit('No direct script access allowed')" --- user_guide_src/source/installation/upgrade_4xx.rst | 3 +++ user_guide_src/source/installation/upgrade_controllers.rst | 1 + user_guide_src/source/installation/upgrade_migrations.rst | 2 +- user_guide_src/source/installation/upgrade_views.rst | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 86ad86664590..c36cb47b8d62 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -49,6 +49,9 @@ Application Structure - The **application** folder is renamed as **app** and the framework still has **system** folders, with the same interpretation as before. - The framework now provides for a **public** folder, intended as the document root for your app. +- The ``defined('BASEPATH') OR exit('No direct script access allowed');`` line is not necessary + because files outside the **public** folder are not accessible in the standard configuration. + And CI4 no longer defines the constant ``BASEPATH``, so remove the line in all files. - There is also a **writable** folder, to hold cache data, logs, and session data. - The **app** folder looks very similar to **application** for CI3, with some name changes, and some subfolders moved to the **writable** folder. diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst index ca5555de85bb..cd5f17fd3d22 100644 --- a/user_guide_src/source/installation/upgrade_controllers.rst +++ b/user_guide_src/source/installation/upgrade_controllers.rst @@ -27,6 +27,7 @@ Upgrade Guide 1. First, move all controller files to the folder **app/Controllers**. 2. Add this line just after the opening php tag: ``namespace App\Controllers;`` 3. Replace ``extends CI_Controller`` with ``extends BaseController``. +4. Remove the line ``defined('BASEPATH') OR exit('No direct script access allowed');`` if it exists. | If you use sub-directories in your controller structure, you have to change the namespace according to that. | For example, you have a version 3 controller located in **application/controllers/users/auth/Register.php**, diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst index 31eabc0766e1..791cb81a3314 100644 --- a/user_guide_src/source/installation/upgrade_migrations.rst +++ b/user_guide_src/source/installation/upgrade_migrations.rst @@ -26,7 +26,7 @@ Upgrade Guide 1. If your v3 project uses sequential migration names you have to change those to timestamp names. 2. You have to move all migration files to the new folder **app/Database/Migrations**. -3. Remove the following line ``defined('BASEPATH') OR exit('No direct script access allowed');``. +3. Remove the line ``defined('BASEPATH') OR exit('No direct script access allowed');`` if it exists. 4. Add this line just after the opening php tag: ``namespace App\Database\Migrations;``. 5. Below the ``namespace App\Database\Migrations;`` line add this line: ``use CodeIgniter\Database\Migration;`` 6. Replace ``extends CI_Migration`` with ``extends Migration``. diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst index 3e56735e3102..09ffa427d33c 100644 --- a/user_guide_src/source/installation/upgrade_views.rst +++ b/user_guide_src/source/installation/upgrade_views.rst @@ -28,6 +28,7 @@ Upgrade Guide - from ``$this->load->view('directory_name/file_name')`` to ``return view('directory_name/file_name');`` - from ``$content = $this->load->view('file', $data, TRUE);`` to ``$content = view('file', $data);`` 3. (optional) You can change the echo syntax in views from ```` to ```` +4. Remove the line ``defined('BASEPATH') OR exit('No direct script access allowed');`` if it exists. Code Example ============ From 7d08abd56840188d324ad59359589295d38b63fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 15:42:11 +0900 Subject: [PATCH 3033/8282] docs: replace title Event with Hooks This doc is for CI3 users. --- user_guide_src/source/installation/upgrade_4xx.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index c36cb47b8d62..3b8d7a5be348 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -135,8 +135,8 @@ Helpers - `redirect() Documentation CodeIgniter 3.X `_ - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_ -Events -====== +Hooks +===== - `Hooks `_ have been replaced by :doc:`../extending/events`. From 5ad5b58dbc967b2575c1e0d365a441883b5b222f Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 26 Jan 2023 23:39:52 +0700 Subject: [PATCH 3034/8282] docs: fix wrong header memcachedhandler in session --- user_guide_src/source/libraries/sessions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index d7b68b36895f..ff8e80303afd 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -671,7 +671,7 @@ deleted after Y seconds have passed (but not necessarily that it won't expire earlier than that time). This happens very rarely, but should be considered as it may result in loss of sessions. -Configure RedisHandler +Configure MemcachedHandler ---------------------- The ``$savePath`` format is fairly straightforward here, From d27c07e0cd22260ad2c642a389ce3bedfc8160b3 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 26 Jan 2023 23:47:48 +0700 Subject: [PATCH 3035/8282] docs: fix underline to short after header --- user_guide_src/source/libraries/sessions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index ff8e80303afd..a7a63c1b48df 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -672,7 +672,7 @@ expire earlier than that time). This happens very rarely, but should be considered as it may result in loss of sessions. Configure MemcachedHandler ----------------------- +-------------------------- The ``$savePath`` format is fairly straightforward here, being just a ``host:port`` pair: From 3df19deb6ed0779d8de6b6de02b8c023fb0317bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 09:35:29 +0900 Subject: [PATCH 3036/8282] docs: fix command sample with non-existent command --- user_guide_src/source/cli/spark_commands.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/cli/spark_commands.rst b/user_guide_src/source/cli/spark_commands.rst index e336623ec571..b7d51576ae2a 100644 --- a/user_guide_src/source/cli/spark_commands.rst +++ b/user_guide_src/source/cli/spark_commands.rst @@ -33,8 +33,9 @@ You may always pass ``--no-header`` to suppress the header output, helpful for p For all of the commands CodeIgniter provides, if you do not provide the required arguments, you will be prompted for the information it needs to run correctly:: - > php spark migrate:version - > Version? + > php spark make::controller + + Controller class name : Calling Commands ================ From 1ac62bc4cf1b8c8a1a7ed2e08de22f72710ae65e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 09:37:48 +0900 Subject: [PATCH 3037/8282] docs: add sub sections --- user_guide_src/source/cli/spark_commands.rst | 29 ++++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/cli/spark_commands.rst b/user_guide_src/source/cli/spark_commands.rst index b7d51576ae2a..06dd096145bc 100644 --- a/user_guide_src/source/cli/spark_commands.rst +++ b/user_guide_src/source/cli/spark_commands.rst @@ -12,13 +12,18 @@ CodeIgniter ships with the official command **spark** and built-in commands. Running Commands **************** -The commands are run from the command line, in the root directory. -A custom script, **spark** has been provided that is used to run any of the CLI commands:: +Running via CLI +=============== + +The commands are run from the command line, in the project root directory. +The command file **spark** has been provided that is used to run any of the CLI commands:: > php spark When called without specifying a command, a simple help page is displayed that also provides a list of -available commands. You should pass the name of the command as the first argument to run that command:: +available commands. + +You should pass the name of the command as the first argument to run that command:: > php spark migrate @@ -55,9 +60,21 @@ so that you can choose to display it or not. Using Help Command ****************** -You can get help about any CLI command using the help command as follows:: +spark help +========== + +You can get help about any CLI command using the ``help`` command as follows:: > php spark help db:seed -Use the **list** command to get a list of available commands and their descriptions, sorted by categories. -You may also use ``spark list --simple`` to get a raw list of all available commands, sorted alphabetically. + +spark list +========== + +Use the ``list`` command to get a list of available commands and their descriptions, sorted by categories:: + + > php spark list + +You may also use the ``--simple`` option to get a raw list of all available commands, sorted alphabetically:: + + > php spark list --simple From 22c8f210fcf5eac9af56a231387e5ffe8019d39b Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 09:38:22 +0900 Subject: [PATCH 3038/8282] docs: add `--help` usage --- user_guide_src/source/cli/spark_commands.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/cli/spark_commands.rst b/user_guide_src/source/cli/spark_commands.rst index 06dd096145bc..8ac2ecba1d6a 100644 --- a/user_guide_src/source/cli/spark_commands.rst +++ b/user_guide_src/source/cli/spark_commands.rst @@ -67,6 +67,9 @@ You can get help about any CLI command using the ``help`` command as follows:: > php spark help db:seed +Since v4.3.0, you can also use the ``--help`` option instead of the ``help`` command:: + + > php spark db:seed --help spark list ========== From abe19f0fb7d38032219308e587d2eca91fd727b6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 12:50:40 +0900 Subject: [PATCH 3039/8282] docs: improve comments --- system/Router/AutoRouterImproved.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php index 39b264ecf780..365b91c96ea6 100644 --- a/system/Router/AutoRouterImproved.php +++ b/system/Router/AutoRouterImproved.php @@ -168,13 +168,13 @@ public function getRoute(string $uri): array '\\' ); - // Ensure routes registered via $routes->cli() are not accessible via web. + // Ensure the controller is not defined in routes. $this->protectDefinedRoutes(); - // Check _remap() + // Ensure the controller does not have _remap() method. $this->checkRemap(); - // Check parameters + // Check parameter count try { $this->checkParameters($uri); } catch (ReflectionException $e) { From a82b4dc0dbab279db9dd2922c304a524a77a409c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 14:07:24 +0900 Subject: [PATCH 3040/8282] feat: fallback to default method --- system/Router/AutoRouterImproved.php | 35 +++++++++++++++---- .../Exceptions/MethodNotFoundException.php | 21 +++++++++++ .../system/Router/AutoRouterImprovedTest.php | 13 +++++++ tests/system/Router/Controllers/Index.php | 2 +- 4 files changed, 64 insertions(+), 7 deletions(-) create mode 100644 system/Router/Exceptions/MethodNotFoundException.php diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php index 365b91c96ea6..87409e78f107 100644 --- a/system/Router/AutoRouterImproved.php +++ b/system/Router/AutoRouterImproved.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Router; use CodeIgniter\Exceptions\PageNotFoundException; +use CodeIgniter\Router\Exceptions\MethodNotFoundException; use ReflectionClass; use ReflectionException; @@ -177,8 +178,21 @@ public function getRoute(string $uri): array // Check parameter count try { $this->checkParameters($uri); - } catch (ReflectionException $e) { - throw PageNotFoundException::forControllerNotFound($this->controller, $this->method); + } catch (MethodNotFoundException $e) { + // Fallback to the default method + if (! isset($methodSegment)) { + throw PageNotFoundException::forControllerNotFound($this->controller, $this->method); + } + + array_unshift($this->params, $methodSegment); + $method = $this->method; + $this->method = $this->defaultMethod; + + try { + $this->checkParameters($uri); + } catch (MethodNotFoundException $e) { + throw PageNotFoundException::forControllerNotFound($this->controller, $method); + } } return [$this->directory, $this->controller, $this->method, $this->params]; @@ -201,12 +215,21 @@ private function protectDefinedRoutes(): void private function checkParameters(string $uri): void { - $refClass = new ReflectionClass($this->controller); - $refMethod = $refClass->getMethod($this->method); - $refParams = $refMethod->getParameters(); + try { + $refClass = new ReflectionClass($this->controller); + } catch (ReflectionException $e) { + throw PageNotFoundException::forControllerNotFound($this->controller, $this->method); + } + + try { + $refMethod = $refClass->getMethod($this->method); + $refParams = $refMethod->getParameters(); + } catch (ReflectionException $e) { + throw new MethodNotFoundException(); + } if (! $refMethod->isPublic()) { - throw PageNotFoundException::forMethodNotFound($this->method); + throw new MethodNotFoundException(); } if (count($refParams) < count($this->params)) { diff --git a/system/Router/Exceptions/MethodNotFoundException.php b/system/Router/Exceptions/MethodNotFoundException.php new file mode 100644 index 000000000000..d9ad45a5fa3d --- /dev/null +++ b/system/Router/Exceptions/MethodNotFoundException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Router\Exceptions; + +use RuntimeException; + +/** + * @internal + */ +final class MethodNotFoundException extends RuntimeException +{ +} diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php index ec94676be121..ab1fa7db2188 100644 --- a/tests/system/Router/AutoRouterImprovedTest.php +++ b/tests/system/Router/AutoRouterImprovedTest.php @@ -199,6 +199,19 @@ public function testAutoRouteFindsDefaultDashFolder() $this->assertSame([], $params); } + public function testAutoRouteFallbackToDefaultMethod() + { + $router = $this->createNewAutoRouter(); + + [$directory, $controller, $method, $params] + = $router->getRoute('index/15'); + + $this->assertNull($directory); + $this->assertSame('\\' . Index::class, $controller); + $this->assertSame('getIndex', $method); + $this->assertSame(['15'], $params); + } + public function testAutoRouteRejectsSingleDot() { $this->expectException(PageNotFoundException::class); diff --git a/tests/system/Router/Controllers/Index.php b/tests/system/Router/Controllers/Index.php index bfc3539e0b1f..2ad043942923 100644 --- a/tests/system/Router/Controllers/Index.php +++ b/tests/system/Router/Controllers/Index.php @@ -15,7 +15,7 @@ class Index extends Controller { - public function getIndex() + public function getIndex($p1 = '') { } From 63677bbb2bf106a50efc31cc5712271db53b677d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 14:08:29 +0900 Subject: [PATCH 3041/8282] feat: show parameters of default method --- .../ControllerMethodReader.php | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php index 3f373c433f1b..aaa0986df345 100644 --- a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php +++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php @@ -76,18 +76,37 @@ public function read(string $class, string $defaultController = 'Home', string $ ); if ($routeWithoutController !== []) { + // Route for the default controller. $output = [...$output, ...$routeWithoutController]; continue; } + $params = []; + $routeParams = ''; + $refParams = $method->getParameters(); + + foreach ($refParams as $param) { + $required = true; + if ($param->isOptional()) { + $required = false; + + $routeParams .= '[/..]'; + } else { + $routeParams .= '/..'; + } + + // [variable_name => required?] + $params[$param->getName()] = $required; + } + // Route for the default method. $output[] = [ 'method' => $httpVerb, 'route' => $classInUri, - 'route_params' => '', + 'route_params' => $routeParams, 'handler' => '\\' . $classname . '::' . $methodName, - 'params' => [], + 'params' => $params, ]; continue; From d93340ea908d868c660bc467dcf84d65e83e8cb3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 22 Jan 2023 14:14:32 +0900 Subject: [PATCH 3042/8282] test: update tests --- tests/_support/Controllers/Newautorouting.php | 2 +- tests/system/Commands/RoutesTest.php | 2 +- .../Routes/AutoRouterImproved/AutoRouteCollectorTest.php | 4 ++-- .../AutoRouterImproved/ControllerMethodReaderTest.php | 6 ++++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/_support/Controllers/Newautorouting.php b/tests/_support/Controllers/Newautorouting.php index f3c8479f3685..2c31547ed2de 100644 --- a/tests/_support/Controllers/Newautorouting.php +++ b/tests/_support/Controllers/Newautorouting.php @@ -15,7 +15,7 @@ class Newautorouting extends Controller { - public function getIndex() + public function getIndex(string $m = '') { return 'Hello'; } diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 6d506274145d..8567dc6bc70a 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -129,7 +129,7 @@ public function testRoutesCommandAutoRouteImproved() | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | | CLI | testing | testing-index | \App\Controllers\TestController::index | | | - | GET(auto) | newautorouting | | \Tests\Support\Controllers\Newautorouting::getIndex | | toolbar | + | GET(auto) | newautorouting[/..] | | \Tests\Support\Controllers\Newautorouting::getIndex | | toolbar | | POST(auto) | newautorouting/save/../..[/..] | | \Tests\Support\Controllers\Newautorouting::postSave | | toolbar | +------------+--------------------------------+---------------+-----------------------------------------------------+----------------+---------------+ EOL; diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index 4b99de7dbb07..72ebc1cf336a 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -62,7 +62,7 @@ public function testGetFilterMatches() $expected = [ 0 => [ 'GET(auto)', - 'newautorouting', + 'newautorouting[/..]', '', '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', '', @@ -90,7 +90,7 @@ public function testGetFilterDoesNotMatch() $expected = [ 0 => [ 'GET(auto)', - 'newautorouting', + 'newautorouting[/..]', '', '\\Tests\\Support\\Controllers\\Newautorouting::getIndex', '', diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php index 6a77f0173ab5..6dd81f4722f2 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php @@ -43,9 +43,11 @@ public function testRead() 0 => [ 'method' => 'get', 'route' => 'newautorouting', - 'route_params' => '', + 'route_params' => '[/..]', 'handler' => '\Tests\Support\Controllers\Newautorouting::getIndex', - 'params' => [], + 'params' => [ + 'm' => false, + ], ], [ 'method' => 'post', From 9232e88fab9485a218108a417ae18450f61b8631 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 10:07:22 +0900 Subject: [PATCH 3043/8282] docs: add note for Auto Routing (Improved) in _remap() --- user_guide_src/source/incoming/controllers.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index cd7023653b55..15bee929c214 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -494,6 +494,8 @@ CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Rout Remapping Method Calls ********************** +.. note:: **Auto Routing (Improved)** does not support this feature intentionally. + As noted above, the second segment of the URI typically determines which method in the controller gets called. CodeIgniter permits you to override this behavior through the use of the ``_remap()`` method: From 3548566979130c4db8f22f6f981ff3b086090393 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 10:20:05 +0900 Subject: [PATCH 3044/8282] docs: move sentence Without this change, the meaning of the sample code is not clear. --- user_guide_src/source/incoming/controllers.rst | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 15bee929c214..94e750e5049a 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -221,13 +221,12 @@ class so that it can inherit all its methods. folders/files in **app/Controllers/**, when a match wasn't found against defined routes. That's why your folders/files MUST start with a capital letter and the rest MUST be lowercase. + If you want another naming convention you need to manually define it using the + :ref:`Defined Route Routing `. Here is an example based on PSR-4 Autoloader: .. literalinclude:: controllers/012.php - If you want another naming convention you need to manually define it using the - :ref:`Defined Route Routing `. - Methods ======= @@ -390,13 +389,12 @@ class so that it can inherit all its methods. folders/files in **app/Controllers/**, when a match wasn't found against defined routes. That's why your folders/files MUST start with a capital letter and the rest MUST be lowercase. + If you want another naming convention you need to manually define it using the + :ref:`Defined Route Routing `. Here is an example based on PSR-4 Autoloader: .. literalinclude:: controllers/012.php - If you want another naming convention you need to manually define it using the - :ref:`Defined Route Routing `. - Methods ======= From 4ddb1ff5b2f883c3fe3717fe45fefc26c957a649 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 11:04:35 +0900 Subject: [PATCH 3045/8282] docs: add section titles --- user_guide_src/source/incoming/controllers.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 94e750e5049a..89d12eff7109 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -230,11 +230,18 @@ class so that it can inherit all its methods. Methods ======= + +Default Method +-------------- + In the above example, the method name is ``getIndex()``. -The method (HTTP verb + ``Index()``) is loaded if the **second segment** of the URI is empty. +The method (HTTP verb + ``Index()``) is called the **default method**, and is loaded if the **second segment** of the URI is empty. -**The second segment of the URI determines which method in the -controller gets called.** +Normal Methods +-------------- + +The second segment of the URI determines which method in the +controller gets called. Let's try it. Add a new method to your controller: From eeb8f35a4b9f5c3b0d3161b8fe91fd5c53b7a363 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 11:05:10 +0900 Subject: [PATCH 3046/8282] docs: add method visibility --- user_guide_src/source/incoming/controllers.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 89d12eff7109..7f098f7f1a6b 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -230,6 +230,13 @@ class so that it can inherit all its methods. Methods ======= +Method Visibility +----------------- + +When you define a method that is executable via HTTP request, the method must be +declared as ``public``. + +.. warning:: For security reasons be sure to declare any new utility methods as ``protected`` or ``private``. Default Method -------------- @@ -253,8 +260,6 @@ Now load the following URL to see the ``getComment()`` method:: You should see your new message. -.. warning:: For security reasons be sure to declare any new utility methods as ``protected`` or ``private``. - Passing URI Segments to Your Methods ==================================== From 82c02fb72d9762c1bfb59d7e2b2207440200776c Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 11:05:37 +0900 Subject: [PATCH 3047/8282] docs: add note for parameter count check --- user_guide_src/source/incoming/controllers.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index 7f098f7f1a6b..232e7c169a42 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -274,6 +274,10 @@ Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``): .. literalinclude:: controllers/022.php +.. note:: If there are more parameters in the URI than the method parameters, + Auto Routing (Improved) does not execute the method, and it results in 404 + Not Found. + Defining a Default Controller ============================= From 640094669a21c775169b44f45bb8a54eefb225c8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 27 Jan 2023 11:21:33 +0900 Subject: [PATCH 3048/8282] docs: add docs --- user_guide_src/source/changelogs/v4.4.0.rst | 5 +++- .../source/incoming/controllers.rst | 23 +++++++++++++++++++ .../source/incoming/controllers/024.php | 11 +++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 user_guide_src/source/incoming/controllers/024.php diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 6632a061c4d1..748829333165 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -58,8 +58,11 @@ Helpers and Functions Others ====== -- **View:** Added optional 2nd parameter ``$saveData`` on ``renderSection()`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. +- **View:** Added optional 2nd parameter ``$saveData`` on ``renderSection()`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. +- **Auto Routing (Improved)**: Now you can use URI without a method name like + ``product/15`` where ``15`` is an arbitrary number. + See :ref:`controller-default-method-fallback` for details. Message Changes *************** diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index cd7023653b55..fda8d74cd1f5 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -263,6 +263,29 @@ Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``): .. literalinclude:: controllers/022.php +.. _controller-default-method-fallback: + +Default Method Fallback +======================= + +.. versionadded:: 4.4.0 + +If the controller method corresponding to the URI segment of the method name +does not exist, and if the default method is defined, the URI segments are +passed to the default method for execution. + +.. literalinclude:: controllers/024.php + +Load the following URL:: + + example.com/index.php/product/15/edit + +The method will be passed URI segments 2 and 3 (``'15'`` and ``'edit'``): + +.. note:: If there are more parameters in the URI than the method parameters, + Auto Routing (Improved) does not execute the method, and it results in 404 + Not Found. + Defining a Default Controller ============================= diff --git a/user_guide_src/source/incoming/controllers/024.php b/user_guide_src/source/incoming/controllers/024.php new file mode 100644 index 000000000000..c3ae1a7c6a43 --- /dev/null +++ b/user_guide_src/source/incoming/controllers/024.php @@ -0,0 +1,11 @@ + Date: Fri, 27 Jan 2023 18:29:37 +0400 Subject: [PATCH 3049/8282] Update upgrade_405.rst str_to_upper() is not a built in php function. https://www.php.net/manual/en/function.strtoupper.php --- user_guide_src/source/installation/upgrade_405.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_405.rst b/user_guide_src/source/installation/upgrade_405.rst index e3c07c13a816..844e76b25200 100644 --- a/user_guide_src/source/installation/upgrade_405.rst +++ b/user_guide_src/source/installation/upgrade_405.rst @@ -39,7 +39,7 @@ Additional related deprecations from the HTTP layer: * ``Message::isJSON()``: Check the "Content-Type" header directly * ``Request[Interface]::isValidIP()``: Use the Validation class with ``valid_ip`` -* ``Request[Interface]::getMethod()``: The ``$upper`` parameter will be removed, use str_to_upper() +* ``Request[Interface]::getMethod()``: The ``$upper`` parameter will be removed, use strtoupper() * ``Request[Trait]::$ipAddress``: This property will become private * ``Request::$proxyIPs``: This property will be removed; access ``config('App')->proxyIPs`` directly * ``Request::__construct()``: The constructor will no longer take ``Config\App`` and has been made nullable to aid transition From 73d2354a00e0a3085343f7c7d79fc00be1a0ddd5 Mon Sep 17 00:00:00 2001 From: objecttothis <17935339+objecttothis@users.noreply.github.com> Date: Fri, 27 Jan 2023 18:32:43 +0400 Subject: [PATCH 3050/8282] Update upgrade_412.rst Grammatical fix. --- user_guide_src/source/installation/upgrade_412.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst index ae0ba9d6fefc..1fec935f7ec6 100644 --- a/user_guide_src/source/installation/upgrade_412.rst +++ b/user_guide_src/source/installation/upgrade_412.rst @@ -46,7 +46,7 @@ BaseConnection::query() Return Values ``BaseConnection::query()`` method in prior versions was incorrectly returning BaseResult objects even if the query failed. This method will now return ``false`` for failed queries (or throw an Exception if ``DBDebug`` is ``true``) and will return booleans for write-type queries. Review any use -of ``query()`` method and be assess whether the value might be boolean instead of Result object. +of ``query()`` method and assess whether the value might be boolean instead of Result object. For a better idea of what queries are write-type queries, check ``BaseConnection::isWriteType()`` and any DBMS-specific override ``isWriteType()`` in the relevant Connection class. From a3a6daef153ad3db48212708e2d5c532cf76634d Mon Sep 17 00:00:00 2001 From: objecttothis <17935339+objecttothis@users.noreply.github.com> Date: Fri, 27 Jan 2023 18:34:11 +0400 Subject: [PATCH 3051/8282] Update upgrade_431.rst It says Encryption.php but the fields below are all in Email.php --- user_guide_src/source/installation/upgrade_431.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_431.rst b/user_guide_src/source/installation/upgrade_431.rst index 4adce6d4af2d..ae9ae6e27e1b 100644 --- a/user_guide_src/source/installation/upgrade_431.rst +++ b/user_guide_src/source/installation/upgrade_431.rst @@ -66,7 +66,7 @@ and it is recommended that you merge the updated versions with your application: Config ------ -- app/Config/Encryption.php +- app/Config/Email.php - Set the default value ``''`` to ``$fromEmail``, ``$fromName``, ``$recipients``, ``$SMTPHost``, ``$SMTPUser`` and ``$SMTPPass`` to apply environment variable (**.env**) values. From 46a18130738d7ef6b1db56cddce5c3f039af6f75 Mon Sep 17 00:00:00 2001 From: Noritaka IZUMI Date: Sat, 28 Jan 2023 10:41:29 +0900 Subject: [PATCH 3052/8282] docs: fix typos and grammatical errors --- system/Router/RouteCollection.php | 6 +++--- system/Router/RouteCollectionInterface.php | 4 ++-- system/Router/Router.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 08741be408fc..6745b4130bc0 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -722,7 +722,7 @@ public function group(string $name, ...$params) * POST /photos/{id} update * * @param string $name The name of the resource/controller to route to. - * @param array|null $options An list of possible ways to customize the routing. + * @param array|null $options A list of possible ways to customize the routing. */ public function resource(string $name, ?array $options = null): RouteCollectionInterface { @@ -816,7 +816,7 @@ public function resource(string $name, ?array $options = null): RouteCollectionI * POST /photos/delete/{id} delete deleting the specified photo object * * @param string $name The name of the controller to route to. - * @param array|null $options An list of possible ways to customize the routing. + * @param array|null $options A list of possible ways to customize the routing. */ public function presenter(string $name, ?array $options = null): RouteCollectionInterface { @@ -1467,7 +1467,7 @@ private function checkSubdomains($subdomains): bool } /** - * Examines the HTTP_HOST to get a best match for the subdomain. It + * Examines the HTTP_HOST to get the best match for the subdomain. It * won't be perfect, but should work for our needs. * * It's especially not perfect since it's possible to register a domain diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php index 00ac88f4b7e2..a8f264a8b8fd 100644 --- a/system/Router/RouteCollectionInterface.php +++ b/system/Router/RouteCollectionInterface.php @@ -21,7 +21,7 @@ * add a number of additional methods to customize how the routes are defined. * * The RouteCollection provides the Router with the routes so that it can determine - * which controller should be ran. + * which controller should be run. */ interface RouteCollectionInterface { @@ -157,7 +157,7 @@ public function getRoutes(); public function getHTTPVerb(); /** - * Attempts to look up a route based on it's destination. + * Attempts to look up a route based on its destination. * * If a route exists: * diff --git a/system/Router/Router.php b/system/Router/Router.php index 83cb6b8244f9..137aa4e43af9 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -324,7 +324,7 @@ public function getMatchedRouteOptions() /** * Sets the value that should be used to match the index.php file. Defaults - * to index.php but this allows you to modify it in case your are using + * to index.php but this allows you to modify it in case you are using * something like mod_rewrite to remove the page. This allows you to set * it a blank. * @@ -376,7 +376,7 @@ public function getLocale() } /** - * Checks Defined Routs. + * Checks Defined Routes. * * Compares the uri string against the routes that the * RouteCollection class defined for us, attempting to find a match. @@ -495,7 +495,7 @@ protected function checkRoutes(string $uri): bool } /** - * Checks Auto Routs. + * Checks Auto Routes. * * Attempts to match a URI path against Controllers and directories * found in APPPATH/Controllers, to find a matching route. From 158e21af5a335624be4697d7ff8a4e38838d641b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 28 Jan 2023 11:25:33 +0900 Subject: [PATCH 3053/8282] fix: Autoloader may not add Composer package's namespaces --- system/Autoloader/Autoloader.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 0f1d91eb7809..f838451ce6fb 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -381,7 +381,12 @@ private function loadComposerNamespaces(ClassLoader $composer, array $composerPa ); } // This method requires Composer 2.0.14 or later. - $packageList = InstalledVersions::getAllRawData()[0]['versions']; + $allData = InstalledVersions::getAllRawData(); + $packageList = []; + + foreach ($allData as $list) { + $packageList = array_merge($packageList, $list['versions']); + } // Check config for $composerPackages. $only = $composerPackages['only'] ?? []; From 410cc759df0cfb4b24a85a014bf231cb490efa12 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Sat, 28 Jan 2023 19:47:52 +0800 Subject: [PATCH 3054/8282] docs: replace type mixed in the remaining cache class. --- system/Cache/Handlers/FileHandler.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php index 98a4ccbf78c6..b95d7f9ee28c 100644 --- a/system/Cache/Handlers/FileHandler.php +++ b/system/Cache/Handlers/FileHandler.php @@ -229,7 +229,7 @@ public function isSupported(): bool * Does the heavy lifting of actually retrieving the file and * verifying it's age. * - * @return mixed + * @return array|bool|float|int|object|string|null */ protected function getItem(string $filename) { @@ -366,8 +366,8 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, * Options are: name, server_path, size, date, readable, writable, executable, fileperms * Returns FALSE if the file cannot be found. * - * @param string $file Path to file - * @param mixed $returnedValues Array or comma separated string of information returned + * @param string $file Path to file + * @param array|string $returnedValues Array or comma separated string of information returned * * @return array|false */ From 01d0b6ce051c268fc874a0f56482fa32da6a1e57 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 28 Jan 2023 21:21:28 +0900 Subject: [PATCH 3055/8282] fix: add try/catch ValueError from real_path() --- system/Common.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/Common.php b/system/Common.php index f73a4d4d78d8..f12092a5a3f8 100644 --- a/system/Common.php +++ b/system/Common.php @@ -90,7 +90,11 @@ function cache(?string $key = null) function clean_path(string $path): string { // Resolve relative paths - $path = realpath($path) ?: $path; + try { + $path = realpath($path) ?: $path; + } catch (ErrorException|ValueError $e) { + $path = 'error file path: ' . urlencode($path); + } switch (true) { case strpos($path, APPPATH) === 0: From b547b22efd0f7821a03dea6052b7db1faddb13e4 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 26 Jan 2023 17:06:18 +0700 Subject: [PATCH 3056/8282] fix: redis connect to protocol tls --- system/Session/Handlers/RedisHandler.php | 21 ++++++++-------- .../Handlers/Database/RedisHandlerTest.php | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php index 4492c4dbed32..12e89374876a 100644 --- a/system/Session/Handlers/RedisHandler.php +++ b/system/Session/Handlers/RedisHandler.php @@ -102,20 +102,21 @@ protected function setSavePath(): void throw SessionException::forEmptySavepath(); } - if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) { - if (! isset($matches[3])) { - $matches[3] = ''; // Just to avoid undefined index notices below + if (preg_match('#(?:(^.*)://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) { + if (! isset($matches[4])) { + $matches[4] = ''; // Just to avoid undefined index notices below } $this->savePath = [ - 'host' => $matches[1], - 'port' => empty($matches[2]) ? self::DEFAULT_PORT : $matches[2], - 'password' => preg_match('#auth=([^\s&]+)#', $matches[3], $match) ? $match[1] : null, - 'database' => preg_match('#database=(\d+)#', $matches[3], $match) ? (int) $match[1] : 0, - 'timeout' => preg_match('#timeout=(\d+\.\d+|\d+)#', $matches[3], $match) ? (float) $match[1] : 0.0, + 'protocol' => in_array($matches[1], ['tcp', 'tls'], true) ? $matches[1] : 'tcp', + 'host' => $matches[2], + 'port' => empty($matches[3]) ? self::DEFAULT_PORT : $matches[3], + 'password' => preg_match('#auth=([^\s&]+)#', $matches[4], $match) ? $match[1] : null, + 'database' => preg_match('#database=(\d+)#', $matches[4], $match) ? (int) $match[1] : 0, + 'timeout' => preg_match('#timeout=(\d+\.\d+|\d+)#', $matches[4], $match) ? (float) $match[1] : 0.0, ]; - preg_match('#prefix=([^\s&]+)#', $matches[3], $match) && $this->keyPrefix = $match[1]; + preg_match('#prefix=([^\s&]+)#', $matches[4], $match) && $this->keyPrefix = $match[1]; } else { throw SessionException::forInvalidSavePathFormat($this->savePath); } @@ -135,7 +136,7 @@ public function open($path, $name): bool $redis = new Redis(); - if (! $redis->connect($this->savePath['host'], ($this->savePath['host'][0] === '/' ? 0 : $this->savePath['port']), $this->savePath['timeout'])) { + if (! $redis->connect($this->savePath['protocol'] . '://' . $this->savePath['host'], ($this->savePath['host'][0] === '/' ? 0 : $this->savePath['port']), $this->savePath['timeout'])) { $this->logger->error('Session: Unable to connect to Redis with the configured settings.'); } elseif (isset($this->savePath['password']) && ! $redis->auth($this->savePath['password'])) { $this->logger->error('Session: Unable to authenticate to Redis instance.'); diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index 4a4cdcc45f19..c4ee0cf36834 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -54,6 +54,30 @@ protected function getInstance($options = []) return new RedisHandler(new AppConfig(), $this->userIpAddress); } + public function testSavePathTLSAuth() + { + $handler = $this->getInstance( + ['savePath' => 'tls://127.0.0.1:6379?auth=password&timeout=2.5'] + ); + + $savePath = $this->getPrivateProperty($handler, 'savePath'); + + $this->assertSame('password', $savePath['password']); + $this->assertSame(2.5, $savePath['timeout']); + } + + public function testSavePathTCPAuth() + { + $handler = $this->getInstance( + ['savePath' => 'tcp://127.0.0.1:6379?auth=password&timeout=2.5'] + ); + + $savePath = $this->getPrivateProperty($handler, 'savePath'); + + $this->assertSame('password', $savePath['password']); + $this->assertSame(2.5, $savePath['timeout']); + } + public function testSavePathTimeoutFloat() { $handler = $this->getInstance( From ff572f6f1d112c880e4996dabbedad5551f20ddb Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 26 Jan 2023 22:40:54 +0700 Subject: [PATCH 3057/8282] make default protocol property and test set savePath without protocol --- system/Session/Handlers/RedisHandler.php | 5 +++-- .../Handlers/Database/RedisHandlerTest.php | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php index 12e89374876a..f74fdc86d90a 100644 --- a/system/Session/Handlers/RedisHandler.php +++ b/system/Session/Handlers/RedisHandler.php @@ -24,7 +24,8 @@ */ class RedisHandler extends BaseHandler { - private const DEFAULT_PORT = 6379; + private const DEFAULT_PORT = 6379; + private const DEFAULT_PROTOCOL = 'tcp'; /** * phpRedis instance @@ -108,7 +109,7 @@ protected function setSavePath(): void } $this->savePath = [ - 'protocol' => in_array($matches[1], ['tcp', 'tls'], true) ? $matches[1] : 'tcp', + 'protocol' => in_array($matches[1], ['tcp', 'tls'], true) ? $matches[1] : self::DEFAULT_PROTOCOL, 'host' => $matches[2], 'port' => empty($matches[3]) ? self::DEFAULT_PORT : $matches[3], 'password' => preg_match('#auth=([^\s&]+)#', $matches[4], $match) ? $match[1] : null, diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index c4ee0cf36834..4a312d8fc0bf 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -54,28 +54,39 @@ protected function getInstance($options = []) return new RedisHandler(new AppConfig(), $this->userIpAddress); } + public function testSavePathWithoutProtocol() + { + $handler = $this->getInstance( + ['savePath' => '127.0.0.1:6379'] + ); + + $savePath = $this->getPrivateProperty($handler, 'savePath'); + + $this->assertSame('tcp', $savePath['protocol']); + } + public function testSavePathTLSAuth() { $handler = $this->getInstance( - ['savePath' => 'tls://127.0.0.1:6379?auth=password&timeout=2.5'] + ['savePath' => 'tls://127.0.0.1:6379?auth=password'] ); $savePath = $this->getPrivateProperty($handler, 'savePath'); + $this->assertSame('tls', $savePath['protocol']); $this->assertSame('password', $savePath['password']); - $this->assertSame(2.5, $savePath['timeout']); } public function testSavePathTCPAuth() { $handler = $this->getInstance( - ['savePath' => 'tcp://127.0.0.1:6379?auth=password&timeout=2.5'] + ['savePath' => 'tcp://127.0.0.1:6379?auth=password'] ); $savePath = $this->getPrivateProperty($handler, 'savePath'); + $this->assertSame('tcp', $savePath['protocol']); $this->assertSame('password', $savePath['password']); - $this->assertSame(2.5, $savePath['timeout']); } public function testSavePathTimeoutFloat() From 1e8b87c2f80f2a861c629834a1a5795bc2ccacbd Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 26 Jan 2023 23:27:12 +0700 Subject: [PATCH 3058/8282] tests: added test connect without set protocol (using default) --- .../Session/Handlers/Database/RedisHandlerTest.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index 4a312d8fc0bf..b5d67a768c47 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -117,6 +117,19 @@ public function testOpen() $this->assertTrue($handler->open($this->sessionSavePath, $this->sessionName)); } + public function testOpenWithDefaultProtocol() + { + $default = $this->sessionSavePath; + + $this->sessionSavePath = '127.0.0.1:6379'; + + $handler = $this->getInstance(); + $this->assertTrue($handler->open($this->sessionSavePath, $this->sessionName)); + + // Rollback to default + $this->sessionSavePath = $default; + } + public function testWrite() { $handler = $this->getInstance(); From 57ee387d4bb6dd4986338b79f750e68c6fef9a6c Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 28 Jan 2023 21:31:32 +0700 Subject: [PATCH 3059/8282] fix: possible regression tcp and tls in Redis --- system/Session/Handlers/RedisHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php index f74fdc86d90a..9910637663f5 100644 --- a/system/Session/Handlers/RedisHandler.php +++ b/system/Session/Handlers/RedisHandler.php @@ -103,13 +103,13 @@ protected function setSavePath(): void throw SessionException::forEmptySavepath(); } - if (preg_match('#(?:(^.*)://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) { + if (preg_match('#(?:(tcp|tls)://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) { if (! isset($matches[4])) { $matches[4] = ''; // Just to avoid undefined index notices below } $this->savePath = [ - 'protocol' => in_array($matches[1], ['tcp', 'tls'], true) ? $matches[1] : self::DEFAULT_PROTOCOL, + 'protocol' => ! empty($matches[1]) ? $matches[1] : self::DEFAULT_PROTOCOL, 'host' => $matches[2], 'port' => empty($matches[3]) ? self::DEFAULT_PORT : $matches[3], 'password' => preg_match('#auth=([^\s&]+)#', $matches[4], $match) ? $match[1] : null, From 8787e8e3285faca9cf78966e2d342a346757f3fa Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 28 Jan 2023 22:05:42 +0700 Subject: [PATCH 3060/8282] docs: note about tls protocol in RedisHandler Session --- user_guide_src/source/changelogs/v4.3.2.rst | 2 ++ user_guide_src/source/libraries/sessions.rst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index f1b8e7c5dc72..4652ee995b85 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -27,6 +27,8 @@ Deprecations Bugs Fixed ********** +* Fixed : ``Session`` Redis connect to protocol TLS + See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index a7a63c1b48df..7f316c569276 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -613,7 +613,7 @@ RedisHandler Driver .. note:: Since Redis doesn't have a locking mechanism exposed, locks for this driver are emulated by a separate value that is kept for up - to 300 seconds. + to 300 seconds. With ``v4.3.2`` or above, You can connect ``Redis`` with **TLS** protocol. Redis is a storage engine typically used for caching and popular because of its high performance, which is also probably your reason to use the From 0cff4f79d6f00648965708b2765f3656fc362628 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 10:35:05 +0900 Subject: [PATCH 3061/8282] docs: add Bugs Fixed items in changelogs/v4.3.2 --- user_guide_src/source/changelogs/v4.3.2.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index 4652ee995b85..9249f86fdb5d 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -27,7 +27,12 @@ Deprecations Bugs Fixed ********** -* Fixed : ``Session`` Redis connect to protocol TLS +- **QueryBuilder:** ``where()`` generates incorrect SQL when using ``RawSql`` +- **QueryBuilder:** ``RawSql`` passed to ``set()`` disappears without error +- **Session:** Can't connect to Redis with ``RedisHandler`` over TLS +- **Autoloader:** May not add Composer package's namespaces +- **Parser:** ``!`` does not work if delimiters are changed +- **UserGuide:** Added missing items in ChangeLog and Upgrading Guide v4.3.0 See the repo's `CHANGELOG.md `_ From 7ef79c55d6da0999093031853aaadd73b5ab33c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 10:54:31 +0900 Subject: [PATCH 3062/8282] docs: improve text decration --- user_guide_src/source/helpers/url_helper.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 7607610d64a5..4e843ead4af0 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -116,10 +116,10 @@ The following functions are available: Returns the full URL (including segments) of the page the user was previously on. - .. note:: Due to security issues of blindly trusting the HTTP_REFERER system variable, CodeIgniter will + .. note:: Due to security issues of blindly trusting the ``HTTP_REFERER`` system variable, CodeIgniter will store previously visited pages in the session if it's available. This ensures that we always use a known and trusted source. If the session hasn't been loaded, or is otherwise unavailable, - then a sanitized version of HTTP_REFERER will be used. + then a sanitized version of ``HTTP_REFERER`` will be used. .. php:function:: uri_string() @@ -151,7 +151,7 @@ The following functions are available: .. php:function:: index_page([$altConfig = null]) :param \\Config\\App $altConfig: Alternate configuration to use - :returns: 'index_page' value + :returns: The ``indexPage`` value :rtype: string Returns your site **indexPage**, as specified in your config file. @@ -180,7 +180,7 @@ The following functions are available: be a string or an array. .. note:: If you are building links that are internal to your application - do not include the base URL (`http://...`). This will be added + do not include the base URL (``http://...``). This will be added automatically from the information specified in your config file. Include only the URI segments you wish appended to the URL. @@ -304,12 +304,12 @@ The following functions are available: .. literalinclude:: url_helper/016.php - .. note:: The only URLs recognized are those that start with "www." or with "://". + .. note:: The only URLs recognized are those that start with ``www.`` or with ``://``. .. php:function:: url_title($str[, $separator = '-'[, $lowercase = false]]) :param string $str: Input string - :param string $separator: Word separator (usually '-' or '_') + :param string $separator: Word separator (usually ``'-'`` or ``'_'``) :param bool $lowercase: Whether to transform the output string to lowercase :returns: URL-formatted string :rtype: string @@ -321,7 +321,7 @@ The following functions are available: .. literalinclude:: url_helper/017.php The second parameter determines the word delimiter. By default dashes - are used. Preferred options are: **-** (dash) or **_** (underscore). + are used. Preferred options are: ``-`` (dash) or ``_`` (underscore). Example: @@ -337,7 +337,7 @@ The following functions are available: .. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]]) :param string $str: Input string - :param string $separator: Word separator (usually '-' or '_') + :param string $separator: Word separator (usually ``'-'`` or ``'_'``) :param bool $lowercase: Whether to transform the output string to lowercase :returns: URL-formatted string :rtype: string @@ -348,11 +348,11 @@ The following functions are available: .. php:function:: prep_url([$str = ''[, $secure = false]]) :param string $str: URL string - :param boolean $secure: true for https:// + :param boolean $secure: true for ``https://`` :returns: Protocol-prefixed URL string :rtype: string - This function will add *http://* or *https://* in the event that a protocol prefix + This function will add ``http://`` or ``https://`` in the event that a protocol prefix is missing from a URL. Pass the URL string to the function like this: From b2ffe417b69a84b5fe5f5c6ada5ef89dec6d9ead Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 11:00:57 +0900 Subject: [PATCH 3063/8282] docs: improve explanation for url_is() --- user_guide_src/source/helpers/url_helper.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 4e843ead4af0..1b17159bbe4a 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -388,14 +388,17 @@ The following functions are available: .. php:function:: url_is($path) - :param string $path: The path to check the current URI path against. + :param string $path: The URL path relative to baseURL to check the current URI path against. :rtype: boolean Compares the current URL's path against the given path to see if they match. Example: .. literalinclude:: url_helper/023.php - This would match ``http://example.com/admin``. You can use the ``*`` wildcard to match + This would match **http://example.com/admin**. It would match **http://example.com/subdir/admin** + if your baseURL is ``http://example.com/subdir/``. + + You can use the ``*`` wildcard to match any other applicable characters in the URL: .. literalinclude:: url_helper/024.php From 4d73ea1002e3929bf411bc19250fa2f1aa2d5fb2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 19:01:39 +0900 Subject: [PATCH 3064/8282] refactor: rename method name It does not return anything. --- system/Debug/Toolbar/Collectors/Views.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php index 2e036ff19c85..ea44dae44bd5 100644 --- a/system/Debug/Toolbar/Collectors/Views.php +++ b/system/Debug/Toolbar/Collectors/Views.php @@ -73,7 +73,7 @@ class Views extends BaseCollector */ protected $views = []; - private function getViewer(): void + private function initViewer(): void { $this->viewer ??= Services::renderer(); } @@ -84,7 +84,7 @@ private function getViewer(): void */ protected function formatTimelineData(): array { - $this->getViewer(); + $this->initViewer(); $data = []; @@ -120,7 +120,7 @@ protected function formatTimelineData(): array */ public function getVarData(): array { - $this->getViewer(); + $this->initViewer(); return [ 'View Data' => $this->viewer->getData(), @@ -132,7 +132,7 @@ public function getVarData(): array */ public function getBadgeValue(): int { - $this->getViewer(); + $this->initViewer(); return count($this->viewer->getPerformanceData()); } From bc518ea356b83c2932dc7215a9167034332bb679 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 24 Jan 2023 08:18:44 +0900 Subject: [PATCH 3065/8282] docs: add missing composer.json in Mandatory File Changes --- .../source/installation/upgrade_430.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_430.rst b/user_guide_src/source/installation/upgrade_430.rst index 396b45b25f60..f8caccad8558 100644 --- a/user_guide_src/source/installation/upgrade_430.rst +++ b/user_guide_src/source/installation/upgrade_430.rst @@ -73,6 +73,24 @@ Mock Config Classes - Add **types** to the properties in these Config classes. You may need to fix the property values to match the property types. +composer.json +============= + +If you installed CodeIgnter manually, and are using Composer, +you need to remove the "kint-php/kint" line, and run ``composer update``. + +.. code-block:: text + + { + ... + "require": { + ... + "kint-php/kint": "^4.2", <-- Remove this line + ... + }, + ... + } + Breaking Changes **************** From 2285ee7a03fcb5605dea9b5342ad7e7ae3e14228 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 09:13:36 +0900 Subject: [PATCH 3066/8282] docs: ComposerScripts::postUpdate is not needed for end users It removes system/ThirdParty/Kint/* when running `composer update` after removing `kint-php/kint` in composer.json. --- user_guide_src/source/installation/upgrade_430.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_430.rst b/user_guide_src/source/installation/upgrade_430.rst index f8caccad8558..6e37811777fe 100644 --- a/user_guide_src/source/installation/upgrade_430.rst +++ b/user_guide_src/source/installation/upgrade_430.rst @@ -77,7 +77,7 @@ composer.json ============= If you installed CodeIgnter manually, and are using Composer, -you need to remove the "kint-php/kint" line, and run ``composer update``. +you need to remove the following lines, and run ``composer update``. .. code-block:: text @@ -89,6 +89,13 @@ you need to remove the "kint-php/kint" line, and run ``composer update``. ... }, ... + "scripts": { + "post-update-cmd": [ + "CodeIgniter\\ComposerScripts::postUpdate" <-- Remove this line + ], + "test": "phpunit" + }, + ... } Breaking Changes From 7a84dd4ed61b57b3fcf69fce5c59b3f8b76ab4e6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 13:50:36 +0900 Subject: [PATCH 3067/8282] docs: fix typos --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 1a37329b4936..b76283f96b23 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -53,7 +53,7 @@ If you omit the "project-root" argument, the command will create an > composer install --no-dev - The above command will removes the Composer packages only for development + The above command will remove the Composer packages only for development that are not needed in the production environment. This will greatly reduce the vendor folder size. @@ -139,7 +139,7 @@ In your project root:: > composer install --no-dev - The above command will removes the Composer packages only for development + The above command will remove the Composer packages only for development that are not needed in the production environment. This will greatly reduce the vendor folder size. From cf0806b072ef29693d322928dde7f4a5a90317c2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 14:07:20 +0900 Subject: [PATCH 3068/8282] docs: add note for upgrading tools --- .../source/installation/installing_composer.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index b76283f96b23..c92c365e2f85 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -85,6 +85,10 @@ Cons You still need to check for file changes in the **project space** (root, app, public, writable) after updating. +.. note:: There are some third-party CodeIgniter modules available to assist + with merging changes to the project space: + `Explore on Packagist `_. + Structure --------- @@ -178,6 +182,10 @@ Cons You still need to check for file changes in the **project space** (root, app, public, writable) after updating. +.. note:: There are some third-party CodeIgniter modules available to assist + with merging changes to the project space: + `Explore on Packagist `_. + Structure --------- From becefa3de5e5855d9f97b65de3e22068bf7381e4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 14:08:01 +0900 Subject: [PATCH 3069/8282] docs: change decration for file paths --- .../source/installation/installing_manual.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst index 9ae1403b6cbd..c0d35de86bbb 100644 --- a/user_guide_src/source/installation/installing_manual.rst +++ b/user_guide_src/source/installation/installing_manual.rst @@ -9,8 +9,8 @@ The `CodeIgniter 4 framework `_ repository holds the released versions of the framework. It is intended for developers who do not wish to use Composer. -Develop your app inside the ``app`` folder, and the ``public`` folder -will be your public-facing document root. Do not change anything inside the ``system`` +Develop your app inside the **app** folder, and the **public** folder +will be your public-facing document root. Do not change anything inside the **system** folder! .. note:: This is the installation technique closest to that described @@ -37,7 +37,7 @@ See :ref:`initial-configuration` for the detail. Upgrading ========= -Download a new copy of the framework, and then replace the ``system`` folder. +Download a new copy of the framework, and then replace the **system** folder. Read the :doc:`upgrade instructions `, and check Breaking Changes and Enhancements. @@ -65,8 +65,8 @@ If you want to take advantage of the system message translations, they can be added to your project in a similar fashion. Download the `latest version of them `_. -Extract the downloaded zip, and copy the ``Language`` folder contents in it -to your ``PROJECT_ROOT/app/Languages`` folder. +Extract the downloaded zip, and copy the **Language** folder contents in it +to your **app/Languages** folder. This would need to be repeated to incorporate any updates to the translations. From bf3ef0fb1ec26ee9fbfa474282366942e5b40769 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 14:16:10 +0900 Subject: [PATCH 3070/8282] docs: add "and merge them" --- user_guide_src/source/installation/installing_composer.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index c92c365e2f85..00f736dbe603 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -83,7 +83,7 @@ Cons ---- You still need to check for file changes in the **project space** -(root, app, public, writable) after updating. +(root, app, public, writable) and merge them after updating. .. note:: There are some third-party CodeIgniter modules available to assist with merging changes to the project space: From 59261c3b72898a20a002275efdecc3989e8f0921 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 14:16:43 +0900 Subject: [PATCH 3071/8282] docs: change the expression --- user_guide_src/source/installation/installing_manual.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst index c0d35de86bbb..7e592046f3a5 100644 --- a/user_guide_src/source/installation/installing_manual.rst +++ b/user_guide_src/source/installation/installing_manual.rst @@ -49,7 +49,8 @@ Download and run. Cons ==== -You are responsible for merge conflicts when updating. +You need to check for file changes in the **project space** +(root, app, public, tests, writable) and merge them by yourself. Structure ========= From 636b38cbf644bfc295d578672e8b1f9df101fd31 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 21:20:47 +0900 Subject: [PATCH 3072/8282] test: remove unneeded code --- .../HTTP/IncomingRequestDetectingTest.php | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index ab0bfb5c6092..88b69fe6b028 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -31,127 +31,139 @@ protected function setUp(): void $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = []; - $origin = 'http://www.example.com/index.php/woot?code=good#pos'; - + // The URI object is not used in detectPath(). + $origin = 'http://www.example.com/index.php/woot?code=good#pos'; $this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent()); } public function testPathDefault() { - $this->request->uri = '/index.php/woot?code=good#pos'; + // /index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath()); } public function testPathEmpty() { - $this->request->uri = '/'; + // / $_SERVER['REQUEST_URI'] = '/'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = '/'; + + $expected = '/'; $this->assertSame($expected, $this->request->detectPath()); } public function testPathRequestURI() { - $this->request->uri = '/index.php/woot?code=good#pos'; + // /index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURINested() { - $this->request->uri = '/ci/index.php/woot?code=good#pos'; + // /ci/index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURISubfolder() { - $this->request->uri = '/ci/index.php/popcorn/woot?code=good#pos'; + // /ci/index.php/popcorn/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot'; $_SERVER['SCRIPT_NAME'] = '/ci/index.php'; - $expected = 'popcorn/woot'; + + $expected = 'popcorn/woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURINoIndex() { - $this->request->uri = '/sub/example'; + // /sub/example $_SERVER['REQUEST_URI'] = '/sub/example'; $_SERVER['SCRIPT_NAME'] = '/sub/index.php'; - $expected = 'example'; + + $expected = 'example'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURINginx() { - $this->request->uri = '/ci/index.php/woot?code=good#pos'; + // /ci/index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURINginxRedirecting() { - $this->request->uri = '/?/ci/index.php/woot'; + // /?/ci/index.php/woot $_SERVER['REQUEST_URI'] = '/?/ci/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'ci/woot'; + + $expected = 'ci/woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathRequestURISuppressed() { - $this->request->uri = '/woot?code=good#pos'; + // /woot?code=good#pos $_SERVER['REQUEST_URI'] = '/woot'; $_SERVER['SCRIPT_NAME'] = '/'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } public function testPathQueryString() { - $this->request->uri = '/?/ci/index.php/woot'; + // /?/ci/index.php/woot $_SERVER['REQUEST_URI'] = '/?/ci/woot'; $_SERVER['QUERY_STRING'] = '/ci/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'ci/woot'; + + $expected = 'ci/woot'; $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } public function testPathQueryStringEmpty() { - $this->request->uri = '/?/ci/index.php/woot'; + // /?/ci/index.php/woot $_SERVER['REQUEST_URI'] = '/?/ci/woot'; $_SERVER['QUERY_STRING'] = ''; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = ''; + + $expected = ''; $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } public function testPathPathInfo() { - $this->request->uri = '/index.php/woot?code=good#pos'; + // /index.php/woot?code=good#pos $this->request->setGlobal('server', [ 'PATH_INFO' => null, ]); $_SERVER['REQUEST_URI'] = '/index.php/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = 'woot'; + + $expected = 'woot'; $this->assertSame($expected, $this->request->detectPath('PATH_INFO')); } public function testPathPathInfoGlobal() { - $this->request->uri = '/index.php/woot?code=good#pos'; + // /index.php/woot?code=good#pos $this->request->setGlobal('server', [ 'PATH_INFO' => 'silliness', ]); From 7503d70386d0267f020d0b9a6a90c36282754fa6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 21:47:26 +0900 Subject: [PATCH 3073/8282] test: fix incorrect tests --- tests/system/HTTP/IncomingRequestDetectingTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index 88b69fe6b028..b326e238f59b 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -128,8 +128,8 @@ public function testPathRequestURISuppressed() public function testPathQueryString() { - // /?/ci/index.php/woot - $_SERVER['REQUEST_URI'] = '/?/ci/woot'; + // /index.php?/ci/woot + $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot'; $_SERVER['QUERY_STRING'] = '/ci/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; @@ -139,8 +139,8 @@ public function testPathQueryString() public function testPathQueryStringEmpty() { - // /?/ci/index.php/woot - $_SERVER['REQUEST_URI'] = '/?/ci/woot'; + // /index.php? + $_SERVER['REQUEST_URI'] = '/index.php?'; $_SERVER['QUERY_STRING'] = ''; $_SERVER['SCRIPT_NAME'] = '/index.php'; From 3eab713e5c30c7e984e1a5110184119a79857b45 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 29 Jan 2023 21:47:39 +0900 Subject: [PATCH 3074/8282] test: add test --- tests/system/HTTP/IncomingRequestDetectingTest.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index b326e238f59b..81bdfcdc5306 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -137,6 +137,17 @@ public function testPathQueryString() $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } + public function testPathQueryStringWithQueryString() + { + // /index.php?/ci/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot?code=good'; + $_SERVER['QUERY_STRING'] = '/ci/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $expected = 'ci/woot'; + $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); + } + public function testPathQueryStringEmpty() { // /index.php? From 97002d0b114d41669fddf8598b9fb6c0e497497a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:27:50 +0900 Subject: [PATCH 3075/8282] docs: add PHPDocs --- system/Router/Router.php | 4 ++++ system/Router/RouterInterface.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/system/Router/Router.php b/system/Router/Router.php index 137aa4e43af9..b0247b2d93f4 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -155,6 +155,10 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request } /** + * Finds the controller method corresponding to the URI. + * + * @param string|null $uri URI path relative to baseURL + * * @return Closure|string Controller classname or Closure * * @throws PageNotFoundException diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php index 1efeb2e2c6e2..ffed59ca8aac 100644 --- a/system/Router/RouterInterface.php +++ b/system/Router/RouterInterface.php @@ -27,7 +27,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request /** * Finds the controller method corresponding to the URI. * - * @param string $uri + * @param string|null $uri URI path relative to baseURL * * @return Closure|string Controller classname or Closure */ From e497c49e1bbc4c2789f432daa33e484a0824bf62 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:50:15 +0900 Subject: [PATCH 3076/8282] fix: if uri is empty string, then it should be `/` Make it the same behavior as when URIProtocol is REQUEST_URI. --- system/HTTP/IncomingRequest.php | 2 +- tests/system/HTTP/IncomingRequestDetectingTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 3304f4664a76..a3a8de837759 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -329,7 +329,7 @@ protected function parseQueryString(): string $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING'); if (trim($uri, '/') === '') { - return ''; + return '/'; } if (strncmp($uri, '/', 1) === 0) { diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index 81bdfcdc5306..8f265ab13a84 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -155,7 +155,7 @@ public function testPathQueryStringEmpty() $_SERVER['QUERY_STRING'] = ''; $_SERVER['SCRIPT_NAME'] = '/index.php'; - $expected = ''; + $expected = '/'; $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } From edef908890c5ed54ace942133248fb86d04bbe6a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:53:39 +0900 Subject: [PATCH 3077/8282] fix: defined `/` route may be ignored --- system/Router/Router.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/system/Router/Router.php b/system/Router/Router.php index b0247b2d93f4..8dd35c656e39 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -166,12 +166,9 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request */ public function handle(?string $uri = null) { - // If we cannot find a URI to match against, then - // everything runs off of its default settings. + // If we cannot find a URI to match against, then set it to root (`/`). if ($uri === null || $uri === '') { - return strpos($this->controller, '\\') === false - ? $this->collection->getDefaultNamespace() . $this->controller - : $this->controller; + $uri = '/'; } // Decode URL-encoded string From 021c5bbde49b4b04ea04415e15c0400421e063ed Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:55:26 +0900 Subject: [PATCH 3078/8282] test: improve test method name --- tests/system/HTTP/IncomingRequestDetectingTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index 8f265ab13a84..f3be0aeb2247 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -46,7 +46,7 @@ public function testPathDefault() $this->assertSame($expected, $this->request->detectPath()); } - public function testPathEmpty() + public function testPathDefaultEmpty() { // / $_SERVER['REQUEST_URI'] = '/'; From aa4a360bfa706e7864572e59ae20fc924255d1b3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:55:49 +0900 Subject: [PATCH 3079/8282] test: update test The auto routing is disabled, so defined route should be used, or 404 should happen. --- tests/system/Router/RouterTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index 5e7733ee4ff4..5be01a47bfc6 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -39,6 +39,7 @@ protected function setUp(): void $this->collection = new RouteCollection(Services::locator(), $moduleConfig); $routes = [ + '/' => 'Home::index', 'users' => 'Users::index', 'user-setting/show-list' => 'User_setting::show_list', 'user-setting/(:segment)' => 'User_setting::detail/$1', @@ -56,20 +57,20 @@ protected function setUp(): void 'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3', '(:segment)/(:segment)/(:segment)' => '$2::$3/$1', ]; - $this->collection->map($routes); + $this->request = Services::request(); $this->request->setMethod('get'); } - public function testEmptyURIMatchesDefaults() + public function testEmptyURIMatchesRoot() { $router = new Router($this->collection, $this->request); $router->handle(''); - $this->assertSame($this->collection->getDefaultController(), $router->controllerName()); - $this->assertSame($this->collection->getDefaultMethod(), $router->methodName()); + $this->assertSame('\Home', $router->controllerName()); + $this->assertSame('index', $router->methodName()); } public function testZeroAsURIPath() From 0b3460baaa9718d5e9d14dd7673df58f812bae9d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 13:58:26 +0900 Subject: [PATCH 3080/8282] chore: update phpstan-baseline.neon.dist --- phpstan-baseline.neon.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 4259df0cc3ef..2d1f9ddd3c41 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -217,7 +217,7 @@ parameters: - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#" - count: 3 + count: 2 path: system/Router/Router.php - From d95d86ea897b1603a429e4971f47a852bda20acc Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 17:49:24 +0900 Subject: [PATCH 3081/8282] docs: improve redirect() explanation --- .../source/general/common_functions.rst | 34 +++++++++++++++---- .../source/general/common_functions/005.php | 22 ++---------- .../source/general/common_functions/006.php | 2 +- .../source/general/common_functions/013.php | 4 +++ .../source/general/common_functions/014.php | 16 +++++++++ 5 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 user_guide_src/source/general/common_functions/013.php create mode 100644 user_guide_src/source/general/common_functions/014.php diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 4a4f9744e800..c96e171680f3 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -317,7 +317,7 @@ Miscellaneous Functions .. php:function:: redirect(string $route) - :param string $route: The reverse-routed or named route to redirect the user to. + :param string $route: The route name or Controller::method to redirect the user to. :rtype: RedirectResponse .. important:: When you use this function, an instance of ``RedirectResponse`` must be returned @@ -325,18 +325,40 @@ Miscellaneous Functions the :doc:`Controller Filter <../incoming/filters>`. If you forget to return it, no redirection will occur. - Returns a RedirectResponse instance allowing you to easily create redirects: + Returns a RedirectResponse instance allowing you to easily create redirects. + + **Redirect to a URI path** + + When you want to pass a URI path (relative to baseURL), use ``redirect()->to()``: .. literalinclude:: common_functions/005.php + :lines: 2- - .. note:: ``redirect()->back()`` is not the same as browser "back" button. - It takes a visitor to "the last page viewed during the Session" when the Session is available. - If the Session hasn’t been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used. + **Redirect to a Defined Route** + + When you want to pass a :ref:`route name ` or Controller::method + for :ref:`reverse routing `, use ``redirect()->route()``: + + .. literalinclude:: common_functions/013.php + :lines: 2- - When passing an argument into the function, it is treated as a named/reverse-routed route, not a relative/full URI, + When passing an argument into the function, it is treated as a route name or + Controller::method for reverse routing, not a relative/full URI, treating it the same as using ``redirect()->route()``: .. literalinclude:: common_functions/006.php + :lines: 2- + + **Redirect Back** + + When you want to redirect back, use ``redirect()->back()``: + + .. literalinclude:: common_functions/014.php + :lines: 2- + + .. note:: ``redirect()->back()`` is not the same as browser "back" button. + It takes a visitor to "the last page viewed during the Session" when the Session is available. + If the Session hasn’t been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used. .. php:function:: remove_invisible_characters($str[, $urlEncoded = true]) diff --git a/user_guide_src/source/general/common_functions/005.php b/user_guide_src/source/general/common_functions/005.php index 0b2197de88ed..6f6f6286dbad 100644 --- a/user_guide_src/source/general/common_functions/005.php +++ b/user_guide_src/source/general/common_functions/005.php @@ -1,22 +1,4 @@ back(); - -// Go to specific URI -return redirect()->to('/admin'); - -// Go to a named route -return redirect()->route('named_route'); - -// Keep the old input values upon redirect so they can be used by the `old()` function -return redirect()->back()->withInput(); - -// Set a flash message -return redirect()->back()->with('foo', 'message'); - -// Copies all cookies from global response instance -return redirect()->back()->withCookies(); - -// Copies all headers from the global response instance -return redirect()->back()->withHeaders(); +// Go to specific URI path. "admin/home" is the URI path relative to baseURL. +return redirect()->to('admin/home'); diff --git a/user_guide_src/source/general/common_functions/006.php b/user_guide_src/source/general/common_functions/006.php index 7df72c5dca79..f605edb4855a 100644 --- a/user_guide_src/source/general/common_functions/006.php +++ b/user_guide_src/source/general/common_functions/006.php @@ -1,4 +1,4 @@ route('user_gallery'); diff --git a/user_guide_src/source/general/common_functions/014.php b/user_guide_src/source/general/common_functions/014.php new file mode 100644 index 000000000000..28b73d6c267c --- /dev/null +++ b/user_guide_src/source/general/common_functions/014.php @@ -0,0 +1,16 @@ +back(); + +// Keep the old input values upon redirect so they can be used by the `old()` function. +return redirect()->back()->withInput(); + +// Set a flash message. +return redirect()->back()->with('foo', 'message'); + +// Copies all cookies from global response instance. +return redirect()->back()->withCookies(); + +// Copies all headers from the global response instance. +return redirect()->back()->withHeaders(); From 5a599ddcce0bf3ce614846dd02772deb5ad480bc Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 17:51:01 +0900 Subject: [PATCH 3082/8282] docs: update PHPDocs --- system/Common.php | 2 +- system/HTTP/RedirectResponse.php | 4 ++-- system/Router/RouteCollection.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Common.php b/system/Common.php index f12092a5a3f8..218252ed7985 100644 --- a/system/Common.php +++ b/system/Common.php @@ -863,7 +863,7 @@ function old(string $key, $default = null, $escape = 'html') * * If more control is needed, you must use $response->redirect explicitly. * - * @param string $route + * @param string|null $route Route name or Controller::method */ function redirect(?string $route = null): RedirectResponse { diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php index 34f950de0a60..ed620c40f2ae 100644 --- a/system/HTTP/RedirectResponse.php +++ b/system/HTTP/RedirectResponse.php @@ -24,7 +24,7 @@ class RedirectResponse extends Response * Sets the URI to redirect to and, optionally, the HTTP status code to use. * If no code is provided it will be automatically determined. * - * @param string $uri The URI to redirect to + * @param string $uri The URI path (relative to baseURL) to redirect to * @param int|null $code HTTP status code * * @return $this @@ -44,7 +44,7 @@ public function to(string $uri, ?int $code = null, string $method = 'auto') * Sets the URI to redirect to but as a reverse-routed or named route * instead of a raw URI. * - * @param string $route Named route or Controller::method + * @param string $route Route name or Controller::method * * @return $this * diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index cc37d301473a..b1703f874df7 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1043,7 +1043,7 @@ public function environment(string $env, Closure $callback): RouteCollectionInte * // Equals 'path/$param1/$param2' * reverseRoute('Controller::method', $param1, $param2); * - * @param string $search Named route or Controller::method + * @param string $search Route name or Controller::method * @param int|string ...$params One or more parameters to be passed to the route. * The last parameter allows you to set the locale. * From ff43b9f871f7ce967b9a4f209bb170b40316140d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 17:58:35 +0900 Subject: [PATCH 3083/8282] docs: add explanation for redirect() --- user_guide_src/source/installation/upgrade_4xx.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 3b8d7a5be348..30ccd99f9089 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -131,9 +131,11 @@ Helpers will be :doc:`../helpers/filesystem_helper` in CI4. - `String Helper `_ functions in CI3 are included in :doc:`../helpers/text_helper` in CI4. -- In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it. +- In CI4, ``redirect()`` is completely changed from CI3's. - `redirect() Documentation CodeIgniter 3.X `_ - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_ + - In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it. + - You need to change CI3's ``redirect('login/form')`` to ``return redirect()->to('login/form')``. Hooks ===== From d3a1e5695abc1ffd8cc46f6a12bb1dd26856c185 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 16:33:49 +0900 Subject: [PATCH 3084/8282] fix: base_url() removes trailing slash in baseURL --- system/Helpers/url_helper.php | 2 +- .../system/Helpers/URLHelper/SiteUrlTest.php | 45 ++++++++++++++----- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 1a3b78de5c91..5b0a0d6a690b 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -124,7 +124,7 @@ function base_url($relativePath = '', ?string $scheme = null): string $config = clone config('App'); $config->indexPage = ''; - return rtrim(site_url($relativePath, $scheme, $config), '/'); + return site_url($relativePath, $scheme, $config); } } diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 1f6f081b4dc2..9873292843e5 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -59,27 +59,31 @@ protected function tearDown(): void * @param bool $secure * @param string $path * @param string $expectedSiteUrl + * @param string $expectedBaseUrl * * @dataProvider configProvider */ - public function testUrls($baseURL, $indexPage, $scheme, $secure, $path, $expectedSiteUrl) - { + public function testUrls( + $baseURL, + $indexPage, + $scheme, + $secure, + $path, + $expectedSiteUrl, + $expectedBaseUrl + ) { // Set the config $this->config->baseURL = $baseURL; $this->config->indexPage = $indexPage; $this->config->forceGlobalSecureRequests = $secure; $this->assertSame($expectedSiteUrl, site_url($path, $scheme, $this->config)); - - // base_url is always the trimmed site_url without index page - $expectedBaseUrl = $indexPage === '' ? $expectedSiteUrl : str_replace('/' . $indexPage, '', $expectedSiteUrl); - $expectedBaseUrl = rtrim($expectedBaseUrl, '/'); $this->assertSame($expectedBaseUrl, base_url($path, $scheme)); } public function configProvider() { - // baseURL, indexPage, scheme, secure, path, expectedSiteUrl + // baseURL, indexPage, scheme, secure, path, expectedSiteUrl, expectedBaseUrl return [ 'forceGlobalSecure' => [ 'http://example.com/', @@ -88,6 +92,7 @@ public function configProvider() true, '', 'https://example.com/index.php', + 'https://example.com/', ], [ 'http://example.com/', @@ -96,14 +101,16 @@ public function configProvider() false, '', 'http://example.com/index.php', + 'http://example.com/', ], - [ + 'baseURL missing /' => [ 'http://example.com', 'index.php', null, false, '', 'http://example.com/index.php', + 'http://example.com/', ], [ 'http://example.com/', @@ -112,6 +119,7 @@ public function configProvider() false, '', 'http://example.com/', + 'http://example.com/', ], [ 'http://example.com/', @@ -120,6 +128,7 @@ public function configProvider() false, '', 'http://example.com/banana.php', + 'http://example.com/', ], [ 'http://example.com/', @@ -128,6 +137,7 @@ public function configProvider() false, 'abc', 'http://example.com/abc', + 'http://example.com/abc', ], 'URL decode' => [ 'http://example.com/', @@ -136,6 +146,7 @@ public function configProvider() false, 'template/meet-%26-greet', 'http://example.com/template/meet-&-greet', + 'http://example.com/template/meet-&-greet', ], 'URL encode' => [ 'http://example.com/', @@ -144,6 +155,7 @@ public function configProvider() false, 'alert', 'http://example.com/%3Cs%3Ealert%3C/s%3E', + 'http://example.com/%3Cs%3Ealert%3C/s%3E', ], [ 'http://example.com/public/', @@ -152,6 +164,7 @@ public function configProvider() false, '', 'http://example.com/public/index.php', + 'http://example.com/public/', ], [ 'http://example.com/public/', @@ -160,6 +173,7 @@ public function configProvider() false, '', 'http://example.com/public/', + 'http://example.com/public/', ], [ 'http://example.com/public', @@ -168,6 +182,7 @@ public function configProvider() false, '', 'http://example.com/public/', + 'http://example.com/public/', ], [ 'http://example.com/public', @@ -176,6 +191,7 @@ public function configProvider() false, '/', 'http://example.com/public/index.php/', + 'http://example.com/public/', ], [ 'http://example.com/public/', @@ -184,6 +200,7 @@ public function configProvider() false, '/', 'http://example.com/public/index.php/', + 'http://example.com/public/', ], [ 'http://example.com/', @@ -192,6 +209,7 @@ public function configProvider() false, 'foo', 'http://example.com/index.php/foo', + 'http://example.com/foo', ], [ 'http://example.com/', @@ -200,6 +218,7 @@ public function configProvider() false, '0', 'http://example.com/index.php/0', + 'http://example.com/0', ], [ 'http://example.com/public', @@ -208,6 +227,7 @@ public function configProvider() false, 'foo', 'http://example.com/public/index.php/foo', + 'http://example.com/public/foo', ], [ 'http://example.com/', @@ -216,6 +236,7 @@ public function configProvider() false, 'foo?bar=bam', 'http://example.com/index.php/foo?bar=bam', + 'http://example.com/foo?bar=bam', ], [ 'http://example.com/', @@ -224,6 +245,7 @@ public function configProvider() false, 'test#banana', 'http://example.com/index.php/test#banana', + 'http://example.com/test#banana', ], [ 'http://example.com/', @@ -232,6 +254,7 @@ public function configProvider() false, 'foo', 'ftp://example.com/index.php/foo', + 'ftp://example.com/foo', ], [ 'http://example.com/', @@ -240,6 +263,7 @@ public function configProvider() false, 'news/local/123', 'http://example.com/index.php/news/local/123', + 'http://example.com/news/local/123', ], [ 'http://example.com/', @@ -248,6 +272,7 @@ public function configProvider() false, ['news', 'local', '123'], 'http://example.com/index.php/news/local/123', + 'http://example.com/news/local/123', ], ]; } @@ -267,12 +292,12 @@ public function testBaseURLDiscovery() $_SERVER['HTTP_HOST'] = 'example.com'; $_SERVER['REQUEST_URI'] = '/test'; - $this->assertSame('http://example.com', base_url()); + $this->assertSame('http://example.com/', base_url()); $_SERVER['HTTP_HOST'] = 'example.com'; $_SERVER['REQUEST_URI'] = '/test/page'; - $this->assertSame('http://example.com', base_url()); + $this->assertSame('http://example.com/', base_url()); $this->assertSame('http://example.com/profile', base_url('profile')); } From c3489f007d9f923135e2f85d5d0be19880e9e573 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 08:50:59 +0900 Subject: [PATCH 3085/8282] docs: add docs --- user_guide_src/source/changelogs/v4.3.2.rst | 11 ++++ user_guide_src/source/helpers/url_helper.rst | 4 ++ .../source/installation/upgrade_432.rst | 56 +++++++++++++++++++ .../source/installation/upgrading.rst | 1 + 4 files changed, 72 insertions(+) create mode 100644 user_guide_src/source/installation/upgrade_432.rst diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index 9249f86fdb5d..fbb4e016ae63 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -12,6 +12,17 @@ Release Date: Unreleased BREAKING ******** +Behavior Changes +================ + +base_url() +---------- + +Due to a bug, in previous versions :php:func:`base_url()` without argument returned baseURL +without a trailing slash (``/``) like ``http://localhost:8080``. Now it returns +baseURL with a trailing slash. This is the same behavior as ``base_url()`` in +CodeIgniter 3. + Message Changes *************** diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 1b17159bbe4a..389b83c3ef62 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -64,6 +64,10 @@ The following functions are available: .. note:: Since v4.3.0, if you set ``Config\App::$allowedHostnames``, this returns the URL with the hostname set in it if the current URL matches. + .. note:: In previous versions, this returned the base URL without a trailing + slash (``/``) when called with no argument. The bug was fixed and + since v4.3.2 it returns the base URL with a trailing slash. + Returns your site base URL, as specified in your config file. Example: .. literalinclude:: url_helper/003.php diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst new file mode 100644 index 000000000000..f61e57012d6a --- /dev/null +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -0,0 +1,56 @@ +############################## +Upgrading from 4.3.1 to 4.3.2 +############################## + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +Breaking Changes +**************** + +base_url() +========== + +The :php:func:`base_url()` behavior has been fix. In previous versions, when you +call ``base_url()`` **without argument**, it returned baseURL without a trailing +slash (``/``). Now it returns baseURL with a trailing slash. For example: + +- before: ``http://example.com`` +- after: ``http://example.com/`` + +If you have code to call ``base_url()`` without argument, you may need to adjust the URLs. + +Project Files +************* + +Some files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. + +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +Content Changes +=============== + +The following files received significant changes (including deprecations or visual adjustments) +and it is recommended that you merge the updated versions with your application: + +Config +------ + +- @TODO + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +- @TODO diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index f5600aa52d00..d754d020b55c 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_432 upgrade_431 upgrade_430 upgrade_4212 From 29901ec525ec44012eef83e679862e5db9944b36 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 09:17:50 +0900 Subject: [PATCH 3086/8282] docs: add "Loading a Class in Sub-directories" --- user_guide_src/source/concepts/factories.rst | 19 +++++++++++++++++-- .../source/concepts/factories/013.php | 3 +++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 user_guide_src/source/concepts/factories/013.php diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 8b868b78b434..c09134a47b54 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -41,10 +41,16 @@ On the other hand, Services have code to create instances, so it can create a co that needs other services or class instances. When you get a service, Services require a service name, not a class name, so the returned instance can be changed without changing the client code. +Loading Classes +*************** + +Loading a Class +=============== + .. _factories-example: -Example -======= +Model Example +------------- Take a look at **Models** as an example. You can access the Factory specific to Models by using the magic static method of the Factories class, ``Factories::models()``. @@ -79,6 +85,15 @@ you get back the instance as before: .. literalinclude:: factories/003.php +Loading a Class in Sub-directories +================================== + +If you want to load a class in sub directories, you use the ``/`` as a separator. +The following code loads **app/Libraries/Sub/SubLib.php**: + +.. literalinclude:: factories/013.php + :lines: 2- + Convenience Functions ********************* diff --git a/user_guide_src/source/concepts/factories/013.php b/user_guide_src/source/concepts/factories/013.php new file mode 100644 index 000000000000..ce10c9280939 --- /dev/null +++ b/user_guide_src/source/concepts/factories/013.php @@ -0,0 +1,3 @@ + Date: Tue, 31 Jan 2023 09:39:16 +0900 Subject: [PATCH 3087/8282] docs: add about Factories --- user_guide_src/source/installation/upgrade_4xx.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 3b8d7a5be348..c28dca9cdf4f 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -100,13 +100,17 @@ Class Loading namespaces; with Composer autoloading support. - You can configure the class loading to support whatever application structure you are most comfortable with, including the "HMVC" style. +- Ci4 provides :doc:`../concepts/factories` that can load a class and share the + instance like ``$this->load`` in CI3. Libraries ========= - Your app classes can still go inside **app/Libraries**, but they don't have to. - Instead of CI3's ``$this->load->library('x');`` you can now use - ``$this->x = new X();``, following namespaced conventions for your component. + ``$this->x = new \App\Libraries\X();``, following namespaced conventions for + your component. Alternatively, you can use :doc:`../concepts/factories`: + ``$this->x = \CodeIgniter\Config\Factories::libraries('X');``. Helpers ======= @@ -160,8 +164,10 @@ Upgrading Libraries ******************* - Your app classes can still go inside **app/Libraries**, but they don't have to. -- Instead of CI3's ``$this->load->library('x');`` you can now use ``$this->x = new X();``, - following namespaced conventions for your component. +- Instead of CI3's ``$this->load->library('x');`` you can now use + ``$this->x = new \App\Libraries\X();``, following namespaced conventions for + your component. Alternatively, you can use :doc:`../concepts/factories`: + ``$this->x = \CodeIgniter\Config\Factories::libraries('X');``. - Some libraries from CodeIgniter 3 no longer exists in Version 4. For all these libraries, you have to find a new way to implement your functions. These libraries are `Calendaring `_, From 8237344c811891d4f82f1ea1f6ab2f56dd7ed213 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 13:46:37 +0900 Subject: [PATCH 3088/8282] docs: add section titles --- .../source/libraries/uploaded_files.rst | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 837052c59d21..3de0653d8c19 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -307,20 +307,34 @@ version, use ``getMimeType()`` instead: Moving Files ============ +with Original Filename +---------------------- + Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move the file to as the first parameter: .. literalinclude:: uploaded_files/016.php -By default, the original filename was used. You can specify a new filename by passing it as the second parameter: +By default, the original filename was used. + +with New Filename +----------------- + +You can specify a new filename by passing it as the second parameter: .. literalinclude:: uploaded_files/017.php +Check if the File Moved +----------------------- + Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with the ``hasMoved()`` method, which returns a boolean: .. literalinclude:: uploaded_files/018.php +When Moving Fails +----------------- + Moving an uploaded file can fail, with an HTTPException, under several circumstances: - the file has already been moved From 639ac1e9c0862e3709ae4eb0a0a1dfae8743999d Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 13:47:09 +0900 Subject: [PATCH 3089/8282] docs: add "Overwriting Existing File" --- user_guide_src/source/libraries/uploaded_files.rst | 12 ++++++++++++ .../source/libraries/uploaded_files/022.php | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 user_guide_src/source/libraries/uploaded_files/022.php diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 3de0653d8c19..9e6d68f92f07 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -324,6 +324,18 @@ You can specify a new filename by passing it as the second parameter: .. literalinclude:: uploaded_files/017.php +By default, if the destination file already exists, a new filename will be used. +For example, if **image_name.jpg** already exists in the directory, then the +filename will be **image_name_1.jpg**. + +Overwriting Existing File +------------------------- + +You can overwrite the existing file by passing ``true`` +as the third parameter: + +.. literalinclude:: uploaded_files/022.php + Check if the File Moved ----------------------- diff --git a/user_guide_src/source/libraries/uploaded_files/022.php b/user_guide_src/source/libraries/uploaded_files/022.php new file mode 100644 index 000000000000..e834acba3d23 --- /dev/null +++ b/user_guide_src/source/libraries/uploaded_files/022.php @@ -0,0 +1,3 @@ +move(WRITEPATH . 'uploads', null, true); From eeb04898ba4f48634051147ab9323b4c4a8a8350 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 16:58:46 +0900 Subject: [PATCH 3090/8282] docs: move paragraph --- user_guide_src/source/libraries/uploaded_files.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 9e6d68f92f07..b91b34ecd718 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -324,13 +324,13 @@ You can specify a new filename by passing it as the second parameter: .. literalinclude:: uploaded_files/017.php -By default, if the destination file already exists, a new filename will be used. -For example, if **image_name.jpg** already exists in the directory, then the -filename will be **image_name_1.jpg**. - Overwriting Existing File ------------------------- +By default, if the destination file already exists, a new filename will be used. +For example, if **image_name.jpg** already exists in the directory, then the +filename will be **image_name_1.jpg** automatically. + You can overwrite the existing file by passing ``true`` as the third parameter: From 3408051ad5c9bf68d7185c86fbee26c5c006ad12 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 16 Jan 2023 10:55:47 +0900 Subject: [PATCH 3091/8282] docs: add PHPDoc types --- app/Config/Filters.php | 6 ++++++ system/Filters/Filters.php | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 7b70c4fb3381..68600771f5cd 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -14,6 +14,9 @@ class Filters extends BaseConfig /** * Configures aliases for Filter classes to * make reading things nicer and simpler. + * + * @var array + * @phpstan-var array */ public array $aliases = [ 'csrf' => CSRF::class, @@ -26,6 +29,9 @@ class Filters extends BaseConfig /** * List of filter aliases that are always * applied before and after every request. + * + * @var array>>|array> + * @phpstan-var array>|array>> */ public array $globals = [ 'before' => [ diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 30e36a32c65f..3c4468110531 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -63,7 +63,7 @@ class Filters * The processed filters that will * be used to check against. * - * @var array + * @var array */ protected $filters = [ 'before' => [], @@ -74,7 +74,7 @@ class Filters * The collection of filters' class names that will * be used to execute in each position. * - * @var array + * @var array */ protected $filtersClass = [ 'before' => [], @@ -84,14 +84,16 @@ class Filters /** * Any arguments to be passed to filters. * - * @var array + * @var array> [name => params] + * @phpstan-var array> */ protected $arguments = []; /** * Any arguments to be passed to filtersClass. * - * @var array + * @var array [classname => arguments] + * @phpstan-var array>|null> */ protected $argumentsClass = []; From 4aabafdbab14b78cbf2f41f860632802f72b26b1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 16 Jan 2023 11:02:06 +0900 Subject: [PATCH 3092/8282] style: break long lines --- system/Filters/Filters.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 3c4468110531..010476aec665 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -172,7 +172,10 @@ public function run(string $uri, string $position = 'before') } if ($position === 'before') { - $result = $class->before($this->request, $this->argumentsClass[$className] ?? null); + $result = $class->before( + $this->request, + $this->argumentsClass[$className] ?? null + ); if ($result instanceof RequestInterface) { $this->request = $result; @@ -195,7 +198,11 @@ public function run(string $uri, string $position = 'before') } if ($position === 'after') { - $result = $class->after($this->request, $this->response, $this->argumentsClass[$className] ?? null); + $result = $class->after( + $this->request, + $this->response, + $this->argumentsClass[$className] ?? null + ); if ($result instanceof ResponseInterface) { $this->response = $result; From c242ed5dc1993269f269c7ce19a44ba053639b23 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 17:37:58 +0900 Subject: [PATCH 3093/8282] refactor: extract getCleanName() method --- system/Filters/Filters.php | 39 ++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 010476aec665..3875c075d8ad 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -325,22 +325,18 @@ public function addFilter(string $class, ?string $alias = null, string $when = ' * after the filter name, followed by a comma-separated list of arguments that * are passed to the filter when executed. * + * @param string $name filter_name or filter_name:arguments like 'role:admin,manager' + * * @return Filters * * @deprecated Use enableFilters(). This method will be private. */ public function enableFilter(string $name, string $when = 'before') { - // Get parameters and clean name - if (strpos($name, ':') !== false) { - [$name, $params] = explode(':', $name); - - $params = explode(',', $params); - array_walk($params, static function (&$item) { - $item = trim($item); - }); - - $this->arguments[$name] = $params; + // Get arguments and clean name + [$name, $arguments] = $this->getCleanName($name); + if ($arguments !== []) { + $this->arguments[$name] = $arguments; } if (class_exists($name)) { @@ -363,6 +359,29 @@ public function enableFilter(string $name, string $when = 'before') return $this; } + /** + * Get clean name and arguments + * + * @param string $name filter_name or filter_name:arguments like 'role:admin,manager' + * + * @return array [name, arguments] + */ + private function getCleanName(string $name): array + { + $arguments = []; + + if (strpos($name, ':') !== false) { + [$name, $arguments] = explode(':', $name); + + $arguments = explode(',', $arguments); + array_walk($arguments, static function (&$item) { + $item = trim($item); + }); + } + + return [$name, $arguments]; + } + /** * Ensures that specific filters are on and enabled for the current request. * From bd62d40a4746d5e3c206eb35a8d716844d2ab3c0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 18:54:26 +0900 Subject: [PATCH 3094/8282] docs: add PHPDoc types --- system/Filters/Filters.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 3875c075d8ad..253e3ba9a792 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -365,6 +365,7 @@ public function enableFilter(string $name, string $when = 'before') * @param string $name filter_name or filter_name:arguments like 'role:admin,manager' * * @return array [name, arguments] + * @phpstan-return array{0: string, 1: list} */ private function getCleanName(string $name): array { @@ -389,6 +390,8 @@ private function getCleanName(string $name): array * after the filter name, followed by a comma-separated list of arguments that * are passed to the filter when executed. * + * @params array $names filter_name or filter_name:arguments like 'role:admin,manager' + * * @return Filters */ public function enableFilters(array $names, string $when = 'before') From ac730dddf43deed0275a00b4673e3b09f825501e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 18:55:08 +0900 Subject: [PATCH 3095/8282] docs: update comment --- system/Filters/Filters.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 253e3ba9a792..8dfd1a2082b4 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -531,8 +531,8 @@ protected function processAliasesToClass(string $position) } } - // when using enableFilter() we already write the class name in ->filtersClass as well as the - // alias in ->filters. This leads to duplicates when using route filters. + // when using enableFilter() we already write the class name in $filtersClass as well as the + // alias in $filters. This leads to duplicates when using route filters. // Since some filters like rate limiters rely on being executed once a request we filter em here. $this->filtersClass[$position] = array_values(array_unique($this->filtersClass[$position])); } From 2b923cd88aa3cbb4dfccc0d371b70683e131cea9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 19:59:36 +0900 Subject: [PATCH 3096/8282] feat: $filters can use filter arguments --- system/Filters/Filters.php | 33 +++++++++++++++++++++++++-- tests/system/Filters/FiltersTest.php | 34 ++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 8dfd1a2082b4..2e198cb89049 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -494,20 +494,49 @@ protected function processFilters(?string $uri = null) // Look for inclusion rules if (isset($settings['before'])) { $path = $settings['before']; + if ($this->pathApplies($uri, $path)) { - $this->filters['before'][] = $alias; + // Get arguments and clean name + [$name, $arguments] = $this->getCleanName($alias); + + $this->filters['before'][] = $name; + + $this->registerArguments($name, $arguments); } } if (isset($settings['after'])) { $path = $settings['after']; + if ($this->pathApplies($uri, $path)) { - $this->filters['after'][] = $alias; + // Get arguments and clean name + [$name, $arguments] = $this->getCleanName($alias); + + $this->filters['after'][] = $name; + + $this->registerArguments($name, $arguments); } } } } + /** + * @param string $name filter alias + * @param array $arguments filter arguments + */ + private function registerArguments(string $name, $arguments): void + { + if ($arguments !== []) { + $this->arguments[$name] = $arguments; + } + + $classNames = (array) $this->config->aliases[$name]; + + foreach ($classNames as $className) { + $this->argumentsClass[$className] = $this->arguments[$name] ?? null; + } + } + /** * Maps filter aliases to the equivalent filter classes * diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index f111f4b957f6..93c425eff395 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -783,6 +783,40 @@ public function testEnableFilter() $this->assertContains('google', $filters['before']); } + public function testFiltersWithArguments() + { + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $config = [ + 'aliases' => ['role' => Role::class], + 'globals' => [ + ], + 'filters' => [ + 'role:admin,super' => [ + 'before' => ['admin/*'], + 'after' => ['admin/*'], + ], + ], + ]; + $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); + $filters = $this->createFilters($filtersConfig); + + $filters = $filters->initialize('admin/foo/bar'); + $found = $filters->getFilters(); + + $this->assertContains('role', $found['before']); + $this->assertSame(['admin', 'super'], $filters->getArguments('role')); + $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments()); + + $response = $filters->run('admin/foo/bar', 'before'); + + $this->assertSame('admin;super', $response); + + $response = $filters->run('admin/foo/bar', 'after'); + + $this->assertSame('admin;super', $response->getBody()); + } + public function testEnableFilterWithArguments() { $_SERVER['REQUEST_METHOD'] = 'GET'; From 29fdf817e5d15bb38a9746d1c8fac6835ae3e5c7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 20:17:04 +0900 Subject: [PATCH 3097/8282] docs: add docs --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + user_guide_src/source/incoming/filters.rst | 25 ++++++++++++++++--- .../source/incoming/filters/009.php | 2 ++ .../source/incoming/filters/012.php | 17 +++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 user_guide_src/source/incoming/filters/012.php diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 748829333165..713322198bc4 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -63,6 +63,7 @@ Others - **Auto Routing (Improved)**: Now you can use URI without a method name like ``product/15`` where ``15`` is an arbitrary number. See :ref:`controller-default-method-fallback` for details. +- **Filters:** Now you can use Filter Arguments with :ref:`$filters property `. Message Changes *************** diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index d768fa9879f7..944bb0c3e50d 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -139,15 +139,34 @@ a list of URI patterns that filter should apply to: .. literalinclude:: filters/009.php -Filter arguments -================= +Filter Arguments +================ -When configuring filters, additional arguments may be passed to a filter when setting up the route: +When configuring filters, additional arguments may be passed to a filter. + +Route +----- + +When setting up the route: .. literalinclude:: filters/010.php In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods. +.. _filter-arguments-filters: + +$filters +-------- + +When setting up the ``$filters``: + +.. literalinclude:: filters/012.php + +In this example, when the URI matches ``admin/*'``, the array ``['admin', 'superadmin']`` +will be passed in ``$arguments`` to the ``group`` filter's ``before()`` methods. +When the URI matches ``admin/users/*'``, the array ``['users.manage']`` +will be passed in ``$arguments`` to the ``permission`` filter's ``before()`` methods. + ****************** Confirming Filters ****************** diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php index 162af6dcbaec..fd9119d21af5 100644 --- a/user_guide_src/source/incoming/filters/009.php +++ b/user_guide_src/source/incoming/filters/009.php @@ -6,6 +6,8 @@ class Filters extends BaseConfig { + // ... + public $filters = [ 'foo' => ['before' => ['admin/*'], 'after' => ['users/*']], 'bar' => ['before' => ['api/*', 'admin/*']], diff --git a/user_guide_src/source/incoming/filters/012.php b/user_guide_src/source/incoming/filters/012.php new file mode 100644 index 000000000000..799bd57fce7d --- /dev/null +++ b/user_guide_src/source/incoming/filters/012.php @@ -0,0 +1,17 @@ + ['before' => ['admin/*']], + 'permission:users.manage' => ['before' => ['admin/users/*']], + ]; + + // ... +} From a0827790c76d7ff4b38c395988d89c85d8842ca0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 20:50:36 +0900 Subject: [PATCH 3098/8282] docs: improve docs --- user_guide_src/source/changelogs/v4.4.0.rst | 2 +- user_guide_src/source/incoming/filters.rst | 22 +++++-------------- user_guide_src/source/incoming/routing.rst | 12 +++++++++- .../{filters/010.php => routing/067.php} | 0 4 files changed, 17 insertions(+), 19 deletions(-) rename user_guide_src/source/incoming/{filters/010.php => routing/067.php} (100%) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 713322198bc4..e3825c469530 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -63,7 +63,7 @@ Others - **Auto Routing (Improved)**: Now you can use URI without a method name like ``product/15`` where ``15`` is an arbitrary number. See :ref:`controller-default-method-fallback` for details. -- **Filters:** Now you can use Filter Arguments with :ref:`$filters property `. +- **Filters:** Now you can use Filter Arguments with :ref:`$filters property `. Message Changes *************** diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 944bb0c3e50d..353661e510b6 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -139,26 +139,14 @@ a list of URI patterns that filter should apply to: .. literalinclude:: filters/009.php -Filter Arguments -================ - -When configuring filters, additional arguments may be passed to a filter. - -Route ------ - -When setting up the route: +.. _filters-filters-filter-arguments: -.. literalinclude:: filters/010.php - -In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods. - -.. _filter-arguments-filters: +Filter Arguments +---------------- -$filters --------- +.. versionadded:: 4.4.0 -When setting up the ``$filters``: +When configuring ``$filters``, additional arguments may be passed to a filter: .. literalinclude:: filters/012.php diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index fffa5cb1bdb8..f18edede419c 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -406,7 +406,7 @@ The value for the filter can be a string or an array of strings: * matching the aliases defined in **app/Config/Filters.php**. * filter classnames -See :doc:`Controller filters ` for more information on setting up filters. +See :doc:`Controller Filters ` for more information on setting up filters. .. Warning:: If you set filters to routes in **app/Config/Routes.php** (not in **app/Config/Filters.php**), it is recommended to disable Auto Routing (Legacy). @@ -446,6 +446,16 @@ You specify an array for the filter value: .. literalinclude:: routing/037.php +Filter Arguments +^^^^^^^^^^^^^^^^ + +Additional arguments may be passed to a filter: + +.. literalinclude:: routing/067.php + +In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` +to the filter's ``before()`` and ``after()`` implementation methods. + .. _assigning-namespace: Assigning Namespace diff --git a/user_guide_src/source/incoming/filters/010.php b/user_guide_src/source/incoming/routing/067.php similarity index 100% rename from user_guide_src/source/incoming/filters/010.php rename to user_guide_src/source/incoming/routing/067.php From 9c36d01ff4b4120157485cd695e1d88548a886da Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 21:34:38 +0900 Subject: [PATCH 3099/8282] docs: make @return more specific --- system/Filters/Filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 2e198cb89049..fa17d505fb62 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -327,7 +327,7 @@ public function addFilter(string $class, ?string $alias = null, string $when = ' * * @param string $name filter_name or filter_name:arguments like 'role:admin,manager' * - * @return Filters + * @return $this * * @deprecated Use enableFilters(). This method will be private. */ From 4d525eb78a3ab47322a9cb33f700b78da1301376 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 21 Jan 2023 21:40:24 +0900 Subject: [PATCH 3100/8282] feat: throws exception if the filter arguments already defined --- system/Filters/Filters.php | 21 ++++++++--- tests/system/Filters/FiltersTest.php | 53 ++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index fa17d505fb62..829ad565cb1a 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Filters; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Filters\Exceptions\FilterException; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; @@ -84,8 +85,8 @@ class Filters /** * Any arguments to be passed to filters. * - * @var array> [name => params] - * @phpstan-var array> + * @var array|null> [name => params] + * @phpstan-var array|null> */ protected $arguments = []; @@ -337,6 +338,8 @@ public function enableFilter(string $name, string $when = 'before') [$name, $arguments] = $this->getCleanName($name); if ($arguments !== []) { $this->arguments[$name] = $arguments; + } else { + $this->arguments[$name] = null; } if (class_exists($name)) { @@ -514,7 +517,9 @@ protected function processFilters(?string $uri = null) $this->filters['after'][] = $name; - $this->registerArguments($name, $arguments); + // The arguments may have already been registered in the before filter. + // So disable check. + $this->registerArguments($name, $arguments, false); } } } @@ -523,10 +528,18 @@ protected function processFilters(?string $uri = null) /** * @param string $name filter alias * @param array $arguments filter arguments + * @param bool $check if true, check if already defined */ - private function registerArguments(string $name, $arguments): void + private function registerArguments(string $name, array $arguments, bool $check = true): void { if ($arguments !== []) { + if ($check && array_key_exists($name, $this->arguments)) { + throw new ConfigException( + '"' . $name . '" has already arguments: ' + . (($this->arguments[$name] === null) ? 'null' : implode(',', $this->arguments[$name])) + ); + } + $this->arguments[$name] = $arguments; } diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index 93c425eff395..9b01988e2e14 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Filters; use CodeIgniter\Config\Services; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Filters\Exceptions\FilterException; use CodeIgniter\Filters\fixtures\GoogleCurious; use CodeIgniter\Filters\fixtures\GoogleEmpty; @@ -817,6 +818,58 @@ public function testFiltersWithArguments() $this->assertSame('admin;super', $response->getBody()); } + public function testFilterWithArgumentsIsDefined() + { + $this->expectException(ConfigException::class); + $this->expectExceptionMessage('"role" has already arguments: admin,super'); + + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $config = [ + 'aliases' => ['role' => Role::class], + 'globals' => [], + 'filters' => [ + 'role:admin,super' => [ + 'before' => ['admin/*'], + ], + 'role:super' => [ + 'before' => ['admin/user/*'], + ], + ], + ]; + $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); + $filters = $this->createFilters($filtersConfig); + + $filters->initialize('admin/user/bar'); + } + + public function testFilterWithoutArgumentsIsDefined() + { + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $config = [ + 'aliases' => ['role' => Role::class], + 'globals' => [], + 'filters' => [ + 'role' => [ + 'before' => ['admin/*'], + ], + 'role:super' => [ + 'before' => ['admin/user/*'], + ], + ], + ]; + $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); + $filters = $this->createFilters($filtersConfig); + + $filters = $filters->initialize('admin/user/bar'); + $found = $filters->getFilters(); + + $this->assertContains('role', $found['before']); + $this->assertSame(['super'], $filters->getArguments('role')); + $this->assertSame(['role' => ['super']], $filters->getArguments()); + } + public function testEnableFilterWithArguments() { $_SERVER['REQUEST_METHOD'] = 'GET'; From e3ea3ed468eae1cc6cbd599447a0621b931f899f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 11:48:51 +0900 Subject: [PATCH 3101/8282] refactor: by rector --- system/Filters/Filters.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 829ad565cb1a..2dc0efc66104 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -335,12 +335,8 @@ public function addFilter(string $class, ?string $alias = null, string $when = ' public function enableFilter(string $name, string $when = 'before') { // Get arguments and clean name - [$name, $arguments] = $this->getCleanName($name); - if ($arguments !== []) { - $this->arguments[$name] = $arguments; - } else { - $this->arguments[$name] = null; - } + [$name, $arguments] = $this->getCleanName($name); + $this->arguments[$name] = ($arguments !== []) ? $arguments : null; if (class_exists($name)) { $this->config->aliases[$name] = $name; From b768f8f8b80d70082b5fe716bc2db643abfb73ab Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 23 Jan 2023 11:59:04 +0900 Subject: [PATCH 3102/8282] docs: add about route filter config --- user_guide_src/source/incoming/filters.rst | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 353661e510b6..1a80df9d091b 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -6,10 +6,12 @@ Controller Filters :local: :depth: 2 -Controller Filters allow you to perform actions either before or after the controllers execute. Unlike :doc:`events `, -you can choose the specific URIs in which the filters will be applied to. Incoming filters may +Controller Filters allow you to perform actions either before or after the controllers execute. Unlike :doc:`/extending/events`, +you can choose the specific URIs or routes in which the filters will be applied to. Before filters may modify the Request while after filters can act on and even modify the Response, allowing for a lot of flexibility -and power. Some common examples of tasks that might be performed with filters are: +and power. + +Some common examples of tasks that might be performed with filters are: * Performing CSRF protection on the incoming requests * Restricting areas of your site based upon their Role @@ -64,11 +66,13 @@ the final output, or even to filter the final output with a bad words filter. Configuring Filters ******************* -Once you've created your filters, you need to configure when they get run. This is done in **app/Config/Filters.php**. -This file contains four properties that allow you to configure exactly when the filters run. +Once you've created your filters, you need to configure when they get run. This is done in **app/Config/Filters.php** or **app/Config/Routes.php**. .. Note:: The safest way to apply filters is to :ref:`disable auto-routing `, and :ref:`set filters to routes `. +The **app/Config/Filters.php** file contains four properties that allow you to +configure exactly when the filters run. + .. Warning:: It is recommended that you should always add ``*`` at the end of a URI in the filter settings. Because a controller method might be accessible by different URLs than you think. For example, when :ref:`auto-routing-legacy` is enabled, if you have ``Blog::index``, From 5c46faaec0ae034e92cc298107a3018fd1c49052 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 16:57:43 +0900 Subject: [PATCH 3103/8282] fix: exception message Co-authored-by: MGatner --- system/Filters/Filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 2dc0efc66104..4ef34431723f 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -531,7 +531,7 @@ private function registerArguments(string $name, array $arguments, bool $check = if ($arguments !== []) { if ($check && array_key_exists($name, $this->arguments)) { throw new ConfigException( - '"' . $name . '" has already arguments: ' + '"' . $name . '" already has arguments: ' . (($this->arguments[$name] === null) ? 'null' : implode(',', $this->arguments[$name])) ); } From 66083fa32491665a2a5de973b08e30e6b428788e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 17:06:45 +0900 Subject: [PATCH 3104/8282] test: update test --- tests/system/Filters/FiltersTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index 9b01988e2e14..88924de7bcff 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -821,7 +821,7 @@ public function testFiltersWithArguments() public function testFilterWithArgumentsIsDefined() { $this->expectException(ConfigException::class); - $this->expectExceptionMessage('"role" has already arguments: admin,super'); + $this->expectExceptionMessage('"role" already has arguments: admin,super'); $_SERVER['REQUEST_METHOD'] = 'GET'; From 9d664901fff60064ba62ab530a17373d7715fd9f Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 17:28:47 +0900 Subject: [PATCH 3105/8282] test: add test --- tests/system/CodeIgniterTest.php | 41 ++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 1a5e50fc0775..16c7acd1a5e3 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter; use CodeIgniter\Config\Services; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Response; use CodeIgniter\Router\RouteCollection; use CodeIgniter\Test\CIUnitTestCase; @@ -19,7 +20,7 @@ use CodeIgniter\Test\Mock\MockCodeIgniter; use Config\App; use Config\Cache; -use Config\Filters; +use Config\Filters as FiltersConfig; use Config\Modules; use Tests\Support\Filters\Customfilter; @@ -274,6 +275,42 @@ public function testControllersRunFilterByClassName() $this->resetServices(); } + public function testRegisterSameFilterTwiceWithDifferentArgument() + { + $this->expectException(ConfigException::class); + $this->expectExceptionMessage('"test-customfilter" already has arguments: null'); + + $_SERVER['argv'] = ['index.php', 'pages/about']; + $_SERVER['argc'] = 2; + + $_SERVER['REQUEST_URI'] = '/pages/about'; + + $routes = Services::routes(); + $routes->add( + 'pages/about', + static fn () => Services::incomingrequest()->getBody(), + // Set filter with no argument. + ['filter' => 'test-customfilter'] + ); + + $router = Services::router($routes, Services::incomingrequest()); + Services::injectMock('router', $router); + + /** @var FiltersConfig $filterConfig */ + $filterConfig = config('Filters'); + $filterConfig->filters = [ + // Set filter with argument. + 'test-customfilter:arg1' => [ + 'before' => ['pages/*'], + ], + ]; + Services::filters($filterConfig); + + $this->codeigniter->run(); + + $this->resetServices(); + } + public function testDisableControllerFilters() { $_SERVER['argv'] = ['index.php', 'pages/about']; @@ -666,7 +703,7 @@ public function testPageCacheSendSecureHeaders() $router = Services::router($routes, Services::incomingrequest()); Services::injectMock('router', $router); - /** @var Filters $filterConfig */ + /** @var FiltersConfig $filterConfig */ $filterConfig = config('Filters'); $filterConfig->globals['after'] = ['secureheaders']; Services::filters($filterConfig); From 472562d984f1c8940c18a22876f5510613f0fe3d Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 17:31:11 +0900 Subject: [PATCH 3106/8282] test: improve test method --- tests/system/CodeIgniterTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 16c7acd1a5e3..fa9b8e0f71d2 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -252,7 +252,7 @@ public function testControllersCanReturnDownloadResponseObject() $this->assertSame('some text', $output); } - public function testControllersRunFilterByClassName() + public function testRunExecuteFilterByClassName() { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; From 46727ea30b4e14fcddcd0caa5c298f441f0104e2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 17:43:32 +0900 Subject: [PATCH 3107/8282] style: break long lines --- tests/system/CodeIgniterTest.php | 62 ++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index fa9b8e0f71d2..daea86b8cc51 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -189,7 +189,10 @@ public function testControllersCanReturnString() // Inject mock router. $routes = Services::routes(); - $routes->add('pages/(:segment)', static fn ($segment) => 'You want to see "' . esc($segment) . '" page.'); + $routes->add( + 'pages/(:segment)', + static fn ($segment) => 'You want to see "' . esc($segment) . '" page.' + ); $router = Services::router($routes, Services::incomingrequest()); Services::injectMock('router', $router); @@ -261,7 +264,11 @@ public function testRunExecuteFilterByClassName() // Inject mock router. $routes = Services::routes(); - $routes->add('pages/about', static fn () => Services::incomingrequest()->getBody(), ['filter' => Customfilter::class]); + $routes->add( + 'pages/about', + static fn () => Services::incomingrequest()->getBody(), + ['filter' => Customfilter::class] + ); $router = Services::router($routes, Services::incomingrequest()); Services::injectMock('router', $router); @@ -743,8 +750,11 @@ public function testPageCacheSendSecureHeaders() * * @see https://github.com/codeigniter4/CodeIgniter4/pull/6410 */ - public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $expectedPagesInCache, array $testingUrls) - { + public function testPageCacheWithCacheQueryString( + $cacheQueryStringValue, + int $expectedPagesInCache, + array $testingUrls + ) { // Suppress command() output CITestStreamFilter::$buffer = ''; $outputStreamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter'); @@ -766,7 +776,10 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e $_SERVER['REQUEST_URI'] = '/' . $testingUrl; $routes = Services::routes(true); $routes->add($testingUrl, static function () { - 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 + // Don't cache the page in the run() function because CodeIgniter + // class will create default $cacheConfig and overwrite settings + // from the dataProvider + CodeIgniter::cache(0); $response = Services::response(); $string = 'This is a test page, to check cache configuration'; @@ -777,9 +790,11 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e $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 + // Cache the page output using default caching function and $cacheConfig + // with value from the data provider $this->codeigniter->run(); - $this->codeigniter->cachePage($cacheConfig); // Cache the page using our own $cacheConfig confugration + // Cache the page using our own $cacheConfig confugration + $this->codeigniter->cachePage($cacheConfig); } // Calculate how much cached items exist in the cache after the test requests @@ -800,17 +815,34 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e public function cacheQueryStringProvider(): array { $testingUrls = [ - 'test', // URL #1 - 'test?important_parameter=1', // URL #2 - 'test?important_parameter=2', // URL #3 - 'test?important_parameter=1¬_important_parameter=2', // URL #4 - 'test?important_parameter=1¬_important_parameter=2&another_not_important_parameter=3', // URL #5 + // URL #1 + 'test', + // URL #2 + 'test?important_parameter=1', + // URL #3 + 'test?important_parameter=2', + // URL #4 + 'test?important_parameter=1¬_important_parameter=2', + // URL #5 + 'test?important_parameter=1¬_important_parameter=2&another_not_important_parameter=3', ]; return [ - '$cacheQueryString=false' => [false, 1, $testingUrls], // We expect only 1 page in the cache, because when cacheQueryString is set to false, all GET parameter should be ignored, and page URI will be absolutely same "/test" string for all 5 requests - '$cacheQueryString=true' => [true, 5, $testingUrls], // We expect all 5 pages in the cache, because when cacheQueryString is set to true, all GET parameter should be processed as unique requests - '$cacheQueryString=array' => [['important_parameter'], 3, $testingUrls], // We expect only 3 pages in the cache, because when cacheQueryString is set to array with important parameters, we should ignore all parameters thats not in the array. Only URL #1, URL #2 and URL #3 should be cached. URL #4 and URL #5 is duplication of URL #2 (with value ?important_parameter=1), so they should not be processed as new unique requests and application should return already cached page for URL #2 + // We expect only 1 page in the cache, because when cacheQueryString + // is set to false, all GET parameter should be ignored, and page URI + // will be absolutely same "/test" string for all 5 requests + '$cacheQueryString=false' => [false, 1, $testingUrls], + // We expect all 5 pages in the cache, because when cacheQueryString + // is set to true, all GET parameter should be processed as unique requests + '$cacheQueryString=true' => [true, 5, $testingUrls], + // We expect only 3 pages in the cache, because when cacheQueryString + // is set to array with important parameters, we should ignore all + // parameters thats not in the array. Only URL #1, URL #2 and URL #3 + // should be cached. URL #4 and URL #5 is duplication of URL #2 + // (with value ?important_parameter=1), so they should not be processed + // as new unique requests and application should return already cached + // page for URL #2 + '$cacheQueryString=array' => [['important_parameter'], 3, $testingUrls], ]; } } From 31b8b63467ac5c5a62b06f67e32a352e5d106bbb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 31 Jan 2023 17:54:08 +0900 Subject: [PATCH 3108/8282] docs: fix typo Co-authored-by: Michal Sniatala --- user_guide_src/source/installation/upgrade_4xx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index c28dca9cdf4f..0e57504934be 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -100,7 +100,7 @@ Class Loading namespaces; with Composer autoloading support. - You can configure the class loading to support whatever application structure you are most comfortable with, including the "HMVC" style. -- Ci4 provides :doc:`../concepts/factories` that can load a class and share the +- CI4 provides :doc:`../concepts/factories` that can load a class and share the instance like ``$this->load`` in CI3. Libraries From 89f499e54cd952dde81b669c439ae4fb534325b0 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Wed, 1 Feb 2023 09:04:08 +0800 Subject: [PATCH 3109/8282] Feature: New method DownloadResponse::inline() --- system/HTTP/DownloadResponse.php | 17 ++++++++++++++++- tests/system/HTTP/DownloadResponseTest.php | 8 ++++++++ user_guide_src/source/changelogs/v4.4.0.rst | 4 ++++ user_guide_src/source/outgoing/response.rst | 8 ++++++++ user_guide_src/source/outgoing/response/028.php | 6 ++++++ 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 user_guide_src/source/outgoing/response/028.php diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php index 899bec8583c6..022f12560f5c 100644 --- a/system/HTTP/DownloadResponse.php +++ b/system/HTTP/DownloadResponse.php @@ -269,7 +269,10 @@ public function buildHeaders() $this->setContentTypeByMimeType(); } - $this->setHeader('Content-Disposition', $this->getContentDisposition()); + if (! $this->hasHeader('Content-Disposition')) { + $this->setHeader('Content-Disposition', $this->getContentDisposition()); + } + $this->setHeader('Expires-Disposition', '0'); $this->setHeader('Content-Transfer-Encoding', 'binary'); $this->setHeader('Content-Length', (string) $this->getContentLength()); @@ -325,4 +328,16 @@ private function sendBodyByBinary() return $this; } + + /** + * Sets the response header to display the file in the browser. + * + * @return DownloadResponse + */ + public function inline() + { + $this->setHeader('Content-Disposition', 'inline'); + + return $this; + } } diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index fe320705b290..7068434a6fda 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -120,6 +120,14 @@ public function testSetFileName() $this->assertSame('attachment; filename="myFile.txt"; filename*=UTF-8\'\'myFile.txt', $response->getHeaderLine('Content-Disposition')); } + public function testDispositionInline(): void + { + $response = new DownloadResponse('unit-test.txt', true); + $response->inline(); + $response->buildHeaders(); + $this->assertSame('inline', $response->getHeaderLine('Content-Disposition')); + } + public function testNoCache() { $response = new DownloadResponse('unit-test.txt', true); diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 748829333165..1f1705dbd877 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -28,6 +28,8 @@ Method Signature Changes Enhancements ************ +- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the file +in the browser. Commands ======== @@ -69,6 +71,8 @@ Message Changes Changes ******* +- The ``DownloadResponse`` class, when generating response headers, does not replace the ``Content-Disposition`` header +if it was previously specified. Deprecations ************ diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index c3c10bc8d40d..e4fabdf8d451 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -93,6 +93,14 @@ Use the optional ``setFileName()`` method to change the filename as it is sent t .. note:: The response object MUST be returned for the download to be sent to the client. This allows the response to be passed through all **after** filters before being sent to the client. +Open file in browser +-------------------- + +Some browsers can display files such as PDF. To tell the browser to display the file instead of saving it, call the +``DownloadResponse::inline()`` method. + +.. literalinclude:: response/007.php + HTTP Caching ============ diff --git a/user_guide_src/source/outgoing/response/028.php b/user_guide_src/source/outgoing/response/028.php new file mode 100644 index 000000000000..8afaf84960ab --- /dev/null +++ b/user_guide_src/source/outgoing/response/028.php @@ -0,0 +1,6 @@ +response->download($name, $data)->inline(); From 2f5980922257da10db9843db25d25986223d83bb Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Wed, 1 Feb 2023 09:22:07 +0800 Subject: [PATCH 3110/8282] fix doc --- user_guide_src/source/changelogs/v4.4.0.rst | 6 ++++-- user_guide_src/source/outgoing/response.rst | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 1f1705dbd877..bfcd77504631 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -28,8 +28,9 @@ Method Signature Changes Enhancements ************ -- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the file -in the browser. + +- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the +file in the browser. Commands ======== @@ -71,6 +72,7 @@ Message Changes Changes ******* + - The ``DownloadResponse`` class, when generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index e4fabdf8d451..914c0f94734d 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -99,7 +99,7 @@ Open file in browser Some browsers can display files such as PDF. To tell the browser to display the file instead of saving it, call the ``DownloadResponse::inline()`` method. -.. literalinclude:: response/007.php +.. literalinclude:: response/028.php HTTP Caching ============ From c8795464108db008466e8cbc453caef032c5cf7d Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Wed, 1 Feb 2023 09:37:25 +0800 Subject: [PATCH 3111/8282] fix doc2 --- user_guide_src/source/changelogs/v4.4.0.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index bfcd77504631..8d46a98b9cff 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -29,8 +29,7 @@ Method Signature Changes Enhancements ************ -- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the -file in the browser. +- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the file in the browser. Commands ======== @@ -73,8 +72,7 @@ Message Changes Changes ******* -- The ``DownloadResponse`` class, when generating response headers, does not replace the ``Content-Disposition`` header -if it was previously specified. +- The ``DownloadResponse`` class, when generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. Deprecations ************ From 975210720c92576504e34bbe1e43242b77140450 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 09:19:05 +0900 Subject: [PATCH 3112/8282] chore: remove post-update-cmd If a dev has installed the Composer packages, they will be used. There is no need to update the source code in the system/ThirdParty/ folder. --- admin/framework/composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 2cf6c1c76de2..248eea0c96cc 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -56,9 +56,6 @@ ] }, "scripts": { - "post-update-cmd": [ - "CodeIgniter\\ComposerScripts::postUpdate" - ], "test": "phpunit" }, "support": { From fd029ccc1d3170e7b78df9716a76c0e88e1e4cef Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 30 Jan 2023 10:06:49 +0900 Subject: [PATCH 3113/8282] docs: add upgrading guide --- .../source/installation/upgrade_432.rst | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index f61e57012d6a..e6d630eb47b4 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -27,6 +27,28 @@ slash (``/``). Now it returns baseURL with a trailing slash. For example: If you have code to call ``base_url()`` without argument, you may need to adjust the URLs. +Mandatory File Changes +********************** + +composer.json +============= + +If you have installed CodeIgnter manually and are using or planning to use Composer, +remove the following line: + +.. code-block:: text + + { + ... + "scripts": { + "post-update-cmd": [ + "CodeIgniter\\ComposerScripts::postUpdate" <-- Remove this line + ], + "test": "phpunit" + }, + ... + } + Project Files ************* From 77a67d01eaf88d443d3e5c79091180758451dd28 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Feb 2023 16:45:10 +0900 Subject: [PATCH 3114/8282] docs: update sample code The value to be validated is not necessarily a string. --- user_guide_src/source/libraries/validation/034.php | 4 ++-- user_guide_src/source/libraries/validation/035.php | 4 ++-- user_guide_src/source/libraries/validation/037.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php index 282bef9aabbc..42be12c4cbcf 100644 --- a/user_guide_src/source/libraries/validation/034.php +++ b/user_guide_src/source/libraries/validation/034.php @@ -2,8 +2,8 @@ class MyRules { - public function even(string $str): bool + public function even($value): bool { - return (int) $str % 2 === 0; + return (int) $value % 2 === 0; } } diff --git a/user_guide_src/source/libraries/validation/035.php b/user_guide_src/source/libraries/validation/035.php index 843b623ba98c..7a571e232efe 100644 --- a/user_guide_src/source/libraries/validation/035.php +++ b/user_guide_src/source/libraries/validation/035.php @@ -2,9 +2,9 @@ class MyRules { - public function even(string $str, ?string &$error = null): bool + public function even($value, ?string &$error = null): bool { - if ((int) $str % 2 !== 0) { + if ((int) $value % 2 !== 0) { $error = lang('myerrors.evenError'); return false; diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php index 9e13c663b0d7..450c5de1a9cc 100644 --- a/user_guide_src/source/libraries/validation/037.php +++ b/user_guide_src/source/libraries/validation/037.php @@ -2,14 +2,14 @@ class MyRules { - public function required_with($str, string $fields, array $data): bool + public function required_with($value, string $params, array $data): bool { - $fields = explode(',', $fields); + $params = explode(',', $params); // If the field is present we can safely assume that // the field is here, no matter whether the corresponding // search field is present or not. - $present = $this->required($str ?? ''); + $present = $this->required($value ?? ''); if ($present) { return true; @@ -20,7 +20,7 @@ public function required_with($str, string $fields, array $data): bool // as $fields is the lis $requiredFields = []; - foreach ($fields as $field) { + foreach ($params as $field) { if (array_key_exists($field, $data)) { $requiredFields[] = $field; } From bc432c7873896148f82469dad2befab79492946e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Feb 2023 16:48:43 +0900 Subject: [PATCH 3115/8282] docs: update description The value to be validated is not necessarily a string. --- user_guide_src/source/libraries/validation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 045abc4604c1..f913079d6f9d 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -603,7 +603,7 @@ shown above. The primary benefit here is that it provides some extra navigation Creating a Rule Class --------------------- -Within the file itself, each method is a rule and must accept a string as the first parameter, and must return +Within the file itself, each method is a rule and must accept a value to validate as the first parameter, and must return a boolean true or false value signifying true if it passed the test or false if it did not: .. literalinclude:: validation/034.php @@ -624,7 +624,7 @@ Your new custom rule could now be used just like any other rule: Allowing Parameters ------------------- -If your method needs to work with parameters, the function will need a minimum of three parameters: the string to validate, +If your method needs to work with parameters, the function will need a minimum of three parameters: the value to validate, the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy for rules like ``required_with`` that needs to check the value of another submitted field to base its result on: From d7c0af733ac12a902cb6347fa8bdd8a2879d4784 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Feb 2023 16:51:19 +0900 Subject: [PATCH 3116/8282] docs: improve description --- user_guide_src/source/libraries/validation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index f913079d6f9d..7e1731de5f82 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -609,7 +609,7 @@ a boolean true or false value signifying true if it passed the test or false if .. literalinclude:: validation/034.php By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used -within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the +within errors. In custom rules, you may provide error messages by accepting a ``&$error`` variable by reference in the second parameter: .. literalinclude:: validation/035.php @@ -630,7 +630,7 @@ for rules like ``required_with`` that needs to check the value of another submit .. literalinclude:: validation/037.php -Custom errors can be returned as the fourth parameter, just as described above. +Custom errors can be returned as the fourth parameter ``&$error``, just as described above. .. _validation-using-closure-rule: From 10235a606c10c36ece138bac20e5e07897b27cd1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:47:17 +0900 Subject: [PATCH 3117/8282] docs: move / after folder names --- user_guide_src/source/outgoing/localization.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 2a1f3f5b4197..d6e4a1d1a47b 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -17,11 +17,11 @@ with different supported languages. Language strings are stored in the **app/Language** directory, with a sub-directory for each supported language:: - /app - /Language - /en + app/ + Language/ + en/ App.php - /fr + fr/ App.php .. important:: Locale detection only works for web-based requests that use the IncomingRequest class. From c7e34fbeec7b5d1a89ed906b69ca59c7a52acc1e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:48:53 +0900 Subject: [PATCH 3118/8282] docs: use ** for file paths --- .../source/outgoing/localization.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index d6e4a1d1a47b..beedb5743125 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -30,7 +30,7 @@ supported language:: Configuring the Locale ====================== -Every site will have a default language/locale they operate in. This can be set in **Config/App.php**: +Every site will have a default language/locale they operate in. This can be set in **app/Config/App.php**: .. literalinclude:: localization/001.php @@ -57,7 +57,7 @@ Should you ever need to set the locale directly you may use ``IncomingRequest::s Content Negotiation ------------------- -You can set up content negotiation to happen automatically by setting two additional settings in Config/App. +You can set up content negotiation to happen automatically by setting two additional settings in **app/Config/App.php**. The first value tells the Request class that we do want to negotiate a locale, so simply set it to true: .. literalinclude:: localization/002.php @@ -129,7 +129,7 @@ Basic Usage You can use the ``lang()`` helper function to retrieve text from any of the language files, by passing the filename and the language key as the first parameter, separated by a period (.). For example, to load the -``errorEmailMissing`` string from the ``Errors`` language file, you would do the following: +``errorEmailMissing`` string from the **Errors.php** language file, you would do the following: .. literalinclude:: localization/010.php @@ -198,8 +198,8 @@ Language Fallback ================= If you have a set of messages for a given locale, for instance -``Language/en/app.php``, you can add language variants for that locale, -each in its own folder, for instance ``Language/en-US/app.php``. +**Language/en/app.php**, you can add language variants for that locale, +each in its own folder, for instance **Language/en-US/app.php**. You only need to provide values for those messages that would be localized differently for that locale variant. Any missing message @@ -210,8 +210,8 @@ in case new messages are added to the framework and you haven't had a chance to translate them yet for your locale. So, if you are using the locale ``fr-CA``, then a localized -message will first be sought in ``Language/fr/CA``, then in -``Language/fr``, and finally in ``Language/en``. +message will first be sought in the **Language/fr-CA** directory, then in +the **Language/fr** directory, and finally in the **Language/en** directory. Message Translations ==================== @@ -219,9 +219,9 @@ Message Translations We have an "official" set of translations in their `own repository `_. -You could download that repository, and copy its ``Language`` folder -into your ``app``. The incorporated translations will be automatically -picked up because the ``App`` namespace is mapped to your ``app`` folder. +You could download that repository, and copy its **Language** folder +into your **app** folder. The incorporated translations will be automatically +picked up because the ``App`` namespace is mapped to your **app** folder. Alternately, a better practice would be to ``composer require codeigniter4/translations`` inside your project, and the translated messages will be automatically picked From f0d980f05ef8c5ad0068807fb47464418dd947e2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:50:00 +0900 Subject: [PATCH 3119/8282] docs: add note for namespaces --- user_guide_src/source/outgoing/localization.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index beedb5743125..5fa11bcce51e 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -110,6 +110,8 @@ Language Localization Creating Language Files ======================= +.. note:: The Language Files do not have namespaces. + Languages do not have any specific naming convention that are required. The file should be named logically to describe the type of content it holds. For example, let's say you want to create a file containing error messages. You might name it simply: **Errors.php**. From 743f44da67cf1aa4de8e396dce3ff31bb6900938 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:50:51 +0900 Subject: [PATCH 3120/8282] docs: improve description --- user_guide_src/source/outgoing/localization.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 5fa11bcce51e..ccec62734a08 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -89,7 +89,7 @@ file: .. literalinclude:: localization/018.php -.. note:: ``useSupportedLocalesOnly()`` can be used since v4.3.0. +.. note:: The ``useSupportedLocalesOnly()`` method can be used since v4.3.0. Retrieving the Current Locale ============================= @@ -225,6 +225,10 @@ You could download that repository, and copy its **Language** folder into your **app** folder. The incorporated translations will be automatically picked up because the ``App`` namespace is mapped to your **app** folder. -Alternately, a better practice would be to ``composer require codeigniter4/translations`` -inside your project, and the translated messages will be automatically picked +Alternately, a better practice would be to run the following command inside your +project:: + + > composer require codeigniter4/translations + +The translated messages will be automatically picked up because the translations folders get mapped appropriately. From c19a9a44f11990b1631253b66c51ea2c678325e5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:51:20 +0900 Subject: [PATCH 3121/8282] docs: replace method with function --- user_guide_src/source/outgoing/localization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index ccec62734a08..9755b50b279a 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -185,7 +185,7 @@ Specifying Locale ----------------- To specify a different locale to be used when replacing parameters, you can pass the locale in as the -third parameter to the ``lang()`` method. +third parameter to the ``lang()`` function. .. literalinclude:: localization/016.php From a10c4f6f032f9531b84a72cec1f1f762df9e0697 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:51:50 +0900 Subject: [PATCH 3122/8282] docs: make function name linkable --- user_guide_src/source/outgoing/localization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 9755b50b279a..7e495adb00e5 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -129,7 +129,7 @@ It also support nested definition: Basic Usage =========== -You can use the ``lang()`` helper function to retrieve text from any of the language files, by passing the +You can use the :php:func:`lang()` helper function to retrieve text from any of the language files, by passing the filename and the language key as the first parameter, separated by a period (.). For example, to load the ``errorEmailMissing`` string from the **Errors.php** language file, you would do the following: From 8a9ed47edd56c418dfe144eebbf67ec06918ab2c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:52:11 +0900 Subject: [PATCH 3123/8282] docs: change text decration --- user_guide_src/source/outgoing/localization.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 7e495adb00e5..2cff7700b091 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -40,9 +40,9 @@ language codes like en-US for American English, or fr-FR, for French/France. A m to this can be found on the `W3C's site `_. The system is smart enough to fall back to more generic language codes if an exact match -cannot be found. If the locale code was set to **en-US** and we only have language files set up for **en** -then those will be used since nothing exists for the more specific **en-US**. If, however, a language -directory existed at **app/Language/en-US** then that would be used first. +cannot be found. If the locale code was set to ``en-US`` and we only have language files set up for ``en`` +then those will be used since nothing exists for the more specific ``en-US``. If, however, a language +directory existed at the **app/Language/en-US** directory then that would be used first. Locale Detection ================ @@ -65,7 +65,7 @@ The first value tells the Request class that we do want to negotiate a locale, s Once this is enabled, the system will automatically negotiate the correct language based upon an array of locales that you have defined in ``$supportLocales``. If no match is found between the languages that you support, and the requested language, the first item in $supportedLocales will be used. In -the following example, the **en** locale would be used if no match is found: +the following example, the ``en`` locale would be used if no match is found: .. literalinclude:: localization/003.php @@ -80,7 +80,7 @@ segment will be your locale: .. literalinclude:: localization/004.php -In this example, if the user tried to visit ``http://example.com/fr/books``, then the locale would be +In this example, if the user tried to visit **http://example.com/fr/books**, then the locale would be set to ``fr``, assuming it was configured as a valid locale. If the value doesn't match a valid locale as defined in ``$supportedLocales`` in **app/Config/App.php**, the default From 58a5509bcadf91cc9ff92bc526207f57a93ee79b Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:52:30 +0900 Subject: [PATCH 3124/8282] docs: add `// ...` in sample code --- user_guide_src/source/outgoing/localization/001.php | 2 ++ user_guide_src/source/outgoing/localization/002.php | 2 ++ user_guide_src/source/outgoing/localization/003.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php index f03d25dc036f..4b0a000e3e44 100644 --- a/user_guide_src/source/outgoing/localization/001.php +++ b/user_guide_src/source/outgoing/localization/001.php @@ -6,6 +6,8 @@ class App extends BaseConfig { + // ... + public string $defaultLocale = 'en'; // ... diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php index f4b4de2818f1..0113956ee4e3 100644 --- a/user_guide_src/source/outgoing/localization/002.php +++ b/user_guide_src/source/outgoing/localization/002.php @@ -6,6 +6,8 @@ class App extends BaseConfig { + // ... + public bool $negotiateLocale = true; // ... diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php index 92d0d75e2e59..72f075a6da92 100644 --- a/user_guide_src/source/outgoing/localization/003.php +++ b/user_guide_src/source/outgoing/localization/003.php @@ -6,6 +6,8 @@ class App extends BaseConfig { + // ... + public array $supportedLocales = ['en', 'es', 'fr-FR']; // ... From aa8fc4861559d1e97d54d6b62b8a67522be719b0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 09:59:18 +0900 Subject: [PATCH 3125/8282] docs: add lang files --- user_guide_src/source/installation/upgrade_4xx.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index 30ccd99f9089..24d4b0d2ea2a 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -41,7 +41,8 @@ Downloads Namespaces ========== -- CI4 is built for PHP 7.4+, and everything in the framework is namespaced, except for the helpers. +- CI4 is built for PHP 7.4+, and everything in the framework is namespaced, + except for the helper and lang files. Application Structure ===================== From 64cd95cdd17495f3f643f25315a2c77e7579e611 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 13:24:25 +0900 Subject: [PATCH 3126/8282] fix: the stack trace displayed when Exception handler runs out of memory is useless --- system/Debug/Exceptions.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index bcce589db894..6dc098d4af10 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -68,6 +68,8 @@ class Exceptions */ protected $response; + private ?Throwable $exceptionCaughtByExceptionHandler = null; + /** * @param CLIRequest|IncomingRequest $request */ @@ -113,6 +115,8 @@ public function initialize() */ public function exceptionHandler(Throwable $exception) { + $this->exceptionCaughtByExceptionHandler = $exception; + [$statusCode, $exitCode] = $this->determineCodes($exception); if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) { @@ -191,6 +195,13 @@ public function shutdownHandler() ['type' => $type, 'message' => $message, 'file' => $file, 'line' => $line] = $error; + if ($this->exceptionCaughtByExceptionHandler) { + $message .= "\n【Previous Exception】\n" + . get_class($this->exceptionCaughtByExceptionHandler) . "\n" + . $this->exceptionCaughtByExceptionHandler->getMessage() . "\n" + . $this->exceptionCaughtByExceptionHandler->getTraceAsString(); + } + if (in_array($type, [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) { $this->exceptionHandler(new ErrorException($message, 0, $type, $file, $line)); } From 9ccc497cb73f70eb7f7c80f3a660b177699fa051 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Feb 2023 22:29:17 +0900 Subject: [PATCH 3127/8282] feat: add --host option to `spark routes` --- system/Commands/Utilities/Routes.php | 24 ++++++++++- tests/_support/Config/Routes.php | 3 ++ tests/system/Commands/RoutesTest.php | 61 +++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index bcd5825c649e..3b0112db828a 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -69,7 +69,8 @@ class Routes extends BaseCommand * @var array */ protected $options = [ - '-h' => 'Sort by Handler.', + '-h' => 'Sort by Handler.', + '--host' => 'Specify hostname in request URI.', ]; /** @@ -78,9 +79,24 @@ class Routes extends BaseCommand public function run(array $params) { $sortByHandler = array_key_exists('h', $params); + $host = $params['host'] ?? null; + + // Set HTTP_HOST + if ($host) { + $request = Services::request(); + $_SERVER = $request->getServer(); + $_SERVER['HTTP_HOST'] = $host; + $request->setGlobal('server', $_SERVER); + } $collection = Services::routes()->loadRoutes(); - $methods = [ + + // Reset HTTP_HOST + if ($host) { + unset($_SERVER['HTTP_HOST']); + } + + $methods = [ 'get', 'head', 'post', @@ -171,6 +187,10 @@ public function run(array $params) usort($tbody, static fn ($handler1, $handler2) => strcmp($handler1[3], $handler2[3])); } + if ($host) { + CLI::write('Host: ' . $host); + } + CLI::table($tbody, $thead); } } diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php index ea288729aa9d..4ba439d4d730 100644 --- a/tests/_support/Config/Routes.php +++ b/tests/_support/Config/Routes.php @@ -14,3 +14,6 @@ // This is a simple file to include for testing the RouteCollection class. $routes->add('testing', 'TestController::index', ['as' => 'testing-index']); $routes->get('closure', static fn () => 'closure test'); +$routes->get('/', 'Blog::index', ['hostname' => 'blog.example.com']); +$routes->get('/', 'Sub::index', ['subdomain' => 'sub']); +$routes->get('/all', 'AllDomain::index', ['subdomain' => '*']); diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 8567dc6bc70a..c183686e6d05 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -53,7 +53,7 @@ private function getCleanRoutes(): RouteCollection public function testRoutesCommand() { - $this->getCleanRoutes(); + Services::injectMock('routes', null); command('routes'); @@ -79,7 +79,7 @@ public function testRoutesCommand() public function testRoutesCommandSortByHandler() { - $this->getCleanRoutes(); + Services::injectMock('routes', null); command('routes -h'); @@ -103,6 +103,62 @@ public function testRoutesCommandSortByHandler() $this->assertStringContainsString($expected, $this->getBuffer()); } + public function testRoutesCommandHostHostname() + { + Services::injectMock('routes', null); + + command('routes --host blog.example.com'); + + $expected = <<<'EOL' + Host: blog.example.com + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Blog::index | | toolbar | + | GET | closure | » | (Closure) | | toolbar | + | GET | all | » | \App\Controllers\AllDomain::index | | toolbar | + | GET | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | HEAD | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | POST | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | PUT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | DELETE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | OPTIONS | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CLI | testing | testing-index | \App\Controllers\TestController::index | | | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + EOL; + $this->assertStringContainsString($expected, $this->getBuffer()); + } + + public function testRoutesCommandHostSubdomain() + { + Services::injectMock('routes', null); + + command('routes --host sub.example.com'); + + $expected = <<<'EOL' + Host: sub.example.com + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + | GET | / | » | \App\Controllers\Sub::index | | toolbar | + | GET | closure | » | (Closure) | | toolbar | + | GET | all | » | \App\Controllers\AllDomain::index | | toolbar | + | GET | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | HEAD | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | POST | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | PUT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | DELETE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | OPTIONS | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | TRACE | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CONNECT | testing | testing-index | \App\Controllers\TestController::index | | toolbar | + | CLI | testing | testing-index | \App\Controllers\TestController::index | | | + +---------+---------+---------------+----------------------------------------+----------------+---------------+ + EOL; + $this->assertStringContainsString($expected, $this->getBuffer()); + } + public function testRoutesCommandAutoRouteImproved() { $routes = $this->getCleanRoutes(); @@ -139,6 +195,7 @@ public function testRoutesCommandAutoRouteImproved() public function testRoutesCommandRouteLegacy() { $routes = $this->getCleanRoutes(); + $routes->loadRoutes(); $routes->setAutoRoute(true); $namespace = 'Tests\Support\Controllers'; From 78280475dd71bfb1bfcbac3a01ce35302633eb0c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 14:09:46 +0900 Subject: [PATCH 3128/8282] docs: add docs --- user_guide_src/source/changelogs/v4.4.0.rst | 3 +++ user_guide_src/source/incoming/routing.rst | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 748829333165..ea3c5f90c326 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -32,6 +32,9 @@ Enhancements Commands ======== +- Now ``spark routes`` command can specify the host in the request URL. + See :ref:`routing-spark-routes-specify-host`. + Testing ======= diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index fffa5cb1bdb8..5c1303b99df2 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -858,3 +858,14 @@ Sort by Handler You can sort the routes by *Handler*:: > php spark routes -h + +.. _routing-spark-routes-specify-host: + +Specify Host +------------ + +.. versionadded:: 4.4.0 + +You can specify the host in the request URL with the ``--host`` option:: + + > php spark routes --host accounts.example.com From 15c3528cbe16a087c0b09860ed57f49c8f59b047 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 14:22:45 +0900 Subject: [PATCH 3129/8282] chore: update psalm-baseline.xml --- psalm-baseline.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 6fe1103175b9..fa3a6f719714 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -125,8 +125,7 @@ - - $routes + $routes From 3937e4f777890aab7ac17811221b2e2bba556499 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 18:39:05 +0900 Subject: [PATCH 3130/8282] test: replace deprecated expectErrorMessage() --- tests/system/Entity/EntityTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 85addb58e56e..4ee74514a1b6 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -429,7 +429,7 @@ public function testCastTimestamp() public function testCastTimestampException() { $this->expectException(CastException::class); - $this->expectErrorMessage('Type casting "timestamp" expects a correct timestamp.'); + $this->expectExceptionMessage('Type casting "timestamp" expects a correct timestamp.'); $entity = $this->getCastEntity(); $entity->ninth = 'some string'; @@ -725,7 +725,7 @@ public function testCustomCast() public function testCustomCastException() { $this->expectException(CastException::class); - $this->expectErrorMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class'); + $this->expectExceptionMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class'); $entity = $this->getCustomCastEntity(); From 10cefa5ccb08b9e13bf7632ca39a3a73db327ace Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:16:26 +0000 Subject: [PATCH 3131/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.10...0.15.11) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 60144c6ecb61..1fbc0fff4537 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.10", + "rector/rector": "0.15.11", "vimeo/psalm": "^5.0" }, "suggest": { From 6469b0704597b4c2883469fa9d94b369ec929876 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Sat, 4 Feb 2023 07:52:20 +0800 Subject: [PATCH 3132/8282] Documentation and changelog changes --- user_guide_src/source/changelogs/v4.4.0.rst | 7 ++++--- user_guide_src/source/outgoing/response.rst | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 8d46a98b9cff..59321b3d0b54 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -29,8 +29,6 @@ Method Signature Changes Enhancements ************ -- Added ``DownloadResponse::inline()`` method that sets the ``Content-Disposition: inline`` header to display the file in the browser. - Commands ======== @@ -61,6 +59,9 @@ Helpers and Functions Others ====== +- **DownloadResponse:** Added ``DownloadResponse::inline()`` method that sets + the ``Content-Disposition: inline`` header to display the file in the browser. + See :ref:`open-file-in-browser` for details. - **View:** Added optional 2nd parameter ``$saveData`` on ``renderSection()`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. - **Auto Routing (Improved)**: Now you can use URI without a method name like ``product/15`` where ``15`` is an arbitrary number. @@ -72,7 +73,7 @@ Message Changes Changes ******* -- The ``DownloadResponse`` class, when generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. +- **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. Deprecations ************ diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 914c0f94734d..3f435702c34d 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -93,7 +93,9 @@ Use the optional ``setFileName()`` method to change the filename as it is sent t .. note:: The response object MUST be returned for the download to be sent to the client. This allows the response to be passed through all **after** filters before being sent to the client. -Open file in browser +.. _open-file-in-browser: + +Open File in Browser -------------------- Some browsers can display files such as PDF. To tell the browser to display the file instead of saving it, call the From 8461519e587a43efc140e40054e1d6b9f262dd5c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:36:59 +0900 Subject: [PATCH 3133/8282] test: replace deprecated assertObjectHasAttribute() --- tests/system/Commands/BaseCommandTest.php | 4 ++-- tests/system/Config/BaseConfigTest.php | 2 +- tests/system/Entity/EntityTest.php | 2 +- tests/system/Log/Handlers/ChromeLoggerHandlerTest.php | 5 +++-- tests/system/Test/FabricatorTest.php | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php index e1b857e40060..068a8d832924 100644 --- a/tests/system/Commands/BaseCommandTest.php +++ b/tests/system/Commands/BaseCommandTest.php @@ -35,14 +35,14 @@ public function testMagicIssetTrue() { $command = new AppInfo($this->logger, service('commands')); - $this->assertObjectHasAttribute('group', $command); + $this->assertTrue(isset($command->group)); } public function testMagicIssetFalse() { $command = new AppInfo($this->logger, service('commands')); - $this->assertObjectNotHasAttribute('foobar', $command); + $this->assertFalse(isset($command->foobar)); } public function testMagicGet() diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 014deca6c344..3d1fe88c53a8 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -110,7 +110,7 @@ public function testEnvironmentOverrides() // override config with shortPrefix ENV var $this->assertSame('hubbahubba', $config->delta); // incorrect env name should not inject property - $this->assertObjectNotHasAttribute('notthere', $config); + $this->assertFalse(property_exists($config, 'notthere')); // empty ENV var should not affect config setting $this->assertSame('pineapple', $config->fruit); // non-empty ENV var should overrideconfig setting diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 4ee74514a1b6..1e03157ab188 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -96,7 +96,7 @@ public function testFill() $this->assertSame(123, $entity->foo); $this->assertSame('bar:234:bar', $entity->bar); - $this->assertObjectNotHasAttribute('baz', $entity); + $this->assertSame(4556, $entity->baz); } /** diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php index 0587763bec09..88a27b45b351 100644 --- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php @@ -66,10 +66,11 @@ public function testSetDateFormat() $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical']; $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']); + $result = $logger->setDateFormat('F j, Y'); - $this->assertObjectHasAttribute('dateFormat', $result); - $this->assertObjectHasAttribute('dateFormat', $logger); + $this->assertSame('F j, Y', $this->getPrivateProperty($result, 'dateFormat')); + $this->assertSame('F j, Y', $this->getPrivateProperty($logger, 'dateFormat')); } public function testChromeLoggerHeaderSent() diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php index 7cadb350e047..6f92be2aaaad 100644 --- a/tests/system/Test/FabricatorTest.php +++ b/tests/system/Test/FabricatorTest.php @@ -406,7 +406,7 @@ public function testCreateMockSetsDatabaseFields() $this->assertIsInt($result->created_at); $this->assertIsInt($result->updated_at); - $this->assertObjectHasAttribute('deleted_at', $result); + $this->assertTrue(property_exists($result, 'deleted_at')); $this->assertNull($result->deleted_at); } From b5355a40b3563d2709229b46c8796da8e244674d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 10:46:42 +0900 Subject: [PATCH 3134/8282] chore: skip AssertPropertyExistsRector --- rector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rector.php b/rector.php index c2f296f5f8e5..797387ba4aba 100644 --- a/rector.php +++ b/rector.php @@ -40,6 +40,7 @@ use Rector\Php71\Rector\FuncCall\CountOnNullRector; use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector; use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector; +use Rector\PHPUnit\Rector\MethodCall\AssertPropertyExistsRector; use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; @@ -80,6 +81,8 @@ __DIR__ . '/tests/_support', JsonThrowOnErrorRector::class, StringifyStrNeedlesRector::class, + // assertObjectHasAttribute() is deprecated + AssertPropertyExistsRector::class, RemoveUnusedPrivateMethodRector::class => [ // private method called via getPrivateMethodInvoker From fe71013b0474f2b67a204e05caa69fc084b3bb4c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 11:18:06 +0900 Subject: [PATCH 3135/8282] chore: add UndefinedClass in psalm-baseline.xml --- psalm-baseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 6fe1103175b9..9816237b9c82 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -172,6 +172,11 @@ UnexsistenceClass + + + SimpleConfig + + 'SomeWidget' From 912153a4d5450046b1f7252627f865af26bdff10 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 10:38:55 +0900 Subject: [PATCH 3136/8282] test: add test --- .../system/Helpers/URLHelper/SiteUrlTest.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 9873292843e5..83de57e83871 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -333,6 +333,28 @@ public function testSiteURLWithAllowedHostname() ); } + public function testSiteURLWithAltConfig() + { + $_SERVER['HTTP_HOST'] = 'www.example.jp'; + $_SERVER['REQUEST_URI'] = '/public'; + $_SERVER['SCRIPT_NAME'] = '/public/index.php'; + + $this->config->baseURL = 'http://example.com/public/'; + $this->config->allowedHostnames = ['www.example.jp']; + + // URI object are updated in IncomingRequest constructor. + $request = Services::incomingrequest($this->config); + Services::injectMock('request', $request); + + $altConfig = clone $this->config; + $altConfig->baseURL = 'http://alt.example.com/public/'; + + $this->assertSame( + 'http://alt.example.com/public/index.php/controller/method', + site_url('controller/method', null, $altConfig) + ); + } + public function testBaseURLWithAllowedHostname() { $_SERVER['HTTP_HOST'] = 'www.example.jp'; From 0f357f2c24963be7c33215d6b635a4ae73f12427 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Feb 2023 10:40:17 +0900 Subject: [PATCH 3137/8282] fix: site_url() does not use alt Config --- system/Helpers/url_helper.php | 40 +++++++++++++------ .../system/Helpers/URLHelper/SiteUrlTest.php | 3 +- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 5b0a0d6a690b..4d286cac4fb3 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -26,12 +26,14 @@ * * @internal Outside the framework this should not be used directly. * - * @param string $relativePath May include queries or fragments + * @param string $relativePath May include queries or fragments + * @param App|null $config Alternative Config to use + * @param bool $useConfig Whether to use the Config baseURL * * @throws HTTPException For invalid paths. * @throws InvalidArgumentException For invalid config. */ - function _get_uri(string $relativePath = '', ?App $config = null): URI + function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfig = false): URI { $config ??= config('App'); @@ -57,9 +59,13 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI $request = Services::request(); /** @var App $config */ - $url = $request instanceof CLIRequest - ? rtrim($config->baseURL, '/ ') . '/' - : $request->getUri()->getBaseURL(); + if ($useConfig) { + $url = rtrim($config->baseURL, '/ ') . '/'; + } else { + $url = $request instanceof CLIRequest + ? rtrim($config->baseURL, '/ ') . '/' + : $request->getUri()->getBaseURL(); + } // Check for an index page if ($config->indexPage !== '') { @@ -88,18 +94,28 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI /** * Returns a site URL as defined by the App config. * - * @param array|string $relativePath URI string or array of URI segments - * @param string|null $scheme URI scheme. E.g., http, ftp - * @param App|null $config Alternate configuration to use + * @param array|string $relativePath URI string or array of URI segments + * @param string|null $scheme URI scheme. E.g., http, ftp + * @param App|null $config Alternate configuration to use + * @param bool $dontUseConfig Set true if you don't use the Config + * baseURL even when you pass the Config */ - function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string - { + function site_url( + $relativePath = '', + ?string $scheme = null, + ?App $config = null, + bool $dontUseConfig = false + ): string { + // If $dontUseConfig is false and $config is not passed, + // we use the Config baseURL. + $useConfig = (! $dontUseConfig) && ($config !== null); + // Convert array of segments to a string if (is_array($relativePath)) { $relativePath = implode('/', $relativePath); } - $uri = _get_uri($relativePath, $config); + $uri = _get_uri($relativePath, $config, $useConfig); return URI::createURIString( $scheme ?? $uri->getScheme(), @@ -124,7 +140,7 @@ function base_url($relativePath = '', ?string $scheme = null): string $config = clone config('App'); $config->indexPage = ''; - return site_url($relativePath, $scheme, $config); + return site_url($relativePath, $scheme, $config, true); } } diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 83de57e83871..fc49b6522683 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -322,6 +322,7 @@ public function testSiteURLWithAllowedHostname() $this->config->baseURL = 'http://example.com/public/'; $this->config->allowedHostnames = ['www.example.jp']; + Services::injectMock('config', $this->config); // URI object are updated in IncomingRequest constructor. $request = Services::incomingrequest($this->config); @@ -329,7 +330,7 @@ public function testSiteURLWithAllowedHostname() $this->assertSame( 'http://www.example.jp/public/index.php/controller/method', - site_url('controller/method', null, $this->config) + site_url('controller/method') ); } From 21a81ad70705ec7d0c8b1fb94a1ecbbd11bb7dc7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:03:16 +0900 Subject: [PATCH 3138/8282] docs: update PHPDoc --- system/HTTP/URI.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 9af28b346e3c..587e441ffc17 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -148,11 +148,9 @@ class URI /** * Builds a representation of the string from the component parts. * - * @param string|null $scheme URI scheme. E.g., http, ftp - * @param string $authority - * @param string $path - * @param string $query - * @param string $fragment + * @param string|null $scheme URI scheme. E.g., http, ftp + * + * @return string URI string with only passed parts. Maybe incomplete as a URI. */ public static function createURIString( ?string $scheme = null, From 011a1bd22fad6bd45f850a609d401471a14073c8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:03:54 +0900 Subject: [PATCH 3139/8282] test: add tests --- tests/system/HTTP/URITest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index c88a4ca6799a..14de6e3d587b 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -978,6 +978,22 @@ public function testSetURISilent() $this->assertTrue(true); } + public function testCreateURIStringNoArguments() + { + $uri = URI::createURIString(); + + $expected = ''; + $this->assertSame($expected, $uri); + } + + public function testCreateURIStringOnlyAuthority() + { + $uri = URI::createURIString(null, 'example.com'); + + $expected = 'example.com'; + $this->assertSame($expected, $uri); + } + public function testCreateURIString() { $uri = URI::createURIString('https', 'example.com', '/'); From 0a8164b5779f4b93456e2cf6173b8eec6890f2d8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:09:47 +0900 Subject: [PATCH 3140/8282] docs: update @param description --- system/Helpers/url_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 4d286cac4fb3..ca6a60f6b237 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -26,7 +26,7 @@ * * @internal Outside the framework this should not be used directly. * - * @param string $relativePath May include queries or fragments + * @param string $relativePath URI path relative to baseURL. May include queries or fragments * @param App|null $config Alternative Config to use * @param bool $useConfig Whether to use the Config baseURL * From bab8f77a472bfee2a439f5e4e0eaff9b942f2cea Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:48:18 +0900 Subject: [PATCH 3141/8282] docs: add comments --- system/HTTP/IncomingRequest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 3304f4664a76..19b4ea4ffc68 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -451,6 +451,9 @@ public function isSecure(): bool public function setPath(string $path, ?App $config = null) { $this->path = $path; + + // @TODO remove this. The path of the URI object should be a full URI path, + // not a URI path relative to baseURL. $this->uri->setPath($path); $config ??= $this->config; @@ -481,6 +484,9 @@ public function setPath(string $path, ?App $config = null) $this->uri->setScheme('https'); } } elseif (! is_cli()) { + // Do not change exit() to exception; Request is initialized before + // setting the exception handler, so if an exception is raised, an + // error will be displayed in the production environment. // @codeCoverageIgnoreStart exit('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.'); // @codeCoverageIgnoreEnd From be96f5ff1f9eb0b248c2a3deeb32d6ffed1c2e03 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:49:51 +0900 Subject: [PATCH 3142/8282] fix: error message --- system/HTTP/IncomingRequest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 19b4ea4ffc68..41f1e2c46fc4 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -486,9 +486,9 @@ public function setPath(string $path, ?App $config = null) } elseif (! is_cli()) { // Do not change exit() to exception; Request is initialized before // setting the exception handler, so if an exception is raised, an - // error will be displayed in the production environment. + // error will be displayed even if in the production environment. // @codeCoverageIgnoreStart - exit('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.'); + exit('You have an empty or invalid baseURL. The baseURL value must be set in app/Config/App.php, or through the .env file.'); // @codeCoverageIgnoreEnd } From 7c552403772880f0d10592af246786c4a4145ed8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 09:50:10 +0900 Subject: [PATCH 3143/8282] docs: update @param description --- system/HTTP/IncomingRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 41f1e2c46fc4..8b2ee22f087b 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -443,7 +443,7 @@ public function isSecure(): bool * instance, this can be used to change the "current URL" * for testing. * - * @param string $path URI path relative to SCRIPT_NAME + * @param string $path URI path relative to baseURL * @param App|null $config Optional alternate config to use * * @return $this From 8c39ef2834eabd2a85d59888bad7bacefebcf730 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 10:10:30 +0900 Subject: [PATCH 3144/8282] docs: add description for current_url() --- user_guide_src/source/helpers/url_helper.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 389b83c3ef62..8e2b32ebfae3 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -98,7 +98,9 @@ The following functions are available: :returns: The current URL :rtype: string|\\CodeIgniter\\HTTP\\URI - Returns the full URL (including segments) of the page being currently viewed. + Returns the full URL of the page being currently viewed. + When returning string, the query and fragment parts of the URL are removed. + When returning URI, the query and fragment parts are preserved. However for security reasons, it is created based on the ``Config\App`` settings, and not intended to match the browser URL. @@ -106,9 +108,10 @@ The following functions are available: Since v4.3.0, if you set ``Config\App::$allowedHostnames``, this returns the URL with the hostname set in it if the current URL matches. - .. note:: Calling this function is the same as doing this: + .. note:: Calling ``current_url()`` is the same as doing this: .. literalinclude:: url_helper/006.php + :lines: 2- .. important:: Prior to v4.1.2, this function had a bug causing it to ignore the configuration on ``Config\App::$indexPage``. From 1e15f3716de18c62b74c3fdc23864344cff92188 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 10:23:13 +0900 Subject: [PATCH 3145/8282] docs: add @return description --- system/Helpers/url_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index ca6a60f6b237..dd27f25fb686 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -147,12 +147,12 @@ function base_url($relativePath = '', ?string $scheme = null): string if (! function_exists('current_url')) { /** * Returns the current full URL based on the Config\App settings and IncomingRequest. - * String returns ignore query and fragment parts. * * @param bool $returnObject True to return an object instead of a string * @param IncomingRequest|null $request A request to use when retrieving the path * - * @return string|URI + * @return string|URI When returning string, the query and fragment parts are removed. + * When returning URI, the query and fragment parts are preserved. */ function current_url(bool $returnObject = false, ?IncomingRequest $request = null) { From 85a29083093bf18b5061f228cb59f424f7a60fbd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 10:34:42 +0900 Subject: [PATCH 3146/8282] refactor: rename variable names --- system/Helpers/url_helper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index dd27f25fb686..f59a788e6336 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -157,17 +157,19 @@ function base_url($relativePath = '', ?string $scheme = null): string function current_url(bool $returnObject = false, ?IncomingRequest $request = null) { $request ??= Services::request(); - $path = $request->getPath(); + $routePath = $request->getPath(); + $currentURI = $request->getUri(); + $relativePath = $routePath; // Append queries and fragments - if ($query = $request->getUri()->getQuery()) { - $path .= '?' . $query; + if ($query = $currentURI->getQuery()) { + $relativePath .= '?' . $query; } - if ($fragment = $request->getUri()->getFragment()) { - $path .= '#' . $fragment; + if ($fragment = $currentURI->getFragment()) { + $relativePath .= '#' . $fragment; } - $uri = _get_uri($path); + $uri = _get_uri($relativePath); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From 6c410f58a085992b91437656df22934e71ed4964 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 11:22:56 +0900 Subject: [PATCH 3147/8282] refactor: base_url() and site_url() --- system/Helpers/url_helper.php | 100 ++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 18 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index f59a788e6336..3c36c7156e74 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -94,28 +94,65 @@ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfi /** * Returns a site URL as defined by the App config. * - * @param array|string $relativePath URI string or array of URI segments - * @param string|null $scheme URI scheme. E.g., http, ftp - * @param App|null $config Alternate configuration to use - * @param bool $dontUseConfig Set true if you don't use the Config - * baseURL even when you pass the Config + * @param array|string $relativePath URI string or array of URI segments + * @param string|null $scheme URI scheme. E.g., http, ftp + * @param App|null $config Alternate configuration to use */ - function site_url( - $relativePath = '', - ?string $scheme = null, - ?App $config = null, - bool $dontUseConfig = false - ): string { - // If $dontUseConfig is false and $config is not passed, - // we use the Config baseURL. - $useConfig = (! $dontUseConfig) && ($config !== null); + function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string + { + $appConfig = null; + if ($config === null) { + $appConfig = config('App'); + } // Convert array of segments to a string if (is_array($relativePath)) { $relativePath = implode('/', $relativePath); } - $uri = _get_uri($relativePath, $config, $useConfig); + // If a full URI was passed then convert it + if (strpos($relativePath, '://') !== false) { + $full = new URI($relativePath); + $relativePath = URI::createURIString( + null, + null, + $full->getPath(), + $full->getQuery(), + $full->getFragment() + ); + } + + $relativePath = URI::removeDotSegments($relativePath); + + $request = Services::request(); + + if ($config === null) { + $url = $request instanceof CLIRequest + ? rtrim($appConfig->baseURL, '/ ') . '/' + // Use the current baseURL for multiple domain support + : $request->getUri()->getBaseURL(); + + $config = $appConfig; + } else { + $url = rtrim($config->baseURL, '/ ') . '/'; + } + + // Check for an index page + if ($config->indexPage !== '') { + $url .= $config->indexPage; + + // Check if we need a separator + if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { + $url .= '/'; + } + } + + $uri = new URI($url . $relativePath); + + // Check if the baseURL scheme needs to be coerced into its secure version + if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { + $uri->setScheme('https'); + } return URI::createURIString( $scheme ?? $uri->getScheme(), @@ -137,10 +174,37 @@ function site_url( */ function base_url($relativePath = '', ?string $scheme = null): string { - $config = clone config('App'); - $config->indexPage = ''; + // Convert array of segments to a string + if (is_array($relativePath)) { + $relativePath = implode('/', $relativePath); + } + + // If a full URI was passed then convert it + if (strpos($relativePath, '://') !== false) { + $full = new URI($relativePath); + $relativePath = URI::createURIString( + null, + null, + $full->getPath(), + $full->getQuery(), + $full->getFragment() + ); + } + + $relativePath = URI::removeDotSegments($relativePath); + + $request = Services::request(); + $currentBaseURL = $request->getUri()->getBaseURL(); - return site_url($relativePath, $scheme, $config, true); + $uri = new URI($currentBaseURL . $relativePath); + + return URI::createURIString( + $scheme ?? $uri->getScheme(), + $uri->getAuthority(), + $uri->getPath(), + $uri->getQuery(), + $uri->getFragment() + ); } } From ff0321f14008401b9a1ed99b1350ee5275dbfc6f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 11:42:24 +0900 Subject: [PATCH 3148/8282] refactor: current_url() _get_uri() is no longer used. --- system/Helpers/url_helper.php | 18 +++++++++++++++++- .../Helpers/URLHelper/CurrentUrlTest.php | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 3c36c7156e74..de3a967949cd 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -32,6 +32,8 @@ * * @throws HTTPException For invalid paths. * @throws InvalidArgumentException For invalid config. + * + * @deprecated No longer used. */ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfig = false): URI { @@ -224,7 +226,11 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $routePath = $request->getPath(); $currentURI = $request->getUri(); + $url = $request->getUri()->getBaseURL(); + + $config = config('App'); $relativePath = $routePath; + // Append queries and fragments if ($query = $currentURI->getQuery()) { $relativePath .= '?' . $query; @@ -233,7 +239,17 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $relativePath .= '#' . $fragment; } - $uri = _get_uri($relativePath); + // Check for an index page + if ($config->indexPage !== '') { + $url .= $config->indexPage; + + // Check if we need a separator + if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { + $url .= '/'; + } + } + + $uri = new URI($url . $relativePath); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php index ed48be914321..faee0608b54f 100644 --- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php +++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php @@ -63,6 +63,10 @@ public function testCurrentURLReturnsBasicURL() $this->config->baseURL = 'http://example.com/public'; + // URI object are updated in IncomingRequest constructor. + $request = Services::incomingrequest($this->config); + Services::injectMock('request', $request); + $this->assertSame('http://example.com/public/index.php/', current_url()); } From 60fc61b192e37a921ab65c9797af5671fe142602 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 11:59:00 +0900 Subject: [PATCH 3149/8282] refactor: extract _get_uri() function --- system/Helpers/url_helper.php | 110 +++++++--------------------------- 1 file changed, 22 insertions(+), 88 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index de3a967949cd..37873f8ce437 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -26,21 +26,23 @@ * * @internal Outside the framework this should not be used directly. * - * @param string $relativePath URI path relative to baseURL. May include queries or fragments - * @param App|null $config Alternative Config to use - * @param bool $useConfig Whether to use the Config baseURL + * @param array|string $relativePath URI string or array of URI segments + * @param App|null $config Alternative Config to use + * @param bool $indexPage Whether to add the $indexPage value * * @throws HTTPException For invalid paths. * @throws InvalidArgumentException For invalid config. - * - * @deprecated No longer used. */ - function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfig = false): URI + function _get_uri($relativePath = '', ?App $config = null, bool $indexPage = false): URI { - $config ??= config('App'); + $appConfig = null; + if ($config === null) { + $appConfig = config('App'); + } - if ($config->baseURL === '') { - throw new InvalidArgumentException('_get_uri() requires a valid baseURL.'); + // Convert array of segments to a string + if (is_array($relativePath)) { + $relativePath = implode('/', $relativePath); } // If a full URI was passed then convert it @@ -57,20 +59,21 @@ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfi $relativePath = URI::removeDotSegments($relativePath); - // Build the full URL based on $config and $relativePath $request = Services::request(); - /** @var App $config */ - if ($useConfig) { - $url = rtrim($config->baseURL, '/ ') . '/'; - } else { + if ($config === null) { $url = $request instanceof CLIRequest - ? rtrim($config->baseURL, '/ ') . '/' + ? rtrim($appConfig->baseURL, '/ ') . '/' + // Use the current baseURL for multiple domain support : $request->getUri()->getBaseURL(); + + $config = $appConfig; + } else { + $url = rtrim($config->baseURL, '/ ') . '/'; } // Check for an index page - if ($config->indexPage !== '') { + if ($indexPage && $config->indexPage !== '') { $url .= $config->indexPage; // Check if we need a separator @@ -79,16 +82,7 @@ function _get_uri(string $relativePath = '', ?App $config = null, bool $useConfi } } - $url .= $relativePath; - - $uri = new URI($url); - - // Check if the baseURL scheme needs to be coerced into its secure version - if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { - $uri->setScheme('https'); - } - - return $uri; + return new URI($url . $relativePath); } } @@ -107,50 +101,12 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul $appConfig = config('App'); } - // Convert array of segments to a string - if (is_array($relativePath)) { - $relativePath = implode('/', $relativePath); - } - - // If a full URI was passed then convert it - if (strpos($relativePath, '://') !== false) { - $full = new URI($relativePath); - $relativePath = URI::createURIString( - null, - null, - $full->getPath(), - $full->getQuery(), - $full->getFragment() - ); - } - - $relativePath = URI::removeDotSegments($relativePath); - - $request = Services::request(); + $uri = _get_uri($relativePath, $config, true); if ($config === null) { - $url = $request instanceof CLIRequest - ? rtrim($appConfig->baseURL, '/ ') . '/' - // Use the current baseURL for multiple domain support - : $request->getUri()->getBaseURL(); - $config = $appConfig; - } else { - $url = rtrim($config->baseURL, '/ ') . '/'; } - // Check for an index page - if ($config->indexPage !== '') { - $url .= $config->indexPage; - - // Check if we need a separator - if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $url .= '/'; - } - } - - $uri = new URI($url . $relativePath); - // Check if the baseURL scheme needs to be coerced into its secure version if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { $uri->setScheme('https'); @@ -176,29 +132,7 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul */ function base_url($relativePath = '', ?string $scheme = null): string { - // Convert array of segments to a string - if (is_array($relativePath)) { - $relativePath = implode('/', $relativePath); - } - - // If a full URI was passed then convert it - if (strpos($relativePath, '://') !== false) { - $full = new URI($relativePath); - $relativePath = URI::createURIString( - null, - null, - $full->getPath(), - $full->getQuery(), - $full->getFragment() - ); - } - - $relativePath = URI::removeDotSegments($relativePath); - - $request = Services::request(); - $currentBaseURL = $request->getUri()->getBaseURL(); - - $uri = new URI($currentBaseURL . $relativePath); + $uri = _get_uri($relativePath); return URI::createURIString( $scheme ?? $uri->getScheme(), From 3202415345e1297ab691291da87472d28ea8f6be Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 12:58:46 +0900 Subject: [PATCH 3150/8282] refactor: rename variable names --- system/Helpers/url_helper.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 37873f8ce437..08fe1fd89c56 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -160,7 +160,7 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $routePath = $request->getPath(); $currentURI = $request->getUri(); - $url = $request->getUri()->getBaseURL(); + $currentBaseURL = $currentURI->getBaseURL(); $config = config('App'); $relativePath = $routePath; @@ -174,16 +174,17 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul } // Check for an index page + $indexPage = ''; if ($config->indexPage !== '') { - $url .= $config->indexPage; + $indexPage = $config->indexPage; // Check if we need a separator if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $url .= '/'; + $indexPage .= '/'; } } - $uri = new URI($url . $relativePath); + $uri = new URI($currentBaseURL . $indexPage . $relativePath); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From e29c19744af862369e5b51d3f54c4e51366d3d3e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 17:40:51 +0900 Subject: [PATCH 3151/8282] fix: base_url() does not change scheme when forceGlobalSecureRequests is true and fix errors if running on CLI. --- system/Helpers/url_helper.php | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 08fe1fd89c56..83b7e1a6ec81 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -26,7 +26,8 @@ * * @internal Outside the framework this should not be used directly. * - * @param array|string $relativePath URI string or array of URI segments + * @param array|string $relativePath URI string or array of URI segments. + * May include queries or fragments. * @param App|null $config Alternative Config to use * @param bool $indexPage Whether to add the $indexPage value * @@ -82,7 +83,14 @@ function _get_uri($relativePath = '', ?App $config = null, bool $indexPage = fal } } - return new URI($url . $relativePath); + $uri = new URI($url . $relativePath); + + // Check if the baseURL scheme needs to be coerced into its secure version + if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { + $uri->setScheme('https'); + } + + return $uri; } } @@ -157,12 +165,10 @@ function base_url($relativePath = '', ?string $scheme = null): string function current_url(bool $returnObject = false, ?IncomingRequest $request = null) { $request ??= Services::request(); + /** @var CLIRequest|IncomingRequest $request */ $routePath = $request->getPath(); $currentURI = $request->getUri(); - $currentBaseURL = $currentURI->getBaseURL(); - - $config = config('App'); $relativePath = $routePath; // Append queries and fragments @@ -173,18 +179,7 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $relativePath .= '#' . $fragment; } - // Check for an index page - $indexPage = ''; - if ($config->indexPage !== '') { - $indexPage = $config->indexPage; - - // Check if we need a separator - if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $indexPage .= '/'; - } - } - - $uri = new URI($currentBaseURL . $indexPage . $relativePath); + $uri = _get_uri($relativePath, null, true); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From f3f216cc353254939ea639f68a34bb267cf5cef7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 08:55:30 +0900 Subject: [PATCH 3152/8282] refactor: use site_url() instead of _get_uri() --- system/Helpers/url_helper.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 83b7e1a6ec81..d3e77e263e8c 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -140,15 +140,14 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul */ function base_url($relativePath = '', ?string $scheme = null): string { - $uri = _get_uri($relativePath); + /** @var App $config */ + $config = clone config('App'); - return URI::createURIString( - $scheme ?? $uri->getScheme(), - $uri->getAuthority(), - $uri->getPath(), - $uri->getQuery(), - $uri->getFragment() - ); + // Use the current baseURL for multiple domain support + $config->baseURL = Services::request()->getUri()->getBaseURL(); + $config->indexPage = ''; + + return site_url($relativePath, $scheme, $config); } } From 334a44c0a4ce5e5f8e07bff1968cebc49d4c1348 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 08:59:32 +0900 Subject: [PATCH 3153/8282] refactor: remove unneeded parameter $indexPage --- system/Helpers/url_helper.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index d3e77e263e8c..8461cdcb5c99 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -29,15 +29,15 @@ * @param array|string $relativePath URI string or array of URI segments. * May include queries or fragments. * @param App|null $config Alternative Config to use - * @param bool $indexPage Whether to add the $indexPage value * * @throws HTTPException For invalid paths. * @throws InvalidArgumentException For invalid config. */ - function _get_uri($relativePath = '', ?App $config = null, bool $indexPage = false): URI + function _get_uri($relativePath = '', ?App $config = null): URI { $appConfig = null; if ($config === null) { + /** @var App $appConfig */ $appConfig = config('App'); } @@ -74,7 +74,7 @@ function _get_uri($relativePath = '', ?App $config = null, bool $indexPage = fal } // Check for an index page - if ($indexPage && $config->indexPage !== '') { + if ($config->indexPage !== '') { $url .= $config->indexPage; // Check if we need a separator @@ -106,10 +106,11 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul { $appConfig = null; if ($config === null) { + /** @var App $appConfig */ $appConfig = config('App'); } - $uri = _get_uri($relativePath, $config, true); + $uri = _get_uri($relativePath, $config); if ($config === null) { $config = $appConfig; @@ -178,7 +179,7 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $relativePath .= '#' . $fragment; } - $uri = _get_uri($relativePath, null, true); + $uri = _get_uri($relativePath, null); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From 1aefd3d1940e4e23329b317fcae1d7b1964497a8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:04:54 +0900 Subject: [PATCH 3154/8282] refactor: stop reassignments --- system/Helpers/url_helper.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 8461cdcb5c99..2307f0a95d59 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -63,27 +63,28 @@ function _get_uri($relativePath = '', ?App $config = null): URI $request = Services::request(); if ($config === null) { - $url = $request instanceof CLIRequest + $baseURL = $request instanceof CLIRequest ? rtrim($appConfig->baseURL, '/ ') . '/' // Use the current baseURL for multiple domain support : $request->getUri()->getBaseURL(); $config = $appConfig; } else { - $url = rtrim($config->baseURL, '/ ') . '/'; + $baseURL = rtrim($config->baseURL, '/ ') . '/'; } // Check for an index page + $indexPage = ''; if ($config->indexPage !== '') { - $url .= $config->indexPage; + $indexPage = $config->indexPage; // Check if we need a separator if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $url .= '/'; + $indexPage .= '/'; } } - $uri = new URI($url . $relativePath); + $uri = new URI($baseURL . $indexPage . $relativePath); // Check if the baseURL scheme needs to be coerced into its secure version if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { From a4b53194613159e12952d0b0acda2a0c59fb0f83 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:10:46 +0900 Subject: [PATCH 3155/8282] refactor: remove uneeded code --- system/Helpers/url_helper.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 2307f0a95d59..07cc1fc6624d 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -105,23 +105,8 @@ function _get_uri($relativePath = '', ?App $config = null): URI */ function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string { - $appConfig = null; - if ($config === null) { - /** @var App $appConfig */ - $appConfig = config('App'); - } - $uri = _get_uri($relativePath, $config); - if ($config === null) { - $config = $appConfig; - } - - // Check if the baseURL scheme needs to be coerced into its secure version - if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') { - $uri->setScheme('https'); - } - return URI::createURIString( $scheme ?? $uri->getScheme(), $uri->getAuthority(), From 1cac8abd396c8c0427ab4908a0bb18b243c293c1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:14:07 +0900 Subject: [PATCH 3156/8282] fix: logic to get current baseURL --- system/Helpers/url_helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 07cc1fc6624d..4f1a3b4b7ca1 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -131,7 +131,11 @@ function base_url($relativePath = '', ?string $scheme = null): string $config = clone config('App'); // Use the current baseURL for multiple domain support - $config->baseURL = Services::request()->getUri()->getBaseURL(); + $request = Services::request(); + $config->baseURL = $request instanceof CLIRequest + ? rtrim($config->baseURL, '/ ') . '/' + : $request->getUri()->getBaseURL(); + $config->indexPage = ''; return site_url($relativePath, $scheme, $config); From e5d8549f6d85890dbed368c91f5a9a64fb2545db Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:16:36 +0900 Subject: [PATCH 3157/8282] refactor: remove unneeded argument --- system/Helpers/url_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 4f1a3b4b7ca1..9c035144a04b 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -169,7 +169,7 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $relativePath .= '#' . $fragment; } - $uri = _get_uri($relativePath, null); + $uri = _get_uri($relativePath); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From 940c79454e6f77b2f01c85c1109682909e71564e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 09:21:33 +0900 Subject: [PATCH 3158/8282] test: add test for CLI --- tests/system/Helpers/URLHelper/SiteUrlTest.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index fc49b6522683..65117c852834 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -314,6 +314,24 @@ public function testBaseURLService() $this->assertSame('http://example.com/ci/v4/controller/method', base_url('controller/method', null)); } + public function testBaseURLWithCLIRequest() + { + unset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI']); + + $this->config->baseURL = 'http://example.com/'; + $request = Services::clirequest($this->config); + Services::injectMock('request', $request); + + $this->assertSame( + 'http://example.com/index.php/controller/method', + site_url('controller/method', null, $this->config) + ); + $this->assertSame( + 'http://example.com/controller/method', + base_url('controller/method', null) + ); + } + public function testSiteURLWithAllowedHostname() { $_SERVER['HTTP_HOST'] = 'www.example.jp'; From e0a36ce1824e0ebe65ac5a93efa1824b20cb2b22 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 20:35:48 +0900 Subject: [PATCH 3159/8282] test: add test cases --- .../system/Helpers/URLHelper/SiteUrlTest.php | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 65117c852834..e05a7093e3da 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -139,6 +139,33 @@ public function configProvider() 'http://example.com/abc', 'http://example.com/abc', ], + [ + 'http://example.com/', + '', + null, + false, + '/abc', + 'http://example.com/abc', + 'http://example.com/abc', + ], + [ + 'http://example.com/', + '', + null, + false, + '/abc/', + 'http://example.com/abc/', + 'http://example.com/abc/', + ], + [ + 'http://example.com/', + '', + null, + false, + '/abc/def', + 'http://example.com/abc/def', + 'http://example.com/abc/def', + ], 'URL decode' => [ 'http://example.com/', '', From cf670a2bec208ede6238e8a72ab3a5616aa7421d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 3 Feb 2023 18:43:54 +0900 Subject: [PATCH 3160/8282] chore: update Kint to 5.0.3 --- system/ThirdParty/Kint/Utils.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/ThirdParty/Kint/Utils.php b/system/ThirdParty/Kint/Utils.php index 1394b0819095..b51b33558501 100644 --- a/system/ThirdParty/Kint/Utils.php +++ b/system/ThirdParty/Kint/Utils.php @@ -118,7 +118,9 @@ public static function composerGetExtras(string $key = 'kint'): array continue; } - foreach ($packages as $package) { + // Composer 2.0 Compatibility: packages are now wrapped into a "packages" top level key instead of the whole file being the package array + // @see https://getcomposer.org/upgrade/UPGRADE-2.0.md + foreach ($packages['packages'] ?? $packages as $package) { if (isset($package['extra'][$key]) && \is_array($package['extra'][$key])) { $extras = \array_replace($extras, $package['extra'][$key]); } From 82ddac7bba7691d6afbbb5bf069829df690559ea Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 12:43:55 +0900 Subject: [PATCH 3161/8282] docs: add how to download previous version user guide --- user_guide_src/source/installation/index.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst index 3be12a637dcc..8b71ea2833b0 100644 --- a/user_guide_src/source/installation/index.rst +++ b/user_guide_src/source/installation/index.rst @@ -10,8 +10,11 @@ Which is right for you? - If you would like the simple "download & go" install that CodeIgniter3 is known for, choose the manual installation. -However you choose to install and run CodeIgniter4, the +However you choose to install and run CodeIgniter4, the latest `user guide `_ is accessible online. +If you want to see previous versions, you can download from the +`codeigniter4/userguide `_ +repository. .. note:: Before using CodeIgniter 4, make sure that your server meets the :doc:`requirements `, in particular the PHP From 5c86c5c74c349094714ecc797323baaf159b1385 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:21:32 +0900 Subject: [PATCH 3162/8282] docs: add versionadded --- .../source/database/query_builder.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 709e55838941..a6c9f94444a0 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -908,6 +908,8 @@ Upsert $builder->upsert() ------------------ +.. versionadded:: 4.3.0 + Generates an upsert string based on the data you supply, and runs the query. You can either pass an **array** or an **object** to the method. By default a constraint will be defined in order. A primary @@ -929,6 +931,8 @@ The first parameter is an object. $builder->getCompiledUpsert() ----------------------------- +.. versionadded:: 4.3.0 + Compiles the upsert query just like ``$builder->upsert()`` but does not *run* the query. This method simply returns the SQL query as a string. @@ -944,6 +948,8 @@ upsertBatch $builder->upsertBatch() ----------------------- +.. versionadded:: 4.3.0 + Generates an upsert string based on the data you supply, and runs the query. You can either pass an **array** or an **object** to the method. By default a constraint will be defined in order. A primary @@ -967,6 +973,8 @@ You can also upsert from a query: $builder->onConstraint() ------------------------ +.. versionadded:: 4.3.0 + Allows manually setting constraint to be used for upsert. This does not work with MySQL because MySQL checks all constraints by default. @@ -976,6 +984,9 @@ This method accepts a string or an array of columns. $builder->updateFields() ------------------------ + +.. versionadded:: 4.3.0 + Allows manually setting the fields to be updated when performing upserts. .. literalinclude:: query_builder/110.php @@ -1146,6 +1157,8 @@ method, or ``emptyTable()``. $builder->deleteBatch() ----------------------- +.. versionadded:: 4.3.0 + Generates a batch **DELETE** statement based on a set of data. .. literalinclude:: query_builder/118.php @@ -1198,6 +1211,8 @@ When $builder->when() ---------------- +.. versionadded:: 4.3.0 + This allows modifying the query based on a condition without breaking out of the query builder chain. The first parameter is the condition, and it should evaluate to a boolean. The second parameter is a callable that will be ran @@ -1223,6 +1238,8 @@ WhenNot $builder->whenNot() ------------------- +.. versionadded:: 4.3.0 + This works exactly the same way as ``$builder->when()`` except that it will only run the callable when the condition evaluates to ``false``, instead of ``true`` like ``when()``. @@ -1415,6 +1432,8 @@ Class Reference .. php:method:: setQueryAsData($query[, $alias[, $columns = null]]) + .. versionadded:: 4.3.0 + :param BaseBuilder|RawSql $query: Instance of the BaseBuilder or RawSql :param string|null $alias: Alias for query :param array|string|null $columns: Array or comma delimited string of columns in the query From 6c956b06115f7d3b82993ba99d4eb4ab81c994b2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:21:58 +0900 Subject: [PATCH 3163/8282] docs: replace Mysql with MySQL --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index a6c9f94444a0..02a336cc558a 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -953,7 +953,7 @@ $builder->upsertBatch() Generates an upsert string based on the data you supply, and runs the query. You can either pass an **array** or an **object** to the method. By default a constraint will be defined in order. A primary -key will be selected first and then unique keys. Mysql will use any +key will be selected first and then unique keys. MySQL will use any constraint by default. Here is an example using an array: .. literalinclude:: query_builder/108.php From 7e8b0869f9034f023b743338b834f36cc80afcda Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:23:15 +0900 Subject: [PATCH 3164/8282] docs: add notes --- user_guide_src/source/database/query_builder.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 02a336cc558a..6b66317dfe86 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -1095,12 +1095,17 @@ UpdateBatch $builder->updateBatch() ----------------------- +.. note:: Since v4.3.0, the second parameter ``$index`` of ``updateBatch()`` has + changed to ``$constraints``. It now accepts types array, string, or ``RawSql``. + Generates an update string based on the data you supply, and runs the query. You can either pass an **array** or an **object** to the method. Here is an example using an array: .. literalinclude:: query_builder/092.php +.. note:: Since v4.3.0, the generated SQL structure has been Improved. + The first parameter is an associative array of values, the second parameter is the where key. .. note:: All values except ``RawSql`` are escaped automatically producing safer queries. From ec20625a15278211655f1ef7b523eb2ba0bc2d4e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:23:34 +0900 Subject: [PATCH 3165/8282] docs: update notes --- user_guide_src/source/database/query_builder.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 6b66317dfe86..8fdb3dfaabee 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -966,7 +966,8 @@ You can also upsert from a query: .. literalinclude:: query_builder/115.php -.. note:: ``setQueryAsData()`` can be used since v4.3.0. +.. note:: The ``setQueryAsData()``, ``onConstraint()``, and ``updateFields()`` + methods can be used since v4.3.0. .. note:: It is required to alias the columns of the select query to match those of the target table. @@ -1120,7 +1121,8 @@ You can also update from a query: .. literalinclude:: query_builder/116.php -.. note:: ``setQueryAsData()`` can be used since v4.3.0. +.. note:: The ``setQueryAsData()``, ``onConstraint()``, and ``updateFields()`` + methods can be used since v4.3.0. .. note:: It is required to alias the columns of the select query to match those of the target table. From cd4cc572aaeb4b6e93961615fe2022cde1bfd8eb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:24:04 +0900 Subject: [PATCH 3166/8282] docs: split sample code and add explanation --- .../source/database/query_builder.rst | 5 +++ .../source/database/query_builder/092.php | 24 +------------ .../source/database/query_builder/120.php | 36 +++++++++++++++++++ 3 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 user_guide_src/source/database/query_builder/120.php diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 8fdb3dfaabee..56035153db80 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -1109,6 +1109,11 @@ Here is an example using an array: The first parameter is an associative array of values, the second parameter is the where key. +Since v4.3.0, you can also use the ``setQueryAsData()``, ``onConstraint()``, and +``updateFields()`` methods: + +.. literalinclude:: query_builder/120.php + .. note:: All values except ``RawSql`` are escaped automatically producing safer queries. .. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections. diff --git a/user_guide_src/source/database/query_builder/092.php b/user_guide_src/source/database/query_builder/092.php index 911771fc1850..407eadbfef29 100644 --- a/user_guide_src/source/database/query_builder/092.php +++ b/user_guide_src/source/database/query_builder/092.php @@ -14,28 +14,7 @@ 'date' => 'Date 2', ], ]; - $builder->updateBatch($data, ['title', 'author']); - -// OR -$builder->setData($data)->onConstraint('title, author')->updateBatch(); - -// OR -$builder->setData($data, null, 'u') - ->onConstraint(['`mytable`.`title`' => '`u`.`title`', 'author' => new RawSql('`u`.`author`')]) - ->updateBatch(); - -// OR -foreach ($data as $row) { - $builder->setData($row); -} -$builder->onConstraint('title, author')->updateBatch(); - -// OR -$builder->setData($data, true, 'u') - ->onConstraint(new RawSql('`mytable`.`title` = `u`.`title` AND `mytable`.`author` = `u`.`author`')) - ->updateFields(['last_update' => new RawSql('CURRENT_TIMESTAMP()')], true) - ->updateBatch(); /* * Produces: * UPDATE `mytable` @@ -47,6 +26,5 @@ * SET * `mytable`.`title` = `u`.`title`, * `mytable`.`name` = `u`.`name`, - * `mytable`.`date` = `u`.`date`, - * `mytable`.`last_update` = CURRENT_TIMESTAMP() // this only applies to the last scenario + * `mytable`.`date` = `u`.`date` */ diff --git a/user_guide_src/source/database/query_builder/120.php b/user_guide_src/source/database/query_builder/120.php new file mode 100644 index 000000000000..d0bea8a1cfba --- /dev/null +++ b/user_guide_src/source/database/query_builder/120.php @@ -0,0 +1,36 @@ +setData($data)->onConstraint('title, author')->updateBatch(); + +// OR +$builder->setData($data, null, 'u') + ->onConstraint(['`mytable`.`title`' => '`u`.`title`', 'author' => new RawSql('`u`.`author`')]) + ->updateBatch(); + +// OR +foreach ($data as $row) { + $builder->setData($row); +} +$builder->onConstraint('title, author')->updateBatch(); + +// OR +$builder->setData($data, true, 'u') + ->onConstraint(new RawSql('`mytable`.`title` = `u`.`title` AND `mytable`.`author` = `u`.`author`')) + ->updateFields(['last_update' => new RawSql('CURRENT_TIMESTAMP()')], true) + ->updateBatch(); +/* + * Produces: + * UPDATE `mytable` + * INNER JOIN ( + * SELECT 'Title 1' `title`, 'Author 1' `author`, 'Name 1' `name`, 'Date 1' `date` UNION ALL + * SELECT 'Title 2' `title`, 'Author 2' `author`, 'Name 2' `name`, 'Date 2' `date` + * ) `u` + * ON `mytable`.`title` = `u`.`title` AND `mytable`.`author` = `u`.`author` + * SET + * `mytable`.`title` = `u`.`title`, + * `mytable`.`name` = `u`.`name`, + * `mytable`.`date` = `u`.`date`, + * `mytable`.`last_update` = CURRENT_TIMESTAMP() // this only applies to the last scenario + */ From 09276f8bf54b7d5c66a5283d5ea252db152df5e7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:25:03 +0900 Subject: [PATCH 3167/8282] docs: break long line in sample code --- user_guide_src/source/database/query_builder/115.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder/115.php b/user_guide_src/source/database/query_builder/115.php index cc5607d3982c..7526474da334 100644 --- a/user_guide_src/source/database/query_builder/115.php +++ b/user_guide_src/source/database/query_builder/115.php @@ -7,7 +7,10 @@ $additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')]; -$sql = $builder->setQueryAsData($query)->onConstraint('email')->updateFields($additionalUpdateField, true)->upsertBatch(); +$sql = $builder->setQueryAsData($query) + ->onConstraint('email') + ->updateFields($additionalUpdateField, true) + ->upsertBatch(); /* MySQLi produces: INSERT INTO `db_user` (`country`, `email`, `name`) SELECT user2.name, user2.email, user2.country From 1450be7e1c470ba350c781a606ce523016f12485 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 13:30:11 +0900 Subject: [PATCH 3168/8282] chore: update Kint version in composer.json --- admin/framework/composer.json | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 248eea0c96cc..2f3022a92b2b 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -13,7 +13,7 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.1", + "kint-php/kint": "^5.0.3", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", "friendsofphp/php-cs-fixer": "3.13.0", diff --git a/composer.json b/composer.json index 1fbc0fff4537..f4c9c31236fa 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.1", + "kint-php/kint": "^5.0.3", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", "friendsofphp/php-cs-fixer": "3.13.0", From 967f1d80e2d4685679039dd412a9acb8ca1b06df Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 13:51:39 +0900 Subject: [PATCH 3169/8282] refactor: remove Cookie config items in Config\App --- app/Config/App.php | 79 ------------------------- system/HTTP/Response.php | 26 +------- system/Helpers/cookie_helper.php | 6 +- system/Security/Security.php | 14 ++--- system/Session/Handlers/BaseHandler.php | 19 ++---- system/Session/Session.php | 14 ++--- system/Test/Mock/MockAppConfig.php | 6 -- system/Test/Mock/MockCLIConfig.php | 6 -- 8 files changed, 16 insertions(+), 154 deletions(-) diff --git a/app/Config/App.php b/app/Config/App.php index f598e324152a..a5774a0e25b5 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -238,85 +238,6 @@ class App extends BaseConfig */ public ?string $sessionDBGroup = null; - /** - * -------------------------------------------------------------------------- - * Cookie Prefix - * -------------------------------------------------------------------------- - * - * Set a cookie name prefix if you need to avoid collisions. - * - * @deprecated use Config\Cookie::$prefix property instead. - */ - public string $cookiePrefix = ''; - - /** - * -------------------------------------------------------------------------- - * Cookie Domain - * -------------------------------------------------------------------------- - * - * Set to `.your-domain.com` for site-wide cookies. - * - * @deprecated use Config\Cookie::$domain property instead. - */ - public string $cookieDomain = ''; - - /** - * -------------------------------------------------------------------------- - * Cookie Path - * -------------------------------------------------------------------------- - * - * Typically will be a forward slash. - * - * @deprecated use Config\Cookie::$path property instead. - */ - public string $cookiePath = '/'; - - /** - * -------------------------------------------------------------------------- - * Cookie Secure - * -------------------------------------------------------------------------- - * - * Cookie will only be set if a secure HTTPS connection exists. - * - * @deprecated use Config\Cookie::$secure property instead. - */ - public bool $cookieSecure = false; - - /** - * -------------------------------------------------------------------------- - * Cookie HttpOnly - * -------------------------------------------------------------------------- - * - * Cookie will only be accessible via HTTP(S) (no JavaScript). - * - * @deprecated use Config\Cookie::$httponly property instead. - */ - public bool $cookieHTTPOnly = true; - - /** - * -------------------------------------------------------------------------- - * Cookie SameSite - * -------------------------------------------------------------------------- - * - * Configure cookie SameSite setting. Allowed values are: - * - None - * - Lax - * - Strict - * - '' - * - * Alternatively, you can use the constant names: - * - `Cookie::SAMESITE_NONE` - * - `Cookie::SAMESITE_LAX` - * - `Cookie::SAMESITE_STRICT` - * - * Defaults to `Lax` for compatibility with modern browsers. Setting `''` - * (empty string) means default SameSite attribute set by browsers (`Lax`) - * will be set on cookies. If set to `None`, `$cookieSecure` must also be set. - * - * @deprecated use Config\Cookie::$samesite property instead. - */ - public ?string $cookieSameSite = 'Lax'; - /** * -------------------------------------------------------------------------- * Reverse Proxy IPs diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php index 21db9acd4191..d1b61e98562f 100644 --- a/system/HTTP/Response.php +++ b/system/HTTP/Response.php @@ -13,7 +13,6 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; -use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; use Config\Services; @@ -156,31 +155,8 @@ public function __construct($config) $this->CSPEnabled = $config->CSPEnabled; - // DEPRECATED COOKIE MANAGEMENT - - $this->cookiePrefix = $config->cookiePrefix; - $this->cookieDomain = $config->cookieDomain; - $this->cookiePath = $config->cookiePath; - $this->cookieSecure = $config->cookieSecure; - $this->cookieHTTPOnly = $config->cookieHTTPOnly; - $this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX; - - $config->cookieSameSite ??= Cookie::SAMESITE_LAX; - - if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true)) { - throw CookieException::forInvalidSameSite($config->cookieSameSite); - } - $this->cookieStore = new CookieStore([]); - Cookie::setDefaults(config('Cookie') ?? [ - // @todo Remove this fallback when deprecated `App` members are removed - 'prefix' => $config->cookiePrefix, - 'path' => $config->cookiePath, - 'domain' => $config->cookieDomain, - 'secure' => $config->cookieSecure, - 'httponly' => $config->cookieHTTPOnly, - 'samesite' => $config->cookieSameSite ?? Cookie::SAMESITE_LAX, - ]); + Cookie::setDefaults(config('Cookie')); // Default to an HTML Content-Type. Devs can override if needed. $this->setContentType('text/html'); diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php index 0a11ce84b76d..592863739eba 100755 --- a/system/Helpers/cookie_helper.php +++ b/system/Helpers/cookie_helper.php @@ -9,7 +9,6 @@ * the LICENSE file that was distributed with this source code. */ -use Config\App; use Config\Cookie; use Config\Services; @@ -68,11 +67,10 @@ function set_cookie( function get_cookie($index, bool $xssClean = false, ?string $prefix = '') { if ($prefix === '') { - /** @var Cookie|null $cookie */ + /** @var Cookie $cookie */ $cookie = config('Cookie'); - // @TODO Remove Config\App fallback when deprecated `App` members are removed. - $prefix = $cookie instanceof Cookie ? $cookie->prefix : config('App')->cookiePrefix; + $prefix = $cookie->prefix; } $request = Services::request(); diff --git a/system/Security/Security.php b/system/Security/Security.php index 422e589b81cd..210e9a71a72d 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -222,18 +222,12 @@ private function configureSession(): void private function configureCookie(App $config): void { - /** @var CookieConfig|null $cookie */ + /** @var CookieConfig $cookie */ $cookie = config('Cookie'); - if ($cookie instanceof CookieConfig) { - $cookiePrefix = $cookie->prefix; - $this->cookieName = $cookiePrefix . $this->rawCookieName; - Cookie::setDefaults($cookie); - } else { - // `Config/Cookie.php` is absence - $cookiePrefix = $config->cookiePrefix; - $this->cookieName = $cookiePrefix . $this->rawCookieName; - } + $cookiePrefix = $cookie->prefix; + $this->cookieName = $cookiePrefix . $this->rawCookieName; + Cookie::setDefaults($cookie); } /** diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php index f7d6ff1a90c7..a579eb7e2f03 100644 --- a/system/Session/Handlers/BaseHandler.php +++ b/system/Session/Handlers/BaseHandler.php @@ -122,22 +122,13 @@ public function __construct(AppConfig $config, string $ipAddress) $this->savePath = $config->sessionSavePath; } - /** @var CookieConfig|null $cookie */ + /** @var CookieConfig $cookie */ $cookie = config('Cookie'); - if ($cookie instanceof CookieConfig) { - // Session cookies have no prefix. - $this->cookieDomain = $cookie->domain; - $this->cookiePath = $cookie->path; - $this->cookieSecure = $cookie->secure; - } else { - // @TODO Remove this fallback when deprecated `App` members are removed. - // `Config/Cookie.php` is absence - // Session cookies have no prefix. - $this->cookieDomain = $config->cookieDomain; - $this->cookiePath = $config->cookiePath; - $this->cookieSecure = $config->cookieSecure; - } + // Session cookies have no prefix. + $this->cookieDomain = $cookie->domain; + $this->cookiePath = $cookie->path; + $this->cookieSecure = $cookie->secure; $this->ipAddress = $ipAddress; } diff --git a/system/Session/Session.php b/system/Session/Session.php index 497111b60030..3ea5bcd00b53 100644 --- a/system/Session/Session.php +++ b/system/Session/Session.php @@ -188,22 +188,16 @@ public function __construct(SessionHandlerInterface $driver, App $config) $this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy; } - // DEPRECATED COOKIE MANAGEMENT - $this->cookiePath = $config->cookiePath ?? $this->cookiePath; - $this->cookieDomain = $config->cookieDomain ?? $this->cookieDomain; - $this->cookieSecure = $config->cookieSecure ?? $this->cookieSecure; - $this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite; - /** @var CookieConfig $cookie */ $cookie = config('Cookie'); $this->cookie = (new Cookie($this->sessionCookieName, '', [ 'expires' => $this->sessionExpiration === 0 ? 0 : Time::now()->getTimestamp() + $this->sessionExpiration, - 'path' => $cookie->path ?? $config->cookiePath, - 'domain' => $cookie->domain ?? $config->cookieDomain, - 'secure' => $cookie->secure ?? $config->cookieSecure, + 'path' => $cookie->path, + 'domain' => $cookie->domain, + 'secure' => $cookie->secure, 'httponly' => true, // for security - 'samesite' => $cookie->samesite ?? $config->cookieSameSite ?? Cookie::SAMESITE_LAX, + 'samesite' => $cookie->samesite ?? Cookie::SAMESITE_LAX, 'raw' => $cookie->raw ?? false, ]))->withPrefix(''); // Cookie prefix should be ignored. diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php index e21f7a6b7adf..0d3a22cc3ff6 100644 --- a/system/Test/Mock/MockAppConfig.php +++ b/system/Test/Mock/MockAppConfig.php @@ -17,12 +17,6 @@ class MockAppConfig extends App { public string $baseURL = 'http://example.com/'; public string $uriProtocol = 'REQUEST_URI'; - public string $cookiePrefix = ''; - public string $cookieDomain = ''; - public string $cookiePath = '/'; - public bool $cookieSecure = false; - public bool $cookieHTTPOnly = false; - public ?string $cookieSameSite = 'Lax'; public array $proxyIPs = []; public string $CSRFTokenName = 'csrf_test_name'; public string $CSRFHeaderName = 'X-CSRF-TOKEN'; diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php index 261284887d8d..a1756f41e248 100644 --- a/system/Test/Mock/MockCLIConfig.php +++ b/system/Test/Mock/MockCLIConfig.php @@ -17,12 +17,6 @@ class MockCLIConfig extends App { public string $baseURL = 'http://example.com/'; public string $uriProtocol = 'REQUEST_URI'; - public string $cookiePrefix = ''; - public string $cookieDomain = ''; - public string $cookiePath = '/'; - public bool $cookieSecure = false; - public bool $cookieHTTPOnly = false; - public ?string $cookieSameSite = 'Lax'; public array $proxyIPs = []; public string $CSRFTokenName = 'csrf_test_name'; public string $CSRFCookieName = 'csrf_cookie_name'; From e954b7292641e35cd8a1282cf82979dd67e00484 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:01:27 +0900 Subject: [PATCH 3170/8282] refactor: add @var to specify type --- system/HTTP/Response.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php index d1b61e98562f..33cf7542635c 100644 --- a/system/HTTP/Response.php +++ b/system/HTTP/Response.php @@ -15,6 +15,7 @@ use CodeIgniter\Cookie\CookieStore; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; +use Config\Cookie as CookieConfig; use Config\Services; /** @@ -156,7 +157,11 @@ public function __construct($config) $this->CSPEnabled = $config->CSPEnabled; $this->cookieStore = new CookieStore([]); - Cookie::setDefaults(config('Cookie')); + + /** @var CookieConfig $cookie */ + $cookie = config('Cookie'); + + Cookie::setDefaults($cookie); // Default to an HTML Content-Type. Devs can override if needed. $this->setContentType('text/html'); From d3f06e96494daa0495f8a2db1fd08d58d8a0d99a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:06:11 +0900 Subject: [PATCH 3171/8282] refactor: private method --- system/Security/Security.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 210e9a71a72d..d0701f8eaa56 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -195,7 +195,10 @@ public function __construct(App $config) } if ($this->isCSRFCookie()) { - $this->configureCookie($config); + /** @var CookieConfig $cookie */ + $cookie = config('Cookie'); + + $this->configureCookie($cookie); } else { // Session based CSRF protection $this->configureSession(); @@ -220,11 +223,8 @@ private function configureSession(): void $this->session = Services::session(); } - private function configureCookie(App $config): void + private function configureCookie(CookieConfig $cookie): void { - /** @var CookieConfig $cookie */ - $cookie = config('Cookie'); - $cookiePrefix = $cookie->prefix; $this->cookieName = $cookiePrefix . $this->rawCookieName; Cookie::setDefaults($cookie); From 2ccf34190003a50af75afe372ee832ddd36c0add Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:27:20 +0900 Subject: [PATCH 3172/8282] test: remove test that are no longer needed --- tests/system/HTTP/ResponseTest.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index 6947d8eea33d..6ad18e7f0e11 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -12,7 +12,6 @@ namespace CodeIgniter\HTTP; use CodeIgniter\Config\Factories; -use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockResponse; @@ -512,14 +511,4 @@ public function testPretendOutput() $this->assertSame('Happy days', $actual); } - - public function testInvalidSameSiteCookie() - { - $config = new App(); - $config->cookieSameSite = 'Invalid'; - - $this->expectException(CookieException::class); - $this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid'])); - new Response($config); - } } From e9cc877a98e49494cc7b406ec3dc855b22d34441 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:28:43 +0900 Subject: [PATCH 3173/8282] docs: add @phpstan-var --- app/Config/Cookie.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php index 440af5ee8070..84ccc0e99d80 100644 --- a/app/Config/Cookie.php +++ b/app/Config/Cookie.php @@ -84,6 +84,8 @@ class Cookie extends BaseConfig * Defaults to `Lax` for compatibility with modern browsers. Setting `''` * (empty string) means default SameSite attribute set by browsers (`Lax`) * will be set on cookies. If set to `None`, `$secure` must also be set. + * + * @phpstan-var 'None'|'Lax'|'Strict'|'' */ public string $samesite = 'Lax'; From 85b90d8762b2b90f1dae7c59cd23a326e383deec Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:45:11 +0900 Subject: [PATCH 3174/8282] test: update failed tests --- tests/system/API/ResponseTraitTest.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index 0c060691b0b3..40a029dd8d44 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\API; +use CodeIgniter\Config\Factories; use CodeIgniter\Format\FormatterInterface; use CodeIgniter\Format\JSONFormatter; use CodeIgniter\Format\XMLFormatter; @@ -20,6 +21,7 @@ use CodeIgniter\Test\Mock\MockIncomingRequest; use CodeIgniter\Test\Mock\MockResponse; use Config\App; +use Config\Cookie; use stdClass; /** @@ -59,17 +61,25 @@ protected function makeController(array $userConfig = [], string $uri = 'http:// 'negotiateLocale' => false, 'supportedLocales' => ['en'], 'CSPEnabled' => false, - 'cookiePrefix' => '', - 'cookieDomain' => '', - 'cookiePath' => '/', - 'cookieSecure' => false, - 'cookieHTTPOnly' => false, 'proxyIPs' => [], - 'cookieSameSite' => 'Lax', ] as $key => $value) { $config->{$key} = $value; } + $cookie = new Cookie(); + + foreach ([ + 'prefix' => '', + 'domain' => '', + 'path' => '/', + 'secure' => false, + 'httponly' => false, + 'samesite' => 'Lax', + ] as $key => $value) { + $cookie->{$key} = $value; + } + Factories::injectMock('config', 'Cookie', $cookie); + if ($this->request === null) { $this->request = new MockIncomingRequest($config, new URI($uri), null, new UserAgent()); $this->response = new MockResponse($config); From dc47df79df257be62629bb00da24b833714d3f72 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 14:59:03 +0900 Subject: [PATCH 3175/8282] test: remove test that are no longer needed --- tests/system/CommonFunctionsTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index a0b5280ec6bc..23d7117f7045 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -488,12 +488,9 @@ public function testReallyWritable() public function testSlashItem() { - $this->assertSame('/', slash_item('cookiePath')); // / - $this->assertSame('', slash_item('cookieDomain')); // '' $this->assertSame('en/', slash_item('defaultLocale')); // en $this->assertSame('7200/', slash_item('sessionExpiration')); // int 7200 $this->assertSame('', slash_item('negotiateLocale')); // false - $this->assertSame('1/', slash_item('cookieHTTPOnly')); // true } public function testSlashItemOnInexistentItem() From dc138c272fe6edb6ebb7dd6874899a53b7716007 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 23 Dec 2022 15:01:10 +0900 Subject: [PATCH 3176/8282] test: update tests --- tests/system/API/ResponseTraitTest.php | 20 +++++++++++----- tests/system/CommonFunctionsTest.php | 24 +++++++++++++------ .../SecurityCSRFSessionRandomizeTokenTest.php | 21 +++++++++++----- .../Security/SecurityCSRFSessionTest.php | 21 +++++++++++----- 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index 40a029dd8d44..e6e18d508776 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -542,17 +542,25 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML() 'negotiateLocale' => false, 'supportedLocales' => ['en'], 'CSPEnabled' => false, - 'cookiePrefix' => '', - 'cookieDomain' => '', - 'cookiePath' => '/', - 'cookieSecure' => false, - 'cookieHTTPOnly' => false, 'proxyIPs' => [], - 'cookieSameSite' => 'Lax', ] as $key => $value) { $config->{$key} = $value; } + $cookie = new Cookie(); + + foreach ([ + 'prefix' => '', + 'domain' => '', + 'path' => '/', + 'secure' => false, + 'httponly' => false, + 'samesite' => 'Lax', + ] as $key => $value) { + $cookie->{$key} = $value; + } + Factories::injectMock('config', 'Cookie', $cookie); + $request = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent()); $response = new MockResponse($config); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 23d7117f7045..cf0555fba3d8 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter; use CodeIgniter\Config\BaseService; +use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; @@ -28,6 +29,7 @@ use CodeIgniter\Test\Mock\MockSession; use CodeIgniter\Test\TestLogger; use Config\App; +use Config\Cookie; use Config\Logger; use Config\Modules; use Config\Services; @@ -511,6 +513,8 @@ public function testSlashItemThrowsErrorOnNonStringableItem() protected function injectSessionMock() { + $appConfig = new App(); + $defaults = [ 'sessionDriver' => FileHandler::class, 'sessionCookieName' => 'ci_session', @@ -519,19 +523,25 @@ protected function injectSessionMock() 'sessionMatchIP' => false, 'sessionTimeToUpdate' => 300, 'sessionRegenerateDestroy' => false, - 'cookieDomain' => '', - 'cookiePrefix' => '', - 'cookiePath' => '/', - 'cookieSecure' => false, - 'cookieSameSite' => 'Lax', ]; - $appConfig = new App(); - foreach ($defaults as $key => $config) { $appConfig->{$key} = $config; } + $cookie = new Cookie(); + + foreach ([ + 'prefix' => '', + 'domain' => '', + 'path' => '/', + 'secure' => false, + 'samesite' => 'Lax', + ] as $key => $value) { + $cookie->{$key} = $value; + } + Factories::injectMock('config', 'Cookie', $cookie); + $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig); $session->setLogger(new TestLogger(new Logger())); BaseService::injectMock('session', $session); diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index 6086472d3f4c..f8f3fc01fbaa 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -26,6 +26,7 @@ use CodeIgniter\Test\Mock\MockSession; use CodeIgniter\Test\TestLogger; use Config\App as AppConfig; +use Config\Cookie; use Config\Logger as LoggerConfig; use Config\Security as SecurityConfig; @@ -75,20 +76,28 @@ private function createSession($options = []): Session 'sessionMatchIP' => false, 'sessionTimeToUpdate' => 300, 'sessionRegenerateDestroy' => false, - 'cookieDomain' => '', - 'cookiePrefix' => '', - 'cookiePath' => '/', - 'cookieSecure' => false, - 'cookieSameSite' => 'Lax', ]; + $config = array_merge($defaults, $options); - $config = array_merge($defaults, $options); $appConfig = new AppConfig(); foreach ($config as $key => $c) { $appConfig->{$key} = $c; } + $cookie = new Cookie(); + + foreach ([ + 'prefix' => '', + 'domain' => '', + 'path' => '/', + 'secure' => false, + 'samesite' => 'Lax', + ] as $key => $value) { + $cookie->{$key} = $value; + } + Factories::injectMock('config', 'Cookie', $cookie); + $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig); $session->setLogger(new TestLogger(new LoggerConfig())); diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index 7fbd7096853f..495f9e58b06d 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -25,6 +25,7 @@ use CodeIgniter\Test\Mock\MockSession; use CodeIgniter\Test\TestLogger; use Config\App as AppConfig; +use Config\Cookie; use Config\Logger as LoggerConfig; use Config\Security as SecurityConfig; @@ -68,20 +69,28 @@ private function createSession($options = []): Session 'sessionMatchIP' => false, 'sessionTimeToUpdate' => 300, 'sessionRegenerateDestroy' => false, - 'cookieDomain' => '', - 'cookiePrefix' => '', - 'cookiePath' => '/', - 'cookieSecure' => false, - 'cookieSameSite' => 'Lax', ]; + $config = array_merge($defaults, $options); - $config = array_merge($defaults, $options); $appConfig = new AppConfig(); foreach ($config as $key => $c) { $appConfig->{$key} = $c; } + $cookie = new Cookie(); + + foreach ([ + 'prefix' => '', + 'domain' => '', + 'path' => '/', + 'secure' => false, + 'samesite' => 'Lax', + ] as $key => $value) { + $cookie->{$key} = $value; + } + Factories::injectMock('config', 'Cookie', $cookie); + $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig); $session->setLogger(new TestLogger(new LoggerConfig())); From 01f7a6b7bd19aeb73dc5951da4d0788cb5cf125e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Feb 2023 12:53:54 +0900 Subject: [PATCH 3177/8282] docs: add docs --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + .../source/installation/upgrade_440.rst | 63 +++++++++++++++++++ .../source/installation/upgrading.rst | 1 + 3 files changed, 65 insertions(+) create mode 100644 user_guide_src/source/installation/upgrade_440.rst diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index a685e948e630..c80d12602c98 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -74,6 +74,7 @@ Message Changes Changes ******* +- **Config:** The deprecated Cookie items in **app/Config/App.php** has been removed. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. Deprecations diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst new file mode 100644 index 000000000000..16995c1d897e --- /dev/null +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -0,0 +1,63 @@ +############################## +Upgrading from 4.3.x to 4.4.0 +############################## + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +Breaking Changes +**************** + +Mandatory File Changes +********************** + +Config Files +============ + +app/Config/Cookie.php +--------------------- + +The Cookie config items in **app/Config/App.php** are no longer used. + +1. Copy **app/Config/Cookie.php** from the new framework to your **app/Config** + directory, and configure it. +2. Remove the properties (from ``$cookiePrefix`` to ``$cookieSameSite``) in + **app/Config/App.php**. + +Breaking Enhancements +********************* + +Project Files +************* + +Some files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. + +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +Content Changes +=============== + +The following files received significant changes (including deprecations or visual adjustments) +and it is recommended that you merge the updated versions with your application: + +Config +------ + +- @TODO + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +- @TODO diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index d754d020b55c..6ac83fd4c239 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_440 upgrade_432 upgrade_431 upgrade_430 From 09e267db52ddf02183f53af28ad072b8fc0f0c4d Mon Sep 17 00:00:00 2001 From: Samuel Asor Date: Sun, 5 Feb 2023 09:52:45 +0100 Subject: [PATCH 3178/8282] add support for display of error message using wildcard (*) --- system/Helpers/form_helper.php | 9 ++++++--- tests/system/Helpers/FormHelperTest.php | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php index 57d3f38b63a4..dfd4a64f0669 100644 --- a/system/Helpers/form_helper.php +++ b/system/Helpers/form_helper.php @@ -741,9 +741,12 @@ function validation_show_error(string $field, string $template = 'single'): stri $config = config('Validation'); $view = Services::renderer(); - $errors = validation_errors(); + $errors = array_filter(validation_errors(), static fn ($key) => preg_match( + '/^' . str_replace(['\.\*', '\*\.'], ['\..+', '.+\.'], preg_quote($field, '/')) . '$/', + $key + ), ARRAY_FILTER_USE_KEY); - if (! array_key_exists($field, $errors)) { + if ($errors === []) { return ''; } @@ -751,7 +754,7 @@ function validation_show_error(string $field, string $template = 'single'): stri throw ValidationException::forInvalidTemplate($template); } - return $view->setVar('error', $errors[$field]) + return $view->setVar('error', implode("\n", $errors)) ->render($config->templates[$template]); } } diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index 4e1ea582dd2d..d6508d8ff18c 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -996,6 +996,16 @@ public function testValidationShowError() $this->assertSame('The ID field is required.' . "\n", $html); } + public function testValidationShowErrorForWildcards() + { + $validation = Services::validation(); + $validation->setRule('user.0.name', 'Name', 'required')->run([]); + + $html = validation_show_error('user.*.name'); + + $this->assertSame('The Name field is required.' . "\n", $html); + } + public function testFormParseFormAttributesTrue() { $expected = 'readonly '; From f557414433b71210007cf533c907df67c8ebcffa Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 Feb 2023 19:21:05 +0900 Subject: [PATCH 3179/8282] docs: add section "GPG-Signing Old Commits" All topics related to GPG signatures can be reached from this document. --- contributing/signing.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributing/signing.md b/contributing/signing.md index e925327e9b71..6626911591d2 100644 --- a/contributing/signing.md +++ b/contributing/signing.md @@ -53,3 +53,7 @@ bash shell to use the **-S** option to force the secure signing. Regardless of how you sign a commit, commit messages are important too. See [Contribution Workflow](./workflow.md#commit-messages) for details. + +## GPG-Signing Old Commits + +See [Contribution Workflow](./workflow.md#gpg-signing-old-commits). From 6bbf117c535af776a5adeaad1de77e51d91d333a Mon Sep 17 00:00:00 2001 From: Amel Date: Sun, 5 Feb 2023 08:55:57 +0100 Subject: [PATCH 3180/8282] sign commits --- system/Common.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/system/Common.php b/system/Common.php index 218252ed7985..95253830430a 100644 --- a/system/Common.php +++ b/system/Common.php @@ -10,6 +10,7 @@ */ use CodeIgniter\Cache\CacheInterface; +use CodeIgniter\Config\BaseConfig; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; @@ -47,8 +48,7 @@ */ function app_timezone(): string { - /** @var App $config */ - $config = config('App'); + $config = config(App::class); return $config->appTimezone; } @@ -203,7 +203,11 @@ function command(string $command) /** * More simple way of getting config instances from Factories * - * @return object|null + * @template T of BaseConfig + * + * @param class-string $name + * + * @return T */ function config(string $name, bool $getShared = true) { @@ -495,7 +499,7 @@ function force_https(int $duration = 31_536_000, ?RequestInterface $request = nu Services::session(null, true)->regenerate(); // @codeCoverageIgnore } - $baseURL = config('App')->baseURL; + $baseURL = config(App::class)->baseURL; if (strpos($baseURL, 'https://') === 0) { $authority = substr($baseURL, strlen('https://')); @@ -885,7 +889,7 @@ function redirect(?string $route = null): RedirectResponse */ function _solidus(): string { - if (config('DocTypes')->html5 ?? false) { + if (config(\Config\DocTypes::class)->html5 ?? false) { return ''; } @@ -973,10 +977,9 @@ function route_to(string $method, ...$params) * session()->set('foo', 'bar'); * $foo = session('bar'); * - * @param string $val + * @param string|null $val * * @return array|bool|float|int|object|Session|string|null - * @phpstan-return ($val is null ? Session : array|bool|float|int|object|string|null) */ function session(?string $val = null) { @@ -1064,7 +1067,7 @@ function single_service(string $name, ...$params) */ function slash_item(string $item): ?string { - $config = config('App'); + $config = config(App::class); if (! property_exists($config, $item)) { return null; @@ -1166,10 +1169,8 @@ function timer(?string $name = null, ?callable $callable = null) */ function view(string $name, array $data = [], array $options = []): string { - /** @var CodeIgniter\View\View $renderer */ $renderer = Services::renderer(); - /** @var \CodeIgniter\Config\View $config */ $config = config(View::class); $saveData = $config->saveData; From 8b9bf3bfd3ea52df3b5403ef790a637c676d0f4b Mon Sep 17 00:00:00 2001 From: Amel Date: Sun, 5 Feb 2023 09:57:08 +0100 Subject: [PATCH 3181/8282] Replace qualifier with an import DocTypes --- system/Common.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Common.php b/system/Common.php index 95253830430a..9cd08f55fa59 100644 --- a/system/Common.php +++ b/system/Common.php @@ -32,6 +32,7 @@ use CodeIgniter\Test\TestLogger; use Config\App; use Config\Database; +use Config\DocTypes; use Config\Logger; use Config\Services; use Config\View; @@ -889,7 +890,7 @@ function redirect(?string $route = null): RedirectResponse */ function _solidus(): string { - if (config(\Config\DocTypes::class)->html5 ?? false) { + if (config(DocTypes::class)->html5 ?? false) { return ''; } From 4adc017d739a22fd86d24155a09bdfa853256806 Mon Sep 17 00:00:00 2001 From: Amel Date: Sun, 5 Feb 2023 11:53:32 +0100 Subject: [PATCH 3182/8282] Restore @phpstan-return [ci skip] --- system/Common.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/Common.php b/system/Common.php index 9cd08f55fa59..dd055a230f1b 100644 --- a/system/Common.php +++ b/system/Common.php @@ -978,9 +978,8 @@ function route_to(string $method, ...$params) * session()->set('foo', 'bar'); * $foo = session('bar'); * - * @param string|null $val - * * @return array|bool|float|int|object|Session|string|null + * @phpstan-return ($val is null ? Session : array|bool|float|int|object|string|null) */ function session(?string $val = null) { From ce1247d7b05af5e52c13401c282dd095470a1181 Mon Sep 17 00:00:00 2001 From: Samuel Asor Date: Sun, 5 Feb 2023 12:15:23 +0100 Subject: [PATCH 3183/8282] applied code review suggestion --- tests/system/Helpers/FormHelperTest.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index d6508d8ff18c..0c914ee1df67 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -999,7 +999,16 @@ public function testValidationShowError() public function testValidationShowErrorForWildcards() { $validation = Services::validation(); - $validation->setRule('user.0.name', 'Name', 'required')->run([]); + $validation->setRule('user.*.name', 'Name', 'required') + ->run([ + 'user' => [ + 'friends' => [ + ['name' => 'Name1'], + ['name' => ''], + ['name' => 'Name2'], + ] + ] + ]); $html = validation_show_error('user.*.name'); From 256d9a2f6e5cb498bb98c82a79f65330980ef154 Mon Sep 17 00:00:00 2001 From: Samuel Asor Date: Sun, 5 Feb 2023 12:20:22 +0100 Subject: [PATCH 3184/8282] cs-fix --- tests/system/Helpers/FormHelperTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index 0c914ee1df67..9a525adf7ad2 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -1006,8 +1006,8 @@ public function testValidationShowErrorForWildcards() ['name' => 'Name1'], ['name' => ''], ['name' => 'Name2'], - ] - ] + ], + ], ]); $html = validation_show_error('user.*.name'); From 9f93346e8fe6ead5395f91676c5b387c059a452b Mon Sep 17 00:00:00 2001 From: Amel Date: Sun, 5 Feb 2023 12:24:29 +0100 Subject: [PATCH 3185/8282] Fix phpstan errors --- system/Common.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/Common.php b/system/Common.php index dd055a230f1b..ce81e92dd183 100644 --- a/system/Common.php +++ b/system/Common.php @@ -204,11 +204,12 @@ function command(string $command) /** * More simple way of getting config instances from Factories * - * @template T of BaseConfig + * @template ConfigTemplate of BaseConfig * - * @param class-string $name + * @param class-string|string $name * - * @return T + * @return ConfigTemplate + * @phpstan-return ($name is class-string ? ConfigTemplate : object|null) */ function config(string $name, bool $getShared = true) { From dbf23bf5d369cb809aa1820062ec2645001ffdf0 Mon Sep 17 00:00:00 2001 From: MichalKoder <50060787+MichalKoder@users.noreply.github.com> Date: Sun, 5 Feb 2023 14:07:16 +0100 Subject: [PATCH 3186/8282] A spelling correction in model.html --- user_guide_src/source/models/model.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 726c26dac728..06f7d84f26f2 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -727,7 +727,7 @@ Additionally, each model may allow (default) or deny callbacks class-wide by set .. literalinclude:: model/052.php -You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method: +You may also change this setting temporarily for a single model call using the ``allowCallbacks()`` method: .. literalinclude:: model/053.php From 5f19ad9a4e95a7fae0c5cd1655fea0a5c43eea8c Mon Sep 17 00:00:00 2001 From: Amel Date: Sun, 5 Feb 2023 16:29:03 +0100 Subject: [PATCH 3187/8282] Add null as a possible return --- system/Common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Common.php b/system/Common.php index ce81e92dd183..e6fc862fa102 100644 --- a/system/Common.php +++ b/system/Common.php @@ -208,7 +208,7 @@ function command(string $command) * * @param class-string|string $name * - * @return ConfigTemplate + * @return ConfigTemplate|null * @phpstan-return ($name is class-string ? ConfigTemplate : object|null) */ function config(string $name, bool $getShared = true) From 671cc824739b2c7727c2b1e68d33f2f962e2f78a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 Feb 2023 07:26:53 +0900 Subject: [PATCH 3188/8282] fix: restore removed $config->baseURL check --- system/Helpers/url_helper.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 9c035144a04b..ee41d2488e70 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -39,6 +39,16 @@ function _get_uri($relativePath = '', ?App $config = null): URI if ($config === null) { /** @var App $appConfig */ $appConfig = config('App'); + + if ($appConfig->baseURL === '') { + throw new InvalidArgumentException( + '_get_uri() requires a valid baseURL.' + ); + } + } elseif ($config->baseURL === '') { + throw new InvalidArgumentException( + '_get_uri() requires a valid baseURL.' + ); } // Convert array of segments to a string From b9cae3c766ea21fa39f3fd9f99947a6a600494f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 Feb 2023 07:34:34 +0900 Subject: [PATCH 3189/8282] refactor: remove variable --- system/Helpers/url_helper.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index ee41d2488e70..1a064a76175f 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -169,17 +169,15 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul $routePath = $request->getPath(); $currentURI = $request->getUri(); - $relativePath = $routePath; - // Append queries and fragments if ($query = $currentURI->getQuery()) { - $relativePath .= '?' . $query; + $query = '?' . $query; } if ($fragment = $currentURI->getFragment()) { - $relativePath .= '#' . $fragment; + $fragment = '#' . $fragment; } - $uri = _get_uri($relativePath); + $uri = _get_uri($routePath . $query . $fragment); return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath()); } From 495418ae8efde7ba9a45967c3f3442d2a9b58f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Feb 2023 15:01:21 +0000 Subject: [PATCH 3190/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.11...0.15.12) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f4c9c31236fa..8a2f047409f0 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.11", + "rector/rector": "0.15.12", "vimeo/psalm": "^5.0" }, "suggest": { From 20638680f388d753288146d839642276c72b9b32 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Feb 2023 17:32:15 +0900 Subject: [PATCH 3191/8282] test: add comment --- tests/system/HTTP/IncomingRequestDetectingTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index f3be0aeb2247..cd220cbe0987 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -68,6 +68,14 @@ public function testPathRequestURI() public function testPathRequestURINested() { + // I'm not sure but this is a case of Apache config making such SERVER + // values? + // The current implementation doesn't use the value of the URI object. + // So I removed the code to set URI. Therefore, it's exactly the same as + // the method above as a test. + // But it may be changed in the future to use the value of the URI object. + // So I don't remove this test case. + // /ci/index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; $_SERVER['SCRIPT_NAME'] = '/index.php'; From 66bafe4e54a16ebdefa57d5e785154e52b86fddb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:00:57 +0000 Subject: [PATCH 3192/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.12...0.15.13) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8a2f047409f0..7a58a7be0d21 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.12", + "rector/rector": "0.15.13", "vimeo/psalm": "^5.0" }, "suggest": { From 2f71c7a43619b27b041df0a28f8f257edba3b1c9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 08:21:22 +0900 Subject: [PATCH 3193/8282] fix: deprecate $request and $response in Exceptions::__construct() When registering Exception Handler, Request object was generated. But it was too early, and difficult to understand. --- system/Config/Services.php | 6 +++++- system/Debug/Exceptions.php | 12 ++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index a2d13c40e80c..2358e87bb1a5 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -250,6 +250,8 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared = * - register_shutdown_function * * @return Exceptions + * + * @deprecated The parameter $request and $response are deprecated. */ public static function exceptions( ?ExceptionsConfig $config = null, @@ -262,7 +264,9 @@ public static function exceptions( } $config ??= config('Exceptions'); - $request ??= AppServices::request(); + /** @var ExceptionsConfig $config */ + + // @TODO remove instantiation of Response in the future. $response ??= AppServices::response(); return new Exceptions($config, $request, $response); diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 6dc098d4af10..d4e80f28f2e9 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -21,6 +21,7 @@ use CodeIgniter\HTTP\ResponseInterface; use Config\Exceptions as ExceptionsConfig; use Config\Paths; +use Config\Services; use ErrorException; use Psr\Log\LogLevel; use Throwable; @@ -71,15 +72,15 @@ class Exceptions private ?Throwable $exceptionCaughtByExceptionHandler = null; /** - * @param CLIRequest|IncomingRequest $request + * @param CLIRequest|IncomingRequest|null $request + * + * @deprecated The parameter $request and $response are deprecated. No longer used. */ - public function __construct(ExceptionsConfig $config, $request, ResponseInterface $response) + public function __construct(ExceptionsConfig $config, $request, ResponseInterface $response) /** @phpstan-ignore-line */ { $this->ob_level = ob_get_level(); $this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR; $this->config = $config; - $this->request = $request; - $this->response = $response; // workaround for upgraded users // This causes "Deprecated: Creation of dynamic property" in PHP 8.2. @@ -119,6 +120,9 @@ public function exceptionHandler(Throwable $exception) [$statusCode, $exitCode] = $this->determineCodes($exception); + $this->request = Services::request(); + $this->response = Services::response(); + if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) { log_message('critical', "{message}\nin {exFile} on line {exLine}.\n{trace}", [ 'message' => $exception->getMessage(), From 044460855855ba9df308a520c5e6cb16f759b8d1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 08:46:23 +0900 Subject: [PATCH 3194/8282] chore: add rule to skip --- rector.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rector.php b/rector.php index 797387ba4aba..0473a5d8cfdb 100644 --- a/rector.php +++ b/rector.php @@ -28,6 +28,7 @@ use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Config\RectorConfig; +use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; @@ -89,6 +90,11 @@ __DIR__ . '/tests/system/Test/ReflectionHelperTest.php', ], + RemoveUnusedConstructorParamRector::class => [ + // there are deprecated parameters + __DIR__ . '/system/Debug/Exceptions.php', + ], + // call on purpose for nothing happen check RemoveEmptyMethodCallRector::class => [ __DIR__ . '/tests', From 08a6a7852dbe4aacafb206524b68c0c940889059 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 09:23:23 +0900 Subject: [PATCH 3195/8282] test: fix incorrect setup baseURL should not be empty. --- tests/system/Helpers/FormHelperTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index 9a525adf7ad2..b45329c8663c 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -39,7 +39,6 @@ private function setRequest(): void Services::injectMock('uri', $uri); $config = new App(); - $config->baseURL = ''; $config->indexPage = 'index.php'; $request = Services::request($config); From ef8a25f359aaf7621431eb42c461846220fe99dd Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Thu, 9 Feb 2023 05:42:36 +0330 Subject: [PATCH 3196/8282] docs: link to all repo --- .../source/installation/repositories.rst | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst index cbdf8f8c28d3..920efc27800f 100644 --- a/user_guide_src/source/installation/repositories.rst +++ b/user_guide_src/source/installation/repositories.rst @@ -16,24 +16,31 @@ There are several development repositories, of interest to potential contributor +------------------+--------------+-----------------------------------------------------------------+ | Repository | Audience | Description | +==================+==============+=================================================================+ -| CodeIgniter4 | contributors | Project codebase, including tests & user guide sources | +| CodeIgniter4_ | contributors | Project codebase, including tests & user guide sources | +------------------+--------------+-----------------------------------------------------------------+ -| translations | developers | System message translations | +| translations_ | developers | System message translations | +------------------+--------------+-----------------------------------------------------------------+ | coding-standard_ | contributors | Coding style conventions & rules | +------------------+--------------+-----------------------------------------------------------------+ -| devkit | developers | Development toolkit for CodeIgniter libraries and projects | +| devkit_ | developers | Development toolkit for CodeIgniter libraries and projects | +------------------+--------------+-----------------------------------------------------------------+ -| settings | developers | Settings Library for CodeIgniter 4 | +| settings_ | developers | Settings Library for CodeIgniter 4 | +------------------+--------------+-----------------------------------------------------------------+ -| shield | developers | Authentication and Authorization Library for CodeIgniter 4 | +| shield_ | developers | Authentication and Authorization Library for CodeIgniter 4 | +------------------+--------------+-----------------------------------------------------------------+ -| tasks | developers | Task Scheduler for CodeIgniter 4 | +| tasks_ | developers | Task Scheduler for CodeIgniter 4 | +------------------+--------------+-----------------------------------------------------------------+ -| cache | developers | PSR-6 and PSR-16 Cache Adapters for CodeIgniter 4 | +| cache_ | developers | PSR-6 and PSR-16 Cache Adapters for CodeIgniter 4 | +------------------+--------------+-----------------------------------------------------------------+ +.. _CodeIgniter4: https://github.com/codeigniter4/CodeIgniter4 +.. _translations: https://github.com/codeigniter4/translations .. _coding-standard: https://github.com/CodeIgniter/coding-standard +.. _devkit: https://github.com/codeigniter4/devkit +.. _settings: https://github.com/codeigniter4/settings +.. _shield: https://codeigniter4.github.io/shield +.. _tasks: https://github.com/codeigniter4/tasks +.. _cache: https://github.com/codeigniter4/cache There are also several deployment repositories, referenced in the installation directions. The deployment repositories are built automatically when a new version is released, and they @@ -42,14 +49,18 @@ are not directly contributed to. +------------------+--------------+-----------------------------------------------------------------+ | Repository | Audience | Description | +==================+==============+=================================================================+ -| framework | developers | Released versions of the framework | +| framework_ | developers | Released versions of the framework | +------------------+--------------+-----------------------------------------------------------------+ -| appstarter | developers | Starter project (app/public/writable). | +| appstarter_ | developers | Starter project (app/public/writable). | | | | Dependent on "framework" | +------------------+--------------+-----------------------------------------------------------------+ -| userguide | anyone | Pre-built user guide | +| userguide_ | anyone | Pre-built user guide | +------------------+--------------+-----------------------------------------------------------------+ +.. _framework: https://github.com/codeigniter4/framework +.. _appstarter: https://github.com/codeigniter4/appstarter +.. _userguide: https://github.com/codeigniter4/userguide + In all the above, the latest version of a repository can be downloaded by selecting the "releases" link in the secondary navbar inside the "Code" tab of its GitHub repository page. The current (in development) version of each can @@ -83,9 +94,12 @@ but which showcase it or make it easier to work with! +------------------+--------------+-----------------------------------------------------------------+ | Repository | Audience | Description | +==================+==============+=================================================================+ -| website | developers | The codeigniter.com website, written in CodeIgniter 4 | +| website_ | developers | The codeigniter.com website, written in CodeIgniter 4 | +------------------+--------------+-----------------------------------------------------------------+ -| playground | developers | Basic code examples in project form. Still growing. | +| playground_ | developers | Basic code examples in project form. Still growing. | +------------------+--------------+-----------------------------------------------------------------+ +.. _website: https://github.com/codeigniter4projects/website +.. _playground: https://github.com/codeigniter4projects/playground + These are not composer-installable repositories. From fab8a3dab6f6b470756bb243b31c511258ee82e4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 14:17:29 +0900 Subject: [PATCH 3197/8282] docs: clarify the method name --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index a3b74e979966..934e9e3a64e7 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -116,7 +116,7 @@ After the fields have been defined, they can be added using $forge->addField() ------------------ -The add fields method will accept the above array. +The ``addField()`` method will accept the above array. .. _forge-addfield-default-value-rawsql: From d89d6fc6b9f8fc22597bef822a4e4c5fc59c1e59 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 14:18:12 +0900 Subject: [PATCH 3198/8282] docs: clarify above --- user_guide_src/source/dbmgmt/forge.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 934e9e3a64e7..3714dd07a976 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -86,6 +86,8 @@ There are several things you may wish to do when creating tables. Add fields, add keys to the table, alter columns. CodeIgniter provides a mechanism for this. +.. _adding-fields: + Adding Fields ============= @@ -249,8 +251,8 @@ $forge->addColumn() ------------------- The ``addColumn()`` method is used to modify an existing table. It -accepts the same field array as above, and can be used for an unlimited -number of additional fields. +accepts the same field array as :ref:`Creating Tables `, and can +be used for an unlimited number of additional fields. .. literalinclude:: forge/022.php From e93fc0a4e50d6e61a53f32abc0b65fd832b1a6b6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 14:20:42 +0900 Subject: [PATCH 3199/8282] docs: add "existing" --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 3714dd07a976..01ace8e60029 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -350,7 +350,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Adds a column to a table. Usage: See `Adding a Field to a Table`_. + Adds a column to an existing table. Usage: See `Adding a Field to a Table`_. .. php:method:: addField($field) From 73d6d624c8c8d780e334679909d8251b33543466 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 14:21:36 +0900 Subject: [PATCH 3200/8282] docs: fix classname notation --- user_guide_src/source/dbmgmt/forge.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 01ace8e60029..dafabfdaed57 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -355,8 +355,8 @@ Class Reference .. php:method:: addField($field) :param array $field: Field definition to add - :returns: \CodeIgniter\Database\Forge instance (method chaining) - :rtype: \CodeIgniter\Database\Forge + :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) + :rtype: ``\CodeIgniter\Database\Forge`` Adds a field to the set that will be used to create a table. Usage: See `Adding Fields`_. @@ -368,8 +368,8 @@ Class Reference :param string $onUpdate: Desired action for the "on update" :param string $onDelete: Desired action for the "on delete" :param string $fkName: Name of foreign key. This does not work with SQLite3 - :returns: \CodeIgniter\Database\Forge instance (method chaining) - :rtype: \CodeIgniter\Database\Forge + :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) + :rtype: ``\CodeIgniter\Database\Forge`` Adds a foreign key to the set that will be used to create a table. Usage: See `Adding Foreign Keys`_. @@ -381,8 +381,8 @@ Class Reference :param bool $primary: Set to true if it should be a primary key or a regular one :param bool $unique: Set to true if it should be a unique key or a regular one :param string $keyName: Name of key to be added - :returns: \CodeIgniter\Database\Forge instance (method chaining) - :rtype: \CodeIgniter\Database\Forge + :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) + :rtype: ``\CodeIgniter\Database\Forge`` Adds a key to the set that will be used to create a table. Usage: See `Adding Keys`_. @@ -392,8 +392,8 @@ Class Reference :param mixed $key: Name of a key field or an array of fields :param string $keyName: Name of key to be added - :returns: \CodeIgniter\Database\Forge instance (method chaining) - :rtype: \CodeIgniter\Database\Forge + :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) + :rtype: ``\CodeIgniter\Database\Forge`` Adds a primary key to the set that will be used to create a table. Usage: See `Adding Keys`_. @@ -403,8 +403,8 @@ Class Reference :param mixed $key: Name of a key field or an array of fields :param string $keyName: Name of key to be added - :returns: \CodeIgniter\Database\Forge instance (method chaining) - :rtype: \CodeIgniter\Database\Forge + :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) + :rtype: ``\CodeIgniter\Database\Forge`` Adds a unique key to the set that will be used to create a table. Usage: See `Adding Keys`_. From 6af6a8579eabc558c4c6ec19bd7b846bb6e5231f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 14:22:02 +0900 Subject: [PATCH 3201/8282] docs: remove unneeded space --- user_guide_src/source/dbmgmt/forge.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index dafabfdaed57..ff53a9ae3c5f 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -358,7 +358,7 @@ Class Reference :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) :rtype: ``\CodeIgniter\Database\Forge`` - Adds a field to the set that will be used to create a table. Usage: See `Adding Fields`_. + Adds a field to the set that will be used to create a table. Usage: See `Adding Fields`_. .. php:method:: addForeignKey($fieldName, $tableName, $tableField[, $onUpdate = '', $onDelete = '', $fkName = '']) @@ -371,7 +371,7 @@ Class Reference :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) :rtype: ``\CodeIgniter\Database\Forge`` - Adds a foreign key to the set that will be used to create a table. Usage: See `Adding Foreign Keys`_. + Adds a foreign key to the set that will be used to create a table. Usage: See `Adding Foreign Keys`_. .. note:: ``$fkName`` can be used since v4.3.0. @@ -384,7 +384,7 @@ Class Reference :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) :rtype: ``\CodeIgniter\Database\Forge`` - Adds a key to the set that will be used to create a table. Usage: See `Adding Keys`_. + Adds a key to the set that will be used to create a table. Usage: See `Adding Keys`_. .. note:: ``$keyName`` can be used since v4.3.0. @@ -395,7 +395,7 @@ Class Reference :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) :rtype: ``\CodeIgniter\Database\Forge`` - Adds a primary key to the set that will be used to create a table. Usage: See `Adding Keys`_. + Adds a primary key to the set that will be used to create a table. Usage: See `Adding Keys`_. .. note:: ``$keyName`` can be used since v4.3.0. @@ -406,7 +406,7 @@ Class Reference :returns: ``\CodeIgniter\Database\Forge`` instance (method chaining) :rtype: ``\CodeIgniter\Database\Forge`` - Adds a unique key to the set that will be used to create a table. Usage: See `Adding Keys`_. + Adds a unique key to the set that will be used to create a table. Usage: See `Adding Keys`_. .. note:: ``$keyName`` can be used since v4.3.0. @@ -417,7 +417,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Creates a new database. Usage: See `Creating and Dropping Databases`_. + Creates a new database. Usage: See `Creating and Dropping Databases`_. .. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]]) @@ -427,7 +427,7 @@ Class Reference :returns: Query object on success, false on failure :rtype: mixed - Creates a new table. Usage: See `Creating a Table`_. + Creates a new table. Usage: See `Creating a Table`_. .. php:method:: dropColumn($table, $column_name) @@ -436,7 +436,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Drops single or multiple columns from a table. Usage: See `Dropping Fields From a Table`_. + Drops single or multiple columns from a table. Usage: See `Dropping Fields From a Table`_. .. php:method:: dropDatabase($dbName) @@ -444,7 +444,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Drops a database. Usage: See `Creating and Dropping Databases`_. + Drops a database. Usage: See `Creating and Dropping Databases`_. .. php:method:: dropKey($table, $keyName[, $prefixKeyName = true]) @@ -476,7 +476,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Drops a table. Usage: See `Dropping a Table`_. + Drops a table. Usage: See `Dropping a Table`_. .. php:method:: processIndexes($table) @@ -497,7 +497,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - Modifies a table column. Usage: See `Modifying a Field in a Table`_. + Modifies a table column. Usage: See `Modifying a Field in a Table`_. .. php:method:: renameTable($table_name, $new_table_name) @@ -506,4 +506,4 @@ Class Reference :returns: Query object on success, false on failure :rtype: mixed - Renames a table. Usage: See `Renaming a Table`_. + Renames a table. Usage: See `Renaming a Table`_. From 4b153141a2d1eae9b47717abe3f30a14283fe349 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Feb 2023 09:36:52 +0900 Subject: [PATCH 3202/8282] docs: fix incorrect description DBMS has its own maximum column number in a table. --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index ff53a9ae3c5f..21da852e9d4f 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -252,7 +252,7 @@ $forge->addColumn() The ``addColumn()`` method is used to modify an existing table. It accepts the same field array as :ref:`Creating Tables `, and can -be used for an unlimited number of additional fields. +be used to add additional fields. .. literalinclude:: forge/022.php From c4efd78fa96c4b3fe543d6abbcc3a77bcab0d517 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 3 Mar 2022 13:29:05 +0900 Subject: [PATCH 3203/8282] feat: add Entity::injectRawData() to avoid name collision --- system/Database/MySQLi/Result.php | 2 +- system/Database/OCI8/Result.php | 2 +- system/Database/Postgre/Result.php | 2 +- system/Database/SQLSRV/Result.php | 2 +- system/Database/SQLite3/Result.php | 2 +- system/Entity/Entity.php | 16 ++++++++++++++-- tests/system/Entity/EntityTest.php | 30 ++++++++++++++++++++++++++++++ 7 files changed, 49 insertions(+), 7 deletions(-) diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php index 550fc0abf835..90bf314964c5 100644 --- a/system/Database/MySQLi/Result.php +++ b/system/Database/MySQLi/Result.php @@ -146,7 +146,7 @@ protected function fetchAssoc() protected function fetchObject(string $className = 'stdClass') { if (is_subclass_of($className, Entity::class)) { - return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data); + return empty($data = $this->fetchAssoc()) ? false : (new $className())->injectRawData($data); } return $this->resultID->fetch_object($className); diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php index cb192de325f1..f20dcaddb88e 100644 --- a/system/Database/OCI8/Result.php +++ b/system/Database/OCI8/Result.php @@ -102,7 +102,7 @@ protected function fetchObject(string $className = 'stdClass') return $row; } if (is_subclass_of($className, Entity::class)) { - return (new $className())->setAttributes((array) $row); + return (new $className())->injectRawData((array) $row); } $instance = new $className(); diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php index c3fce412223d..ebda4f9e9b02 100644 --- a/system/Database/Postgre/Result.php +++ b/system/Database/Postgre/Result.php @@ -112,7 +112,7 @@ protected function fetchAssoc() protected function fetchObject(string $className = 'stdClass') { if (is_subclass_of($className, Entity::class)) { - return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data); + return empty($data = $this->fetchAssoc()) ? false : (new $className())->injectRawData($data); } return pg_fetch_object($this->resultID, null, $className); diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php index 6e172d8ac770..541dbe34d31e 100755 --- a/system/Database/SQLSRV/Result.php +++ b/system/Database/SQLSRV/Result.php @@ -152,7 +152,7 @@ protected function fetchAssoc() protected function fetchObject(string $className = 'stdClass') { if (is_subclass_of($className, Entity::class)) { - return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data); + return empty($data = $this->fetchAssoc()) ? false : (new $className())->injectRawData($data); } return sqlsrv_fetch_object($this->resultID, $className); diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php index 05994469e5eb..3f6169970571 100644 --- a/system/Database/SQLite3/Result.php +++ b/system/Database/SQLite3/Result.php @@ -140,7 +140,7 @@ protected function fetchObject(string $className = 'stdClass') $classObj = new $className(); if (is_subclass_of($className, Entity::class)) { - return $classObj->setAttributes($row); + return $classObj->injectRawData($row); } $classSet = Closure::bind(function ($key, $value) { diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 92cedeff213f..5220ae5b0aa8 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -279,7 +279,7 @@ public function hasChanged(?string $key = null): bool * * @return $this */ - public function setAttributes(array $data) + public function injectRawData(array $data) { $this->attributes = $data; @@ -288,6 +288,18 @@ public function setAttributes(array $data) return $this; } + /** + * Set raw data array without any mutations + * + * @return $this + * + * @deprecated Use injectRawData() instead. + */ + public function setAttributes(array $data) + { + return $this->injectRawData($data); + } + /** * Checks the datamap to see if this property name is being mapped, * and returns the db column name, if any, or the original property name. @@ -449,7 +461,7 @@ public function __set(string $key, $value = null) // so maybe wants to do sth with null value automatically $method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key))); - if (method_exists($this, $method)) { + if (method_exists($this, $method) && $method !== 'setAttributes') { $this->{$method}($value); return $this; diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 1e03157ab188..79aeb53f3199 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -34,6 +34,36 @@ final class EntityTest extends CIUnitTestCase { use ReflectionHelper; + public function testSetStringToPropertyNamedAttributes() + { + $entity = $this->getEntity(); + + $entity->attributes = 'attributes'; + + $this->assertSame('attributes', $entity->attributes); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues + */ + public function testSetArrayToPropertyNamedAttributes() + { + $entity = new Entity(); + + $entity->a = 1; + $entity->attributes = [1, 2, 3]; + + $expected = [ + 'a' => 1, + 'attributes' => [ + 0 => 1, + 1 => 2, + 2 => 3, + ], + ]; + $this->assertSame($expected, $entity->toRawArray()); + } + public function testSimpleSetAndGet() { $entity = $this->getEntity(); From 63a00bbfdb676c33afc3911e061cb852e3ccd386 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Feb 2023 10:53:41 +0900 Subject: [PATCH 3204/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index dcb705a9fa15..965a0efbc057 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -83,6 +83,8 @@ Changes Deprecations ************ +- **Entity:** ``Entity::setAttributes()`` is deprecated. Use ``Entity::injectRawData()`` instead. + Bugs Fixed ********** From 7240d4b1f377bd2e3b60498a11a6684467e76243 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Feb 2023 13:47:30 +0900 Subject: [PATCH 3205/8282] docs: change text decoration --- user_guide_src/source/general/environments.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index bac1f4c394cb..e623d1754382 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -48,7 +48,7 @@ The simplest method to set the variable is in your :doc:`.env file `_. .. code-block:: apache @@ -62,7 +62,7 @@ nginx ----- Under nginx, you must pass the environment variable through the ``fastcgi_params`` -in order for it to show up under the `$_SERVER` variable. This allows it to work on the +in order for it to show up under the ``$_SERVER`` variable. This allows it to work on the virtual-host level, instead of using `env` to set it for the entire server, though that would work fine on a dedicated server. You would then modify your server config to something like: @@ -105,14 +105,14 @@ a fresh install: Effects On Default Framework Behavior ===================================== -There are some places in the CodeIgniter system where the ENVIRONMENT +There are some places in the CodeIgniter system where the ``ENVIRONMENT`` constant is used. This section describes how default framework behavior is affected. Error Reporting --------------- -Setting the ENVIRONMENT constant to a value of ``development`` will cause +Setting the ``ENVIRONMENT`` constant to a value of ``development`` will cause all PHP errors to be rendered to the browser when they occur. Conversely, setting the constant to ``production`` will disable all error output. Disabling error reporting in production is a From 36f17a9aba067a419b773d2d66d6f26948a6e32c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Feb 2023 13:48:02 +0900 Subject: [PATCH 3206/8282] docs: update apache docs link --- user_guide_src/source/general/environments.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index e623d1754382..f847ce9e3398 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -49,7 +49,7 @@ Apache ------ This server variable can be set in your **.htaccess** file or Apache -config using `SetEnv `_. +config using `SetEnv `_. .. code-block:: apache From a375cefd92da0790e1630ddbad72494c94991b72 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Feb 2023 13:48:25 +0900 Subject: [PATCH 3207/8282] docs: replace nginx with Nginx --- user_guide_src/source/general/environments.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index f847ce9e3398..00661c5c86dd 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -58,10 +58,10 @@ config using `SetEnv .. _environment-nginx: -nginx +Nginx ----- -Under nginx, you must pass the environment variable through the ``fastcgi_params`` +Under Nginx, you must pass the environment variable through the ``fastcgi_params`` in order for it to show up under the ``$_SERVER`` variable. This allows it to work on the virtual-host level, instead of using `env` to set it for the entire server, though that would work fine on a dedicated server. You would then modify your server config to something @@ -80,7 +80,7 @@ like: } } -Alternative methods are available for nginx and other servers, or you can +Alternative methods are available for Nginx and other servers, or you can remove this logic entirely and set the constant based on the server's IP address (for instance). From 5acce4d3588d30b3ab5b980e08493b876f1dfe3f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Feb 2023 13:48:50 +0900 Subject: [PATCH 3208/8282] docs: replace On with on --- user_guide_src/source/general/environments.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst index 00661c5c86dd..c95041865f54 100644 --- a/user_guide_src/source/general/environments.rst +++ b/user_guide_src/source/general/environments.rst @@ -102,7 +102,7 @@ a fresh install: * production.php * testing.php -Effects On Default Framework Behavior +Effects on Default Framework Behavior ===================================== There are some places in the CodeIgniter system where the ``ENVIRONMENT`` From fe9be1b8b892f670280afe0b9a68a13603030fd7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:03:44 +0900 Subject: [PATCH 3209/8282] docs: add link to page --- user_guide_src/source/libraries/uri.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index 5e400874f548..f772840b0046 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -31,7 +31,7 @@ The Current URI --------------- Many times, all you really want is an object representing the current URL of this request. -You can use one of the functions available in the **url_helper**: +You can use one of the functions available in the :doc:`../helpers/url_helper`: .. literalinclude:: uri/004.php From 9e6fb5d43bcabc4a69fbd4a1f672e037e6ae7178 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:04:20 +0900 Subject: [PATCH 3210/8282] docs: change text decoration --- user_guide_src/source/libraries/uri.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index f772840b0046..a795cff51ad8 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -37,7 +37,7 @@ You can use one of the functions available in the :doc:`../helpers/url_helper`: You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL. This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and -your settings in ``Config\App`` (baseURL, indexPage, and forceGlobalSecureRequests). +your settings in ``Config\App`` (``baseURL``, ``indexPage``, and ``forceGlobalSecureRequests``). Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path: .. literalinclude:: uri/005.php @@ -174,7 +174,7 @@ you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actua Fragment -------- -Fragments are the portion at the end of the URL, preceded by the pound-sign (#). In HTML URLs these are links +Fragments are the portion at the end of the URL, preceded by the pound-sign (``#``). In HTML URLs these are links to an on-page anchor. Media URI's can make use of them in various other ways. .. literalinclude:: uri/022.php From eb527d6fd6761ada83e0797fe3ae8504f1cbd18f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:05:23 +0900 Subject: [PATCH 3211/8282] docs: fix incorrect output The getPath() returns the path starting with `/`. But if you set the path `another/path`, it returns `another/path`. --- user_guide_src/source/libraries/uri/016.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/uri/016.php b/user_guide_src/source/libraries/uri/016.php index a9e680ac38de..f9d82a86759d 100644 --- a/user_guide_src/source/libraries/uri/016.php +++ b/user_guide_src/source/libraries/uri/016.php @@ -2,5 +2,5 @@ $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path'); -echo $uri->getPath(); // 'some/path' -echo $uri->setPath('another/path')->getPath(); // 'another/path' +echo $uri->getPath(); // '/some/path' +echo $uri->setPath('/another/path')->getPath(); // '/another/path' From 17fa375648ec158449d455337a5208937c3ac4bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:07:57 +0900 Subject: [PATCH 3212/8282] docs: add empty line --- user_guide_src/source/libraries/uri.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index a795cff51ad8..d399e286ef8d 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -36,6 +36,7 @@ You can use one of the functions available in the :doc:`../helpers/url_helper`: .. literalinclude:: uri/004.php You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL. + This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and your settings in ``Config\App`` (``baseURL``, ``indexPage``, and ``forceGlobalSecureRequests``). Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path: From fdef54957009b75dca6e11121b9064ddf3951ad6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:08:19 +0900 Subject: [PATCH 3213/8282] docs: replace "i" with "I" --- user_guide_src/source/libraries/uri.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index d399e286ef8d..e0a35e283e8d 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -96,7 +96,7 @@ If you do not want to display the port, pass in ``true`` as the only parameter: .. note:: If the current port is the default port for the scheme it will never be displayed. -Userinfo +UserInfo -------- The userinfo section is simply the username and password that you might see with an FTP URI. While you can get From 7411c64ba980efa2e2342efd7398a3b07caaed5a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 09:09:03 +0900 Subject: [PATCH 3214/8282] docs: add section titles --- user_guide_src/source/libraries/uri.rst | 26 ++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index e0a35e283e8d..33bb43a40588 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -139,24 +139,40 @@ can be used to manipulate it: Query ----- -The query variables can be manipulated through the class using simple string representations. Query values can only +The query variables can be manipulated through the class using simple string representations. + +Getting/Setting Query +^^^^^^^^^^^^^^^^^^^^^ + +Query values can only be set as a string currently. .. literalinclude:: uri/017.php +The ``setQuery()`` method overwrite any existing query variables. + .. note:: Query values cannot contain fragments. An InvalidArgumentException will be thrown if it does. +Setting Query from Array +^^^^^^^^^^^^^^^^^^^^^^^^ + You can set query values using an array: .. literalinclude:: uri/018.php -The ``setQuery()`` and ``setQueryArray()`` methods overwrite any existing query variables. You can add a value to the +The ``setQueryArray()`` method overwrite any existing query variables. + +Adding Query Value +^^^^^^^^^^^^^^^^^^ + +You can add a value to the query variables collection without destroying the existing query variables with the ``addQuery()`` method. The first parameter is the name of the variable, and the second parameter is the value: .. literalinclude:: uri/019.php -**Filtering Query Values** +Filtering Query Values +^^^^^^^^^^^^^^^^^^^^^^ You can filter the query values returned by passing an options array to the ``getQuery()`` method, with either an *only* or an *except* key: @@ -164,6 +180,10 @@ You can filter the query values returned by passing an options array to the ``ge .. literalinclude:: uri/020.php This only changes the values returned during this one call. If you need to modify the URI's query values more permanently, + +Changing Query Values +^^^^^^^^^^^^^^^^^^^^^ + you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actual object's query variable collection: .. literalinclude:: uri/021.php From 46308217fbf5736a12972710c4c9f2048abdbc7b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Feb 2023 15:50:39 +0900 Subject: [PATCH 3215/8282] docs: create file_collections.rst from files.rst --- .../source/libraries/file_collections.rst | 116 ++++++++++++++++++ user_guide_src/source/libraries/files.rst | 103 ---------------- user_guide_src/source/libraries/index.rst | 1 + 3 files changed, 117 insertions(+), 103 deletions(-) create mode 100644 user_guide_src/source/libraries/file_collections.rst diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst new file mode 100644 index 000000000000..4b54f0ab07a8 --- /dev/null +++ b/user_guide_src/source/libraries/file_collections.rst @@ -0,0 +1,116 @@ +################ +File Collections +################ + +Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate +locating and working with groups of files across the filesystem. + +.. contents:: + :local: + :depth: 2 + +*********** +Basic Usage +*********** + +At its most basic, ``FileCollection`` is an index +of files you set or build: + +.. literalinclude:: files/011.php + +After you have input the files you would like to work with you may remove files or use the filtering commands to remove +or retain files matching a certain regex or glob-style pattern: + +.. literalinclude:: files/012.php + +When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of +``FileCollection`` being countable and iterable to work directly with each ``File``: + +.. literalinclude:: files/013.php + +Below are the specific methods for working with a ``FileCollection``. + +********************* +Starting a Collection +********************* + +__construct(string[] $files = []) +================================= + +The constructor accepts an optional array of file paths to use as the initial collection. These are passed to +``add()`` so any files supplied by child classes in the ``$files`` will remain. + +define() +======== + +Allows child classes to define their own initial files. This method is called by the constructor and allows +predefined collections without having to use their methods. Example: + +.. literalinclude:: files/014.php + +Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without +having to re-call the collection methods every time. + +set(array $files) +================= + +Sets the list of input files to the provided string array of file paths. This will remove any existing +files from the collection, so ``$collection->set([])`` is essentially a hard reset. + +*************** +Inputting Files +*************** + +add(string[]|string $paths, bool $recursive = true) +=================================================== + +Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive`` +will include sub-directories. + +addFile(string $file) / addFiles(array $files) +============================================== + +Adds the file or files to the current list of input files. Files are absolute paths to actual files. + +removeFile(string $file) / removeFiles(array $files) +==================================================== + +Removes the file or files from the current list of input files. + +addDirectory(string $directory, bool $recursive = false) +======================================================== +addDirectories(array $directories, bool $recursive = false) +=========================================================== + +Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are +absolute paths to actual directories. + +*************** +Filtering Files +*************** + +removePattern(string $pattern, string $scope = null) +==================================================== +retainPattern(string $pattern, string $scope = null) +==================================================== + +Filters the current file list through the pattern (and optional scope), removing or retaining matched +files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar +to ``glob()`` (like ``*.css``). +If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files +outside of ``$scope`` are always retained). When no scope is provided then all files are subject. + +Examples: + +.. literalinclude:: files/015.php + +**************** +Retrieving Files +**************** + +get(): string[] +=============== + +Returns an array of all the loaded input files. + +.. note:: ``FileCollection`` is an ``IteratorAggregate`` so you can work with it directly (e.g. ``foreach ($collection as $file)``). diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst index 0c394eb35cc9..0b55982692c2 100644 --- a/user_guide_src/source/libraries/files.rst +++ b/user_guide_src/source/libraries/files.rst @@ -87,106 +87,3 @@ The move() method returns a new File instance that for the relocated file, so yo resulting location is needed: .. literalinclude:: files/010.php - -################ -File Collections -################ - -Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate -locating and working with groups of files across the filesystem. At its most basic, ``FileCollection`` is an index -of files you set or build: - -.. literalinclude:: files/011.php - -After you have input the files you would like to work with you may remove files or use the filtering commands to remove -or retain files matching a certain regex or glob-style pattern: - -.. literalinclude:: files/012.php - -When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of -``FileCollection`` being countable and iterable to work directly with each ``File``: - -.. literalinclude:: files/013.php - -Below are the specific methods for working with a ``FileCollection``. - -Starting a Collection -********************* - -__construct(string[] $files = []) -================================= - -The constructor accepts an optional array of file paths to use as the initial collection. These are passed to -``add()`` so any files supplied by child classes in the ``$files`` will remain. - -define() -======== - -Allows child classes to define their own initial files. This method is called by the constructor and allows -predefined collections without having to use their methods. Example: - -.. literalinclude:: files/014.php - -Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without -having to re-call the collection methods every time. - -set(array $files) -================= - -Sets the list of input files to the provided string array of file paths. This will remove any existing -files from the collection, so ``$collection->set([])`` is essentially a hard reset. - -Inputting Files -*************** - -add(string[]|string $paths, bool $recursive = true) -=================================================== - -Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive`` -will include sub-directories. - -addFile(string $file) / addFiles(array $files) -============================================== - -Adds the file or files to the current list of input files. Files are absolute paths to actual files. - -removeFile(string $file) / removeFiles(array $files) -==================================================== - -Removes the file or files from the current list of input files. - -addDirectory(string $directory, bool $recursive = false) -======================================================== -addDirectories(array $directories, bool $recursive = false) -=========================================================== - -Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are -absolute paths to actual directories. - -Filtering Files -*************** - -removePattern(string $pattern, string $scope = null) -==================================================== -retainPattern(string $pattern, string $scope = null) -==================================================== - -Filters the current file list through the pattern (and optional scope), removing or retaining matched -files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar -to ``glob()`` (like ``*.css``). -If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files -outside of ``$scope`` are always retained). When no scope is provided then all files are subject. - -Examples: - -.. literalinclude:: files/015.php - -Retrieving Files -**************** - -get(): string[] -=============== - -Returns an array of all the loaded input files. - -.. note:: ``FileCollection`` is an ``IteratorAggregate`` so you can work with it directly (e.g. ``foreach ($collection as $file)``). diff --git a/user_guide_src/source/libraries/index.rst b/user_guide_src/source/libraries/index.rst index 9f977e91d604..c0cfb0bd18b4 100644 --- a/user_guide_src/source/libraries/index.rst +++ b/user_guide_src/source/libraries/index.rst @@ -11,6 +11,7 @@ Library Reference email encryption files + file_collections honeypot images pagination From d8954a14af119d24cea9ed8cf38dd10e3b13ab42 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 13 Feb 2023 15:31:03 +0900 Subject: [PATCH 3216/8282] docs: replace "query variables" with "query data" --- user_guide_src/source/libraries/uri.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index 33bb43a40588..43e77e0626e2 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -139,7 +139,7 @@ can be used to manipulate it: Query ----- -The query variables can be manipulated through the class using simple string representations. +The query data can be manipulated through the class using simple string representations. Getting/Setting Query ^^^^^^^^^^^^^^^^^^^^^ From 8c974fd98934817296034a47168a6d98083d1bc8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 09:56:24 +0900 Subject: [PATCH 3217/8282] docs: improve explanation --- user_guide_src/source/incoming/filters.rst | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index d768fa9879f7..ca63f38b391a 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -32,16 +32,29 @@ but may leave the methods empty if they are not needed. A skeleton filter class Before Filters ============== +Replacing Request +----------------- + From any filter, you can return the ``$request`` object and it will replace the current Request, allowing you to make changes that will still be present when the controller executes. -Since before filters are executed prior to your controller being executed, you may at times want to stop the -actions in the controller from happening. Also, when you have a series of filters you may also want to +Stopping Later Filters +---------------------- + +Also, when you have a series of filters you may also want to stop the execution of the later filters after a certain filter. You can easily do this by returning **any non-empty** result. If the before filter returns an empty result, the controller actions or the later -filters will still be executed. An exception to the non-empty result rule is the ``Request`` instance. +filters will still be executed. + +An exception to the non-empty result rule is the ``Request`` instance. Returning it in the before filter will not stop the execution but only replace the current ``$request`` object. +Returning Response +------------------ + +Since before filters are executed prior to your controller being executed, you may at times want to stop the +actions in the controller from happening. + This is typically used to perform redirects, like in this example: .. literalinclude:: filters/002.php From 5a3ac57fe6a19ea18baaa0c10ceddeeea77f39d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 13:35:42 +0900 Subject: [PATCH 3218/8282] fix: URI::setSegment() accepts the last +2 segment without Exception --- system/HTTP/URI.php | 10 +++++++--- tests/system/HTTP/URITest.php | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 587e441ffc17..5615bb8d1287 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -562,9 +562,9 @@ public function getSegment(int $number, string $default = ''): string */ public function setSegment(int $number, $value) { - // The segment should treat the array as 1-based for the user - // but we still have to deal with a zero-based array. - $number--; + if ($number < 1) { + throw HTTPException::forURISegmentOutOfRange($number); + } if ($number > count($this->segments) + 1) { if ($this->silent) { @@ -574,6 +574,10 @@ public function setSegment(int $number, $value) throw HTTPException::forURISegmentOutOfRange($number); } + // The segment should treat the array as 1-based for the user + // but we still have to deal with a zero-based array. + $number--; + $this->segments[$number] = $value; $this->refreshPath(); diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 14de6e3d587b..87cb5253a735 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -808,32 +808,37 @@ public function testSetSegment() $this->assertSame('foo/banana/baz', $uri->getPath()); } - public function testSetSegmentFallback() + public function testSetSegmentNewOne() { $base = 'http://example.com'; + $uri = new URI($base); - $uri = new URI($base); + // Can set the next segment. $uri->setSegment(1, 'first'); - $uri->setSegment(3, 'third'); + // Can set the next segment. + $uri->setSegment(2, 'third'); $this->assertSame('first/third', $uri->getPath()); + // Can replace the existing segment. $uri->setSegment(2, 'second'); $this->assertSame('first/second', $uri->getPath()); + // Can set the next segment. $uri->setSegment(3, 'third'); $this->assertSame('first/second/third', $uri->getPath()); - $uri->setSegment(5, 'fifth'); + // Can set the next segment. + $uri->setSegment(4, 'fourth'); - $this->assertSame('first/second/third/fifth', $uri->getPath()); + $this->assertSame('first/second/third/fourth', $uri->getPath()); - // sixth or seventh was not set + // Cannot set the next next segment. $this->expectException(HTTPException::class); - $uri->setSegment(8, 'eighth'); + $uri->setSegment(6, 'six'); } public function testSetBadSegment() From 33a2b6452a71c556e11d51dad78510863dbce74a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 10:08:29 +0900 Subject: [PATCH 3219/8282] docs: improve PHPDoc for model() --- system/Common.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/Common.php b/system/Common.php index e6fc862fa102..2a98253cb6b4 100644 --- a/system/Common.php +++ b/system/Common.php @@ -817,11 +817,12 @@ function log_message(string $level, string $message, array $context = []) /** * More simple way of getting model instances from Factories * - * @template T of Model + * @template ModelTemplate of Model * - * @param class-string $name + * @param class-string|string $name * - * @return T + * @return ModelTemplate|null + * @phpstan-return ($name is class-string ? ModelTemplate : object|null) */ function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null) { From d4e7426bc32fc9c6530d038d778d73bb1a9625bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 11:37:44 +0900 Subject: [PATCH 3220/8282] docs: add changelog and upgrading guide --- user_guide_src/source/changelogs/v4.4.0.rst | 9 +++++++++ user_guide_src/source/installation/upgrade_440.rst | 13 +++++++++++++ .../source/installation/upgrade_440/002.php | 12 ++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 user_guide_src/source/installation/upgrade_440/002.php diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 965a0efbc057..a4d2afbafec2 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -20,6 +20,15 @@ BREAKING Behavior Changes ================ +URI::setSegment() and Non-Existent Segment +------------------------------------------ + +An exception is now thrown when you set the last ``+2`` segment. +In previous versions, an exception was thrown only if the last segment ``+3`` +or more was specified. See :ref:`upgrade-440-uri-setsegment`. + +The next segment (``+1``) of the current last segment can be set as before. + Interface Changes ================= diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index 16995c1d897e..f5bc7aef91f2 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -15,6 +15,19 @@ Please refer to the upgrade instructions corresponding to your installation meth Breaking Changes **************** +.. _upgrade-440-uri-setsegment: + +URI::setSegment() Change +======================== + +Dut to a bug, in previous versions an exception was not thrown if the last segment +``+2`` was specified. This bug has been fixed. + +If your code depends on this bug, fix the segment number. + +.. literalinclude:: upgrade_440/002.php + :lines: 2- + Mandatory File Changes ********************** diff --git a/user_guide_src/source/installation/upgrade_440/002.php b/user_guide_src/source/installation/upgrade_440/002.php new file mode 100644 index 000000000000..9cabdfcfcff3 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_440/002.php @@ -0,0 +1,12 @@ +setSegment(4, 'three'); +// The URI will be http://example.com/one/two/three + +// After: +$uri->setSegment(4, 'three'); // Will throw Exception +$uri->setSegment(3, 'three'); +// The URI will be http://example.com/one/two/three From 0e3d1abe30a0561d97e0ee1086fb59f7058e168f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:57:18 +0000 Subject: [PATCH 3221/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.13...0.15.16) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7a58a7be0d21..d0c2bd1e4dda 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.13", + "rector/rector": "0.15.16", "vimeo/psalm": "^5.0" }, "suggest": { From d3a6351ade8cba120a0179cab5336b56aacb2e0c Mon Sep 17 00:00:00 2001 From: paul45 Date: Wed, 15 Feb 2023 17:18:34 +0100 Subject: [PATCH 3222/8282] add missing @method having() in Model add missing @method having() in Model --- system/Model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Model.php b/system/Model.php index de646c6f8c7c..2df1bb2f5132 100644 --- a/system/Model.php +++ b/system/Model.php @@ -43,6 +43,7 @@ * @method $this groupBy($by, ?bool $escape = null) * @method $this groupEnd() * @method $this groupStart() + * @method $this having($key, $value = null, ?bool $escape = null) * @method $this havingGroupEnd() * @method $this havingGroupStart() * @method $this havingIn(?string $key = null, $values = null, ?bool $escape = null) From d44812d91d9fbec9c9d742ad759fa08cd405bd57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Thu, 16 Feb 2023 23:50:34 +0800 Subject: [PATCH 3223/8282] Enhance: [MySQLi] use MYSQLI_OPT_INT_AND_FLOAT_NATIVE. --- system/Database/MySQLi/Connection.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index 094fcfe7e3ec..26ece9a5d44b 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -98,6 +98,7 @@ public function connect(bool $persistent = false) mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX); $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); + $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); if (isset($this->strictOn)) { if ($this->strictOn) { From f1f5a5139dc8ac9ef706cbd699402800ec1bb1c2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 09:38:24 +0900 Subject: [PATCH 3224/8282] docs: update PHPDocs --- system/HTTP/URI.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 5615bb8d1287..3d673fab0928 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -532,12 +532,14 @@ public function getSegments(): array /** * Returns the value of a specific segment of the URI path. + * Allows to get only existing segments or the next one. * - * @param int $number Segment number + * @param int $number Segment number starting at 1 * @param string $default Default value * - * @return string The value of the segment. If no segment is found, - * throws InvalidArgumentError + * @return string The value of the segment. If you specify the last +1 + * segment, the $default value. If you specify the last +2 + * or more throws HTTPException. */ public function getSegment(int $number, string $default = ''): string { @@ -556,7 +558,8 @@ public function getSegment(int $number, string $default = ''): string * Set the value of a specific segment of the URI path. * Allows to set only existing segments or add new one. * - * @param mixed $value (string or int) + * @param int $number Segment number starting at 1 + * @param int|string $value * * @return $this */ From 65cd0452cb70f55db0a87a59157b004d14b61b3c Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 09:40:21 +0900 Subject: [PATCH 3225/8282] fix: incorrect segment number in Exception message --- system/HTTP/URI.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 3d673fab0928..4a0c75ce245d 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -543,14 +543,15 @@ public function getSegments(): array */ public function getSegment(int $number, string $default = ''): string { - // The segment should treat the array as 1-based for the user - // but we still have to deal with a zero-based array. - $number--; - if ($number > count($this->segments) && ! $this->silent) { + if ($number > count($this->segments) + 1 && ! $this->silent) { throw HTTPException::forURISegmentOutOfRange($number); } + // The segment should treat the array as 1-based for the user + // but we still have to deal with a zero-based array. + $number--; + return $this->segments[$number] ?? $default; } From 391e2b9e4616ac1e42dfa578f6adb0d3dbaf2644 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 09:40:56 +0900 Subject: [PATCH 3226/8282] fix: throw an exception for an impossible segment number --- system/HTTP/URI.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 4a0c75ce245d..7e57e4aa888c 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -543,6 +543,9 @@ public function getSegments(): array */ public function getSegment(int $number, string $default = ''): string { + if ($number < 1) { + throw HTTPException::forURISegmentOutOfRange($number); + } if ($number > count($this->segments) + 1 && ! $this->silent) { throw HTTPException::forURISegmentOutOfRange($number); From 47833d2b1a55bc3748f8bd818f703f91d6de7c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Fri, 17 Feb 2023 23:11:00 +0800 Subject: [PATCH 3227/8282] Enhance:[MySQLi] Use the option to define whether MYSQLI_OPT_INT_AND_FLOAT_NATIVE needs to be used. --- app/Config/Database.php | 35 ++++++++++++++------------- system/Database/BaseConnection.php | 8 ++++++ system/Database/MySQLi/Connection.php | 5 +++- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/app/Config/Database.php b/app/Config/Database.php index 2c092124550f..44515c4d5ecc 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -25,23 +25,24 @@ class Database extends Config * The default database connection. */ public array $default = [ - 'DSN' => '', - 'hostname' => 'localhost', - 'username' => '', - 'password' => '', - 'database' => '', - 'DBDriver' => 'MySQLi', - 'DBPrefix' => '', - 'pConnect' => false, - 'DBDebug' => true, - 'charset' => 'utf8', - 'DBCollat' => 'utf8_general_ci', - 'swapPre' => '', - 'encrypt' => false, - 'compress' => false, - 'strictOn' => false, - 'failover' => [], - 'port' => 3306, + 'DSN' => '', + 'hostname' => 'localhost', + 'username' => '', + 'password' => '', + 'database' => '', + 'DBDriver' => 'MySQLi', + 'DBPrefix' => '', + 'pConnect' => false, + 'DBDebug' => true, + 'charset' => 'utf8', + 'DBCollat' => 'utf8_general_ci', + 'swapPre' => '', + 'encrypt' => false, + 'compress' => false, + 'strictOn' => false, + 'failover' => [], + 'port' => 3306, + 'DBTypeNative' => false, ]; /** diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index badd34d5c077..5d79c8c052eb 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -29,6 +29,7 @@ * @property string $DBDriver * @property string $DBPrefix * @property string $DSN + * @property bool $DBTypeNative * @property array|bool $encrypt * @property array $failover * @property string $hostname @@ -339,6 +340,13 @@ abstract class BaseConnection implements ConnectionInterface */ protected $queryClass = Query::class; + /** + * Use MYSQLI_OPT_INT_AND_FLOAT_NATIVE + * + * @var bool + */ + protected $DBTypeNative = false; + /** * Saves our connection settings. */ diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index 26ece9a5d44b..f6cbe83dd604 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -98,7 +98,10 @@ public function connect(bool $persistent = false) mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX); $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); + + if(isset($this->DBTypeNative) && $this->DBTypeNative){ + $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE,1); + } if (isset($this->strictOn)) { if ($this->strictOn) { From 4a5e07050f8b3c20e8a1aee4ad5934530df046b8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Feb 2023 08:48:35 +0900 Subject: [PATCH 3228/8282] Prep for 4.3.2 release --- CHANGELOG.md | 47 +++++++++++++++++++ system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/v4.3.2.rst | 2 +- user_guide_src/source/conf.py | 2 +- .../source/installation/upgrade_432.rst | 13 ++++- 5 files changed, 61 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff34b8171aa2..9786833e1d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,52 @@ # Changelog +## [v4.3.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.2) (2023-02-18) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.1...v4.3.2) + +### Breaking Changes + +* fix: base_url() removes trailing slash in baseURL by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7200 + +### Fixed Bugs + +* docs: fix incorrect sample code in view_parser by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7103 +* docs: add missing items in upgrade_430.rst/v4.3.0.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7119 +* fix: remove `All` from `Options All -Indexes` in .htaccess by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/7093 +* fix: bug on stuck content-type header in Feature Testing by @baycik in https://github.com/codeigniter4/CodeIgniter4/pull/7112 +* fix: ordering `Validation` show error by call `setRule()` by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/7149 +* fix: remove parameter $relative in `uri_string()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7135 +* fix: [QueryBuilder] where() generates incorrect SQL when using RawSql by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/7147 +* fix: [QueryBuilder] RawSql passed to set() disappears without error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7148 +* fix: [Parser] local_currency causes "Passing null to parameter" by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7157 +* fix: [Parser] `!` does not work if delimiters are changed by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7142 +* fix: Throttler token time calculation by @rumpfc in https://github.com/codeigniter4/CodeIgniter4/pull/7160 +* fix: [QueryBuilder] getOperatorFromWhereKey() misses EXISTS, BETWEEN by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7155 +* docs: Correcting documentation mistakes in upgrading from one version to another by @objecttothis in https://github.com/codeigniter4/CodeIgniter4/pull/7191 +* fix: [Session] `Redis` connect to protocol `TLS` by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/7187 +* fix: Autoloader may not add Composer package's namespaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7193 +* fix: add try/catch to real_path() in clean_path() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7195 +* fix: cannot create shared View instance when using debugbar by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7172 +* fix: RouteCollection::getRegisteredControllers() may not return all controllers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7174 +* fix: `spark routes` shows incorrect hostname routes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7176 +* docs: add missing composer.json in Mandatory File Changes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7170 +* fix: stack trace displayed when Exception handler runs out of memory is useless by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7212 +* fix: support for display of error message using wildcard (*) by @sammyskills in https://github.com/codeigniter4/CodeIgniter4/pull/7226 +* fix: routing behavior when $uriProtocol is QUERY_STRING by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7199 +* fix: site_url() does not use alt Config by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7215 +* docs: add missing @method having() in Model by @paul45 in https://github.com/codeigniter4/CodeIgniter4/pull/7258 + +### Enhancements + +* add `application/vnd.microsoft.portable-executable` and `application/x-dosexec` by @totoprayogo1916 in https://github.com/codeigniter4/CodeIgniter4/pull/7144 + +### Refactoring + +* refactor: add PHPDoc types in RouteCollection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7129 +* refactor: URI::parseStr() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7154 +* refactor: error_exception.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7171 +* [Rector] Apply Rector to app/Views by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/7169 +* refactor: Update PHPDoc Common::config by @maniaba in https://github.com/codeigniter4/CodeIgniter4/pull/7224 + ## [v4.3.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.1) (2023-01-14) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.0...v4.3.1) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 5cb98c438863..d370e34ca22e 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -47,7 +47,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.3.1'; + public const CI_VERSION = '4.3.2'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index fbb4e016ae63..19498b286544 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -1,7 +1,7 @@ Version 4.3.2 ############# -Release Date: Unreleased +Release Date: February 18, 2023 **4.3.2 release of CodeIgniter4** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index a0484b3d0c3c..7f7aa87e7c59 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -26,7 +26,7 @@ version = '4.3' # The full version, including alpha/beta/rc tags. -release = '4.3.1' +release = '4.3.2' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index e6d630eb47b4..adb40380aedc 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -67,7 +67,11 @@ and it is recommended that you merge the updated versions with your application: Config ------ -- @TODO +- app/Config/Email.php +- app/Config/Mimes.php +- app/Views/errors/html/error_exception.php +- composer.json +- public/.htaccess All Changes =========== @@ -75,4 +79,9 @@ All Changes This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: -- @TODO +- app/Config/App.php +- app/Config/Email.php +- app/Config/Mimes.php +- app/Views/errors/html/error_exception.php +- composer.json +- public/.htaccess From 2fb7023e82468140c9c1b36cbb7b1d35d69fe61d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Feb 2023 08:55:45 +0900 Subject: [PATCH 3229/8282] docs: remove empty section titles --- user_guide_src/source/changelogs/v4.3.2.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index 19498b286544..939ee780bb29 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -23,18 +23,12 @@ without a trailing slash (``/``) like ``http://localhost:8080``. Now it returns baseURL with a trailing slash. This is the same behavior as ``base_url()`` in CodeIgniter 3. -Message Changes -*************** - Changes ******* - The parameter ``$relative`` in :php:func:`uri_string()` was removed. Due to a bug, the function always returned a path relative to baseURL. No behavior changes. -Deprecations -************ - Bugs Fixed ********** From be1eab9c4f39b2bf3e826b55ec744a7ff23463ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sat, 18 Feb 2023 21:42:57 +0800 Subject: [PATCH 3230/8282] fix:Rename the DBTypeNative to numberNative and move the property to MySQLi for use. --- app/Config/Database.php | 2 +- system/Database/BaseConnection.php | 8 -------- system/Database/MySQLi/Connection.php | 11 +++++++++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/Config/Database.php b/app/Config/Database.php index 44515c4d5ecc..e2450ec16cf1 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -42,7 +42,7 @@ class Database extends Config 'strictOn' => false, 'failover' => [], 'port' => 3306, - 'DBTypeNative' => false, + 'numberNative' => false, ]; /** diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index 5d79c8c052eb..badd34d5c077 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -29,7 +29,6 @@ * @property string $DBDriver * @property string $DBPrefix * @property string $DSN - * @property bool $DBTypeNative * @property array|bool $encrypt * @property array $failover * @property string $hostname @@ -340,13 +339,6 @@ abstract class BaseConnection implements ConnectionInterface */ protected $queryClass = Query::class; - /** - * Use MYSQLI_OPT_INT_AND_FLOAT_NATIVE - * - * @var bool - */ - protected $DBTypeNative = false; - /** * Saves our connection settings. */ diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index f6cbe83dd604..f657734c896a 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -72,6 +72,13 @@ class Connection extends BaseConnection */ public $resultMode = MYSQLI_STORE_RESULT; + /** + * Use MYSQLI_OPT_INT_AND_FLOAT_NATIVE + * + * @var bool + */ + public $numberNative = false; + /** * Connect to the database. * @@ -99,8 +106,8 @@ public function connect(bool $persistent = false) $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - if(isset($this->DBTypeNative) && $this->DBTypeNative){ - $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE,1); + if (isset($this->numberNative) && $this->numberNative) { + $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); } if (isset($this->strictOn)) { From 7b756d1fbb1e18d814474d521ed16f43b3f70dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sat, 18 Feb 2023 22:34:03 +0800 Subject: [PATCH 3231/8282] Enhance:Add numberNative to configuration.rst to specify whether MYSQLI_OPT_INT_AND_FLOAT_NATIVE is enabled or not. --- user_guide_src/source/database/configuration.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index b5a768439ccc..33a069800d29 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -150,6 +150,7 @@ Explanation of Values: See `SQLite documentation `_. To enforce Foreign Key constraint, set this config item to true. **busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). +**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only). =============== =========================================================================================================== .. note:: Depending on what database driver you are using (``MySQLi``, ``Postgres``, From 4ff2ffea507ad84d4c549b13b7add21553faf579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sat, 18 Feb 2023 22:39:13 +0800 Subject: [PATCH 3232/8282] fix:Configuration.rst typesetting corrections. --- .../source/database/configuration.rst | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 33a069800d29..0c16803d7164 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -108,50 +108,50 @@ default group's configuration settings. The values should be name following this Explanation of Values: ********************** -=============== =========================================================================================================== - Name Config Description -=============== =========================================================================================================== -**dsn** The DSN connect string (an all-in-one configuration sequence). -**hostname** The hostname of your database server. Often this is 'localhost'. -**username** The username used to connect to the database. (``SQLite3`` does not use this.) -**password** The password used to connect to the database. (``SQLite3`` does not use this.) -**database** The name of the database you want to connect to. - - .. note:: CodeIgniter doesn't support dots (``.``) in the database, table, and column names. -**DBDriver** The database driver name. e.g.,: ``MySQLi``, ``Postgres``, etc. The case must match the driver name. - You can set a fully qualified classname to use your custom driver. -**DBPrefix** An optional table prefix which will added to the table name when running - :doc:`Query Builder ` queries. This permits multiple CodeIgniter - installations to share one database. -**pConnect** true/false (boolean) - Whether to use a persistent connection. -**DBDebug** true/false (boolean) - Whether to throw exceptions or not when database errors occur. -**charset** The character set used in communicating with the database. -**DBCollat** The character collation used in communicating with the database (``MySQLi`` only). -**swapPre** A default table prefix that should be swapped with ``DBPrefix``. This is useful for distributed - applications where you might run manually written queries, and need the prefix to still be - customizable by the end user. -**schema** The database schema, default value varies by driver. (Used by ``Postgres`` and ``SQLSRV``.) -**encrypt** Whether or not to use an encrypted connection. - ``SQLSRV`` driver accepts true/false - ``MySQLi`` driver accepts an array with the following options: - * ``ssl_key`` - Path to the private key file - * ``ssl_cert`` - Path to the public key certificate file - * ``ssl_ca`` - Path to the certificate authority file - * ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format - * ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``) - * ``ssl_verify`` - true/false; Whether to verify the server certificate or not (``MySQLi`` only) -**compress** Whether or not to use client compression (``MySQLi`` only). -**strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL - while developing an application (``MySQLi`` only). -**port** The database port number. -**foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only). - - .. important:: SQLite3 Foreign Key constraint is disabled by default. - See `SQLite documentation `_. - To enforce Foreign Key constraint, set this config item to true. -**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). +=============== =========================================================================================================== + Name Config Description +=============== =========================================================================================================== +**dsn** The DSN connect string (an all-in-one configuration sequence). +**hostname** The hostname of your database server. Often this is 'localhost'. +**username** The username used to connect to the database. (``SQLite3`` does not use this.) +**password** The password used to connect to the database. (``SQLite3`` does not use this.) +**database** The name of the database you want to connect to. + + .. note:: CodeIgniter doesn't support dots (``.``) in the database, table, and column names. +**DBDriver** The database driver name. e.g.,: ``MySQLi``, ``Postgres``, etc. The case must match the driver name. + You can set a fully qualified classname to use your custom driver. +**DBPrefix** An optional table prefix which will added to the table name when running + :doc:`Query Builder ` queries. This permits multiple CodeIgniter + installations to share one database. +**pConnect** true/false (boolean) - Whether to use a persistent connection. +**DBDebug** true/false (boolean) - Whether to throw exceptions or not when database errors occur. +**charset** The character set used in communicating with the database. +**DBCollat** The character collation used in communicating with the database (``MySQLi`` only). +**swapPre** A default table prefix that should be swapped with ``DBPrefix``. This is useful for distributed + applications where you might run manually written queries, and need the prefix to still be + customizable by the end user. +**schema** The database schema, default value varies by driver. (Used by ``Postgres`` and ``SQLSRV``.) +**encrypt** Whether or not to use an encrypted connection. + ``SQLSRV`` driver accepts true/false + ``MySQLi`` driver accepts an array with the following options: + * ``ssl_key`` - Path to the private key file + * ``ssl_cert`` - Path to the public key certificate file + * ``ssl_ca`` - Path to the certificate authority file + * ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format + * ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``) + * ``ssl_verify`` - true/false; Whether to verify the server certificate or not (``MySQLi`` only) +**compress** Whether or not to use client compression (``MySQLi`` only). +**strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL + while developing an application (``MySQLi`` only). +**port** The database port number. +**foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only). + + .. important:: SQLite3 Foreign Key constraint is disabled by default. + See `SQLite documentation `_. + To enforce Foreign Key constraint, set this config item to true. +**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). **numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only). -=============== =========================================================================================================== +=============== =========================================================================================================== .. note:: Depending on what database driver you are using (``MySQLi``, ``Postgres``, etc.) not all values will be needed. For example, when using ``SQLite3`` you From d017a0b6c5cd27da4cd1d01ac43861067dc0025e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sat, 18 Feb 2023 23:39:37 +0800 Subject: [PATCH 3233/8282] Enhance:Add and complete test files for NumberNative. --- app/Config/Database.php | 39 ++++---- .../Database/Live/MySQLi/NumberNativeTest.php | 88 +++++++++++++++++++ 2 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 tests/system/Database/Live/MySQLi/NumberNativeTest.php diff --git a/app/Config/Database.php b/app/Config/Database.php index e2450ec16cf1..9e752027feed 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -50,25 +50,26 @@ class Database extends Config * running PHPUnit database tests. */ public array $tests = [ - 'DSN' => '', - 'hostname' => '127.0.0.1', - 'username' => '', - 'password' => '', - 'database' => ':memory:', - 'DBDriver' => 'SQLite3', - 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS - 'pConnect' => false, - 'DBDebug' => true, - 'charset' => 'utf8', - 'DBCollat' => 'utf8_general_ci', - 'swapPre' => '', - 'encrypt' => false, - 'compress' => false, - 'strictOn' => false, - 'failover' => [], - 'port' => 3306, - 'foreignKeys' => true, - 'busyTimeout' => 1000, + 'DSN' => '', + 'hostname' => '127.0.0.1', + 'username' => '', + 'password' => '', + 'database' => ':memory:', + 'DBDriver' => 'SQLite3', + 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS + 'pConnect' => false, + 'DBDebug' => true, + 'charset' => 'utf8', + 'DBCollat' => 'utf8_general_ci', + 'swapPre' => '', + 'encrypt' => false, + 'compress' => false, + 'strictOn' => false, + 'failover' => [], + 'port' => 3306, + 'foreignKeys' => true, + 'busyTimeout' => 1000, + 'numberNative' => false, ]; public function __construct() diff --git a/tests/system/Database/Live/MySQLi/NumberNativeTest.php b/tests/system/Database/Live/MySQLi/NumberNativeTest.php new file mode 100644 index 000000000000..eb2608b5c751 --- /dev/null +++ b/tests/system/Database/Live/MySQLi/NumberNativeTest.php @@ -0,0 +1,88 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Database\Live\MySQLi; + +use CodeIgniter\Test\CIUnitTestCase; +use CodeIgniter\Test\DatabaseTestTrait; +use Config\Database; +use Tests\Support\Database\Seeds\CITestSeeder; + +/** + * @group DatabaseLive + * + * @internal + */ +final class NumberNativeTest extends CIUnitTestCase +{ + use DatabaseTestTrait; + + private $tests; + protected $refresh = true; + protected $seed = CITestSeeder::class; + + protected function setUp(): void + { + parent::setUp(); + + $config = config('Database'); + + $this->tests = $config->tests; + + $this->tests['DBDriver'] = 'MySQLi'; + } + + public function testEnableNumberNative() + { + $this->tests['numberNative'] = true; + + $db1 = Database::connect($this->tests); + + $this->assertTrue($db1->numberNative); + } + + public function testDisableNumberNative() + { + $this->tests['numberNative'] = false; + + $db1 = Database::connect($this->tests); + + $this->assertFalse($db1->numberNative); + } + + public function testQueryDataAfterEnableNumberNative() + { + $this->tests['numberNative'] = true; + + $db1 = Database::connect($this->tests); + + $data = $db1->table('db_type_test') + ->get() + ->getRow(); + + $this->assertIsFloat($data->type_float); + $this->assertIsInt($data->type_integer); + } + + public function testQueryDataAfterDisableNumberNative() + { + $this->tests['numberNative'] = false; + + $db1 = Database::connect($this->tests); + + $data = $db1->table('db_type_test') + ->get() + ->getRow(); + + $this->assertIsString($data->type_float); + $this->assertIsString($data->type_integer); + } +} From 5574b44c986973e88fd3a08f91a76b78248a9a4b Mon Sep 17 00:00:00 2001 From: grimpirate Date: Sat, 18 Feb 2023 16:48:00 -0500 Subject: [PATCH 3234/8282] Typographic correction. --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 21da852e9d4f..668325da0fa4 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -198,7 +198,7 @@ you may add them directly in forge: .. literalinclude:: forge/012.php -You can specify the desired action for the "on update" and "on update" properties of the constraint as well as the name: +You can specify the desired action for the "on delete" and "on update" properties of the constraint as well as the name: .. literalinclude:: forge/013.php From 246a7af6c26cae17adbe4a88d001ab89fc186a74 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:01:04 +0900 Subject: [PATCH 3235/8282] docs: fix incorrect sample value for 'cipher' --- user_guide_src/source/libraries/encryption/010.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/encryption/010.php b/user_guide_src/source/libraries/encryption/010.php index 1bc9ebbbb2a5..53bcceac5fe5 100644 --- a/user_guide_src/source/libraries/encryption/010.php +++ b/user_guide_src/source/libraries/encryption/010.php @@ -1,3 +1,3 @@ initialize(['cipher' => '3des']); +$encrypter = $encryption->initialize(['cipher' => 'AES-256-CTR']); From bc297ffa902dc6ce33df9462d518638c592284ab Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:02:41 +0900 Subject: [PATCH 3236/8282] config: add missing $cipher --- app/Config/Encryption.php | 9 +++++++++ tests/system/Encryption/EncryptionTest.php | 20 ++++++++++++++++++- .../source/libraries/encryption.rst | 17 ++++++++-------- .../source/libraries/encryption/013.php | 8 ++++++-- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php index e37b4e2a14ec..28344134aa31 100644 --- a/app/Config/Encryption.php +++ b/app/Config/Encryption.php @@ -80,4 +80,13 @@ class Encryption extends BaseConfig * Set to 'authentication' for CI3 Encryption compatibility. */ public string $authKeyInfo = ''; + + /** + * Cipher to use. + * This setting is only used by OpenSSLHandler. + * + * Set to 'AES-128-CBC' to decrypt encrypted data that encrypted + * by CI3 Encryption default configuration. + */ + public string $cipher = 'AES-256-CTR'; } diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index b93183d96c1d..cbdccd2fbbe1 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -151,7 +151,25 @@ public function testMagicGetMissing() $this->assertNull($this->encryption->bogus); } - public function testDecryptEncryptedDataByCI3() + public function testDecryptEncryptedDataByCI3AES128CBC() + { + $config = new EncryptionConfig(); + $config->driver = 'OpenSSL'; + $config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); + $config->cipher = 'AES-128-CBC'; // CI3's default config + $config->rawData = false; + $config->encryptKeyInfo = 'encryption'; + $config->authKeyInfo = 'authentication'; + $encrypter = Services::encrypter($config, false); + + $encrypted = '211c55b9d1948187557bff88c1e77e0f6b965e3711d477d97fb0b60907a7336028714dbb8dfe90598039e9bc7147b54e552d739b378cd864fb91dde9ad6d4ffalIvVxFDDLTPBYGaHLNDzUSJExBKbQJ0NW27KDaR83bYqz8MDz/mXXpE+HHdaWjEE'; + $decrypted = $encrypter->decrypt($encrypted); + + $expected = 'This is a plain-text message.'; + $this->assertSame($expected, $decrypted); + } + + public function testDecryptEncryptedDataByCI3AES256CTR() { $config = new EncryptionConfig(); $config->driver = 'OpenSSL'; diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst index 86fbbb32eb6f..8c7a200d94eb 100644 --- a/user_guide_src/source/libraries/encryption.rst +++ b/user_guide_src/source/libraries/encryption.rst @@ -61,17 +61,18 @@ Configuring the Library The example above uses the configuration settings found in **app/Config/Encryption.php**. -============== ======================================================== +============== ========================================================================== Option Possible values (default in parentheses) -============== ======================================================== +============== ========================================================================== key Encryption key starter driver Preferred handler, e.g., OpenSSL or Sodium (``OpenSSL``) -blockSize Padding length in bytes for SodiumHandler (``16``) digest Message digest algorithm (``SHA512``) -encryptKeyInfo Encryption key info (``''``). This is only used by OpenSSLHandler. -authKeyInfo Authentication key info (``''``). This is only used by OpenSSLHandler. -rawData Whether the cipher-text should be raw (``true``). This is only used by OpenSSLHandler. -============== ======================================================== +blockSize [**SodiumHandler** only] Padding length in bytes (``16``) +cipher [**OpenSSLHandler** only] Cipher to use (``AES-256-CTR``) +encryptKeyInfo [**OpenSSLHandler** only] Encryption key info (``''``) +authKeyInfo [**OpenSSLHandler** only] Authentication key info (``''``) +rawData [**OpenSSLHandler** only] Whether the cipher-text should be raw (``true``) +============== ========================================================================== You can replace the config file's settings by passing a configuration object of your own to the ``Services`` call. The ``$config`` variable must be @@ -281,7 +282,7 @@ Class Reference Please refer to the :ref:`configuration` section for detailed info. -.. php:interface:: CodeIgniter\\Encryption\\EncrypterInterface +.. php:interface:: CodeIgniter\Encryption\EncrypterInterface .. php:method:: encrypt($data[, $params = null]) diff --git a/user_guide_src/source/libraries/encryption/013.php b/user_guide_src/source/libraries/encryption/013.php index badfb04fdcc8..c49d282f42da 100644 --- a/user_guide_src/source/libraries/encryption/013.php +++ b/user_guide_src/source/libraries/encryption/013.php @@ -5,8 +5,12 @@ $config = new Encryption(); $config->driver = 'OpenSSL'; -// Your CI3's encryption_key -$config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); + +// Your CI3's 'encryption_key' +$config->key = hex2bin('64c70b0b8d45b80b9eba60b8b3c8a34d0193223d20fea46f8644b848bf7ce67f'); +// Your CI3's 'cipher' and 'mode' +$config->cipher = 'AES-128-CBC'; + $config->rawData = false; $config->encryptKeyInfo = 'encryption'; $config->authKeyInfo = 'authentication'; From 24438f50eea55b250a95bc2cb7b49673907efb50 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:18:36 +0900 Subject: [PATCH 3237/8282] docs: add changelog and upgrading --- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.3.3.rst | 32 ++++++++++++ .../source/installation/upgrade_433.rst | 49 +++++++++++++++++++ .../source/installation/upgrading.rst | 1 + 4 files changed, 83 insertions(+) create mode 100644 user_guide_src/source/changelogs/v4.3.3.rst create mode 100644 user_guide_src/source/installation/upgrade_433.rst diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 9932e8725891..bb2dae1ce3b1 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.3.3 v4.3.2 v4.3.1 v4.3.0 diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst new file mode 100644 index 000000000000..6be500a3a589 --- /dev/null +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -0,0 +1,32 @@ +Version 4.3.3 +################# + +Release Date: Unreleased + +**4.3.3 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 3 + +BREAKING +******** + +Message Changes +*************** + +Changes +******* + +Deprecations +************ + +Bugs Fixed +********** + +- **Config:** Added missing ``Config\Encryption::$cipher``. +- **UserGuide:** Fixed the sample code for :ref:`encryption-compatible-with-ci3`. + +See the repo's +`CHANGELOG.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/installation/upgrade_433.rst b/user_guide_src/source/installation/upgrade_433.rst new file mode 100644 index 000000000000..2196484b502b --- /dev/null +++ b/user_guide_src/source/installation/upgrade_433.rst @@ -0,0 +1,49 @@ +############################## +Upgrading from 4.3.2 to 4.3.3 +############################## + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +Breaking Changes +**************** + +Mandatory File Changes +********************** + +Project Files +************* + +Some files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. + +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +Content Changes +=============== + +The following files received significant changes (including deprecations or visual adjustments) +and it is recommended that you merge the updated versions with your application: + +Config +------ + +- app/Config/Encryption.php + - The missing property ``$cipher`` is added for CI3 + Encryption compatibility. See :ref:`encryption-compatible-with-ci3`. + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +- @TODO diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index d754d020b55c..075c463fc81e 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_433 upgrade_432 upgrade_431 upgrade_430 From 217400702d90b47debb08626dbb37d74e616f6ea Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:37:04 +0900 Subject: [PATCH 3238/8282] docs: remove duplicated `for` --- user_guide_src/source/installation/upgrade_430.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_430.rst b/user_guide_src/source/installation/upgrade_430.rst index 6e37811777fe..c91aa82c723e 100644 --- a/user_guide_src/source/installation/upgrade_430.rst +++ b/user_guide_src/source/installation/upgrade_430.rst @@ -324,7 +324,7 @@ Config - The property ``$html5`` to determine whether to remove the solidus (``/``) character for void HTML elements (e.g. ````) is added, and set to ``true`` by default for HTML5 compatibility. - app/Config/Encryption.php - - The new property ``$rawData``, ``$encryptKeyInfo``, and ``$authKeyInfo`` are added for for CI3 + - The new property ``$rawData``, ``$encryptKeyInfo``, and ``$authKeyInfo`` are added for CI3 Encryption compatibility. See :ref:`encryption-compatible-with-ci3`. - app/Config/Exceptions.php - Two additional public properties were added: ``$logDeprecations`` and ``$deprecationLogLevel``. From 393040da48d6849b7541eda6c7a774562119c42f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:43:57 +0900 Subject: [PATCH 3239/8282] docs: add missing "Full Changelog:" --- admin/RELEASE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/RELEASE.md b/admin/RELEASE.md index cfa7fe3bcdb6..63e7a7f661e6 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -85,6 +85,8 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA ## New Contributors * + +Full Changelog: https://github.com/codeigniter4/CodeIgniter4/compare/v4.x.x...v4.x.x ``` * Watch for the "Deploy Distributable Repos" action to make sure **framework**, **appstarter**, and **userguide** get updated * Run the following commands to install and test `appstarter` and verify the new version: From dfe0334315938f32af957ae6bbf59a1e78062422 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:44:31 +0900 Subject: [PATCH 3240/8282] docs: break long lines --- admin/RELEASE.md | 70 +++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/admin/RELEASE.md b/admin/RELEASE.md index 63e7a7f661e6..b38abc95b7e2 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -16,7 +16,8 @@ If you release a new minor version. ## Changelog -When generating the changelog each Pull Request to be included must have one of the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels): +When generating the changelog each Pull Request to be included must have one of +the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels): - **bug** ... PRs that fix bugs - **enhancement** ... PRs to improve existing functionalities - **new feature** ... PRs for new features @@ -27,7 +28,8 @@ PRs with breaking changes must have the following additional label: ### Generate Changelog -To auto-generate, navigate to the [Releases](https://github.com/codeigniter4/CodeIgniter4/releases) page, +To auto-generate, navigate to the +[Releases](https://github.com/codeigniter4/CodeIgniter4/releases) page, click the "Draft a new release" button. * Tag: "v4.x.x" (Create new tag) @@ -39,31 +41,41 @@ Check the resulting content. If there are items in the *Others* section which should be included in the changelog, add a label to the PR and regenerate the changelog. -Copy the resulting content into **CHANGELOG.md** and adjust the format to match the existing content. +Copy the resulting content into **CHANGELOG.md** and adjust the format to match +the existing content. ## Preparation * Work off direct clones of the repos so the release branches persist for a time -* Clone both **codeigniter4/CodeIgniter4** and **codeigniter4/userguide** and resolve any necessary PRs +* Clone both **codeigniter4/CodeIgniter4** and **codeigniter4/userguide** and + resolve any necessary PRs ```console git clone git@github.com:codeigniter4/CodeIgniter4.git git clone git@github.com:codeigniter4/userguide.git ``` -* Vet the **admin/** folders for any removed hidden files (Action deploy scripts *do not remove these*) +* Vet the **admin/** folders for any removed hidden files (Action deploy scripts + *do not remove these*) * Merge any Security Advisory PRs in private forks ## Process -> Note: Most changes that need noting in the User Guide and docs should have been included -> with their PR, so this process assumes you will not be generating much new content. +> **Note** Most changes that need noting in the User Guide and docs should have +> been included with their PR, so this process assumes you will not be +> generating much new content. * Create a new branch `release-4.x.x` -* Update **system/CodeIgniter.php** with the new version number: `const CI_VERSION = '4.x.x';` -* Update **user_guide_src/source/conf.py** with the new `version = '4.x'` (if applicable) and `release = '4.x.x'` +* Update **system/CodeIgniter.php** with the new version number: + `const CI_VERSION = '4.x.x';` +* Update **user_guide_src/source/conf.py** with the new `version = '4.x'` (if applicable) + and `release = '4.x.x'` * Replace **CHANGELOG.md** with the new version generated above -* Set the date in **user_guide_src/source/changelogs/{version}.rst** to format `Release Date: January 31, 2021` -* Create a new changelog for the next version at **user_guide_src/source/changelogs/{next_version}.rst** and add it to **index.rst** -* Create **user_guide_src/source/installation/upgrade_{ver}.rst**, fill in the "All Changes" section, and add it to **upgrading.rst** +* Set the date in **user_guide_src/source/changelogs/{version}.rst** to format + `Release Date: January 31, 2021` +* Create a new changelog for the next version at + **user_guide_src/source/changelogs/{next_version}.rst** and add it to + **index.rst** +* Create **user_guide_src/source/installation/upgrade_{ver}.rst**, fill in the + "All Changes" section, and add it to **upgrading.rst** * git diff --name-status master -- . ':!system' * Commit the changes with "Prep for 4.x.x release" and push to origin * Create a new PR from `release-4.x.x` to `develop`: @@ -88,8 +100,10 @@ See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHA Full Changelog: https://github.com/codeigniter4/CodeIgniter4/compare/v4.x.x...v4.x.x ``` -* Watch for the "Deploy Distributable Repos" action to make sure **framework**, **appstarter**, and **userguide** get updated -* Run the following commands to install and test `appstarter` and verify the new version: +* Watch for the "Deploy Distributable Repos" action to make sure **framework**, + **appstarter**, and **userguide** get updated +* Run the following commands to install and test `appstarter` and verify the new + version: ```console composer create-project codeigniter4/appstarter release-test cd release-test @@ -123,22 +137,28 @@ git switch -c 4.x git push origin HEAD ``` * Publish any Security Advisories that were resolved from private forks -* Announce the release on the forums and Slack channel (note: this forum is restricted to administrators): - * Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html - * The content is somewhat organic, but should include any major features and changes as well as a link to the User Guide's changelog +* Announce the release on the forums and Slack channel + (note: this forum is restricted to administrators): + * Make a new topic in the "News & Discussion" forums: + https://forum.codeigniter.com/forum-2.html + * The content is somewhat organic, but should include any major features and + changes as well as a link to the User Guide's changelog ## After Publishing Security Advisory * Send a PR to [PHP Security Advisories Database](https://github.com/FriendsOfPHP/security-advisories). * E.g. https://github.com/FriendsOfPHP/security-advisories/pull/606 * See https://github.com/FriendsOfPHP/security-advisories#contributing - * Don't forget to run `php -d memory_limit=-1 validator.php`, before submitting the PR + * Don't forget to run `php -d memory_limit=-1 validator.php`, before + submitting the PR ## Appendix ### Sphinx Installation -You may need to install Sphinx and its dependencies prior to building the User Guide. +You may need to install Sphinx and its dependencies prior to building the User +Guide. + This worked seamlessly on Ubuntu 20.04: ```console sudo apt install python3-sphinx @@ -154,8 +174,10 @@ sudo pip3 install sphinx_rtd_theme * Build the ePub version of the User Guide: `make epub` * Switch to the **userguide** repo and create a new branch `release-4.x.x` * Replace **docs/** with **CodeIgniter4/user_guide_src/build/html** -* Ensure the file **docs/.nojekyll** exists or GitHub Pages will ignore folders with an underscore prefix -* Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to **./CodeIgniter4.x.x.epub** +* Ensure the file **docs/.nojekyll** exists or GitHub Pages will ignore folders + with an underscore prefix +* Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to + **./CodeIgniter4.x.x.epub** * Commit the changes with "Update for 4.x.x" and push to origin * Create a new PR from `release-4.x.x` to `develop`: * Title: "Update for 4.x.x" @@ -167,6 +189,6 @@ sudo pip3 install sphinx_rtd_theme * Description: "CodeIgniter 4.x.x User Guide" * Watch for the "github pages" Environment to make sure the deployment succeeds -The User Guide website should update itself via the deploy GitHub Action. Should this fail -the server must be updated manually. See repo and hosting details in the deploy script -at the User Guide repo. +The User Guide website should update itself via the deploy GitHub Action. Should +this fail the server must be updated manually. See repo and hosting details in +the deploy script at the User Guide repo. From d195c772a86ca67e2720c2f774723f33ee42c68f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 09:55:16 +0900 Subject: [PATCH 3241/8282] docs: update branch for checking "All Changes" In case you forgot to update your local master branch. --- admin/RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/RELEASE.md b/admin/RELEASE.md index b38abc95b7e2..0896a1290698 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -76,7 +76,7 @@ git clone git@github.com:codeigniter4/userguide.git **index.rst** * Create **user_guide_src/source/installation/upgrade_{ver}.rst**, fill in the "All Changes" section, and add it to **upgrading.rst** - * git diff --name-status master -- . ':!system' + * git diff --name-status origin/master -- . ':!system' * Commit the changes with "Prep for 4.x.x release" and push to origin * Create a new PR from `release-4.x.x` to `develop`: * Title: "Prep for 4.x.x release" From 770d9c221b53f973d7956d115efd4e48cbb28799 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 10:06:08 +0900 Subject: [PATCH 3242/8282] docs: remove incorrect section title --- user_guide_src/source/installation/upgrade_432.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index adb40380aedc..68bb80f0dbed 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -64,9 +64,6 @@ Content Changes The following files received significant changes (including deprecations or visual adjustments) and it is recommended that you merge the updated versions with your application: -Config ------- - - app/Config/Email.php - app/Config/Mimes.php - app/Views/errors/html/error_exception.php From ef2dd3cad6cccb8efc751e45171c5024dda96b4b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 10:06:38 +0900 Subject: [PATCH 3243/8282] docs: remove incorrect Project Files app/Config/Email.php is not changed. The master branch in my repos was not updated. --- user_guide_src/source/installation/upgrade_432.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index 68bb80f0dbed..0e8a818124d3 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -64,7 +64,6 @@ Content Changes The following files received significant changes (including deprecations or visual adjustments) and it is recommended that you merge the updated versions with your application: -- app/Config/Email.php - app/Config/Mimes.php - app/Views/errors/html/error_exception.php - composer.json @@ -77,7 +76,6 @@ This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: - app/Config/App.php -- app/Config/Email.php - app/Config/Mimes.php - app/Views/errors/html/error_exception.php - composer.json From 1cd3415c00af19e441d9a43d31e40562f0255b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 12:47:08 +0800 Subject: [PATCH 3244/8282] fix:NumberNativeTest.php adds DBDriver's judgment test and fixes MySQLi's isset judgment for numberNative. --- system/Database/MySQLi/Connection.php | 4 ++-- .../Database/Live/MySQLi/NumberNativeTest.php | 18 ++++++++++++++++-- .../source/database/configuration.rst | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index f657734c896a..00c165dbef51 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -106,8 +106,8 @@ public function connect(bool $persistent = false) $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - if (isset($this->numberNative) && $this->numberNative) { - $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); + if($this->numberNative === true){ + $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE,1); } if (isset($this->strictOn)) { diff --git a/tests/system/Database/Live/MySQLi/NumberNativeTest.php b/tests/system/Database/Live/MySQLi/NumberNativeTest.php index eb2608b5c751..1f95dd4e7c59 100644 --- a/tests/system/Database/Live/MySQLi/NumberNativeTest.php +++ b/tests/system/Database/Live/MySQLi/NumberNativeTest.php @@ -36,8 +36,6 @@ protected function setUp(): void $config = config('Database'); $this->tests = $config->tests; - - $this->tests['DBDriver'] = 'MySQLi'; } public function testEnableNumberNative() @@ -46,6 +44,10 @@ public function testEnableNumberNative() $db1 = Database::connect($this->tests); + if ($db1->DBDriver !== 'MySQLi') { + $this->markTestSkipped('Only MySQLi can complete this test.'); + } + $this->assertTrue($db1->numberNative); } @@ -55,6 +57,10 @@ public function testDisableNumberNative() $db1 = Database::connect($this->tests); + if ($db1->DBDriver !== 'MySQLi') { + $this->markTestSkipped('Only MySQLi can complete this test.'); + } + $this->assertFalse($db1->numberNative); } @@ -64,6 +70,10 @@ public function testQueryDataAfterEnableNumberNative() $db1 = Database::connect($this->tests); + if ($db1->DBDriver !== 'MySQLi') { + $this->markTestSkipped('Only MySQLi can complete this test.'); + } + $data = $db1->table('db_type_test') ->get() ->getRow(); @@ -78,6 +88,10 @@ public function testQueryDataAfterDisableNumberNative() $db1 = Database::connect($this->tests); + if ($db1->DBDriver !== 'MySQLi') { + $this->markTestSkipped('Only MySQLi can complete this test.'); + } + $data = $db1->table('db_type_test') ->get() ->getRow(); diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 0c16803d7164..7da92aac9139 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -108,9 +108,9 @@ default group's configuration settings. The values should be name following this Explanation of Values: ********************** -=============== =========================================================================================================== +================ =========================================================================================================== Name Config Description -=============== =========================================================================================================== +================ =========================================================================================================== **dsn** The DSN connect string (an all-in-one configuration sequence). **hostname** The hostname of your database server. Often this is 'localhost'. **username** The username used to connect to the database. (``SQLite3`` does not use this.) @@ -150,8 +150,8 @@ Explanation of Values: See `SQLite documentation `_. To enforce Foreign Key constraint, set this config item to true. **busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). -**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only). -=============== =========================================================================================================== +**numberNative** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). +================ =========================================================================================================== .. note:: Depending on what database driver you are using (``MySQLi``, ``Postgres``, etc.) not all values will be needed. For example, when using ``SQLite3`` you From 7b152dfbd85aecbb60e451d585aa52eb0f81add7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 12:49:51 +0800 Subject: [PATCH 3245/8282] fix:Column description of numberNative in CodeIgniter4/user_guide_src/source/database/configuration.rst. --- user_guide_src/source/database/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 7da92aac9139..1683ce801518 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -150,7 +150,7 @@ Explanation of Values: See `SQLite documentation `_. To enforce Foreign Key constraint, set this config item to true. **busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). -**numberNative** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). +**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only). ================ =========================================================================================================== .. note:: Depending on what database driver you are using (``MySQLi``, ``Postgres``, From 5c6f468f03f817f1cd63b045a5690e231cced2e9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 14:06:55 +0900 Subject: [PATCH 3246/8282] fix: RawSql causes error when using like() and countAllResults() --- system/Database/BaseBuilder.php | 4 ++++ tests/system/Database/Live/LikeTest.php | 29 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 653f43013f15..31234f9edf1a 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -3082,6 +3082,10 @@ protected function compileWhereHaving(string $qbKey): string continue; } + if ($qbkey instanceof RawSql) { + continue; + } + if ($qbkey['condition'] instanceof RawSql) { $qbkey = $qbkey['condition']; diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php index f192d4a0f224..379de0cf1820 100644 --- a/tests/system/Database/Live/LikeTest.php +++ b/tests/system/Database/Live/LikeTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Database\Live; +use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -121,4 +122,32 @@ public function testLikeSpacesOrTabs() $this->assertCount(1, $spaces); $this->assertCount(1, $tabs); } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/7268 + */ + public function testLikeRawSqlAndCountAllResultsAndGet() + { + $builder = $this->db->table('job'); + $builder->like(new RawSql('name'), 'Developer'); + $count = $builder->countAllResults(false); + $results = $builder->get()->getResult(); + + $this->assertSame(1, $count); + $this->assertSame('Developer', $results[0]->name); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/7268 + */ + public function testLikeRawSqlAndGetAndCountAllResults() + { + $builder = $this->db->table('job'); + $builder->like(new RawSql('name'), 'Developer'); + $results = $builder->get(null, 0, false)->getResult(); + $count = $builder->countAllResults(); + + $this->assertSame(1, $count); + $this->assertSame('Developer', $results[0]->name); + } } From c18581dd0eec72cd018a68abc6f5a72cf0cd0a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 13:37:01 +0800 Subject: [PATCH 3247/8282] fix:Run composer cs-fix and modify the Enhancements/DataBase description in user_guide_src/source/changelogs/v4.4.0.rst. --- system/Database/MySQLi/Connection.php | 6 +++--- user_guide_src/source/changelogs/v4.4.0.rst | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index 00c165dbef51..45b306ce2a44 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -105,9 +105,9 @@ public function connect(bool $persistent = false) mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX); $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10); - - if($this->numberNative === true){ - $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE,1); + + if ($this->numberNative === true) { + $this->mysqli->options(MYSQLI_OPT_INT_AND_FLOAT_NATIVE, 1); } if (isset($this->strictOn)) { diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index a4d2afbafec2..8844656b91dd 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -59,6 +59,9 @@ Forge Others ------ +- **numberNative:** Added the ``numberNative`` attribute to the Database setting to keep the variable type obtained after SQL Query consistent with the type set in the DataBase. + See `configuration.rst`_ for details. + Model ===== From 0d8c914ced2c4197e7c7d6ea098904ee51eee4f9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 19 Feb 2023 14:39:03 +0900 Subject: [PATCH 3248/8282] test: fix for OCI8 --- tests/system/Database/Live/LikeTest.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php index 379de0cf1820..fe616105a466 100644 --- a/tests/system/Database/Live/LikeTest.php +++ b/tests/system/Database/Live/LikeTest.php @@ -129,7 +129,14 @@ public function testLikeSpacesOrTabs() public function testLikeRawSqlAndCountAllResultsAndGet() { $builder = $this->db->table('job'); - $builder->like(new RawSql('name'), 'Developer'); + + if ($this->db->DBDriver === 'OCI8') { + $key = new RawSql('"name"'); + } else { + $key = new RawSql('name'); + } + + $builder->like($key, 'Developer'); $count = $builder->countAllResults(false); $results = $builder->get()->getResult(); @@ -143,7 +150,14 @@ public function testLikeRawSqlAndCountAllResultsAndGet() public function testLikeRawSqlAndGetAndCountAllResults() { $builder = $this->db->table('job'); - $builder->like(new RawSql('name'), 'Developer'); + + if ($this->db->DBDriver === 'OCI8') { + $key = new RawSql('"name"'); + } else { + $key = new RawSql('name'); + } + + $builder->like($key, 'Developer'); $results = $builder->get(null, 0, false)->getResult(); $count = $builder->countAllResults(); From b2c74e8b7d3d6425abb918747a0cad0191a2e871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 13:48:48 +0800 Subject: [PATCH 3249/8282] fix:Modify the Enhancements/DataBase description in user_guide_src/source/changelogs/v4.4.0.rst. --- user_guide_src/source/changelogs/v4.4.0.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 8844656b91dd..959dc75bdd87 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -59,8 +59,9 @@ Forge Others ------ -- **numberNative:** Added the ``numberNative`` attribute to the Database setting to keep the variable type obtained after SQL Query consistent with the type set in the DataBase. - See `configuration.rst`_ for details. +- **Database:** Added the ``numberNative`` attribute to the Database Config for MySQLi to keep the variable type obtained after SQL Query consistent with the type set in the database. + See `configuration.rst `_ + for details. Model ===== From 78ff0a9775f19a0ed0af84209ae3d295c4c9b205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 14:19:49 +0800 Subject: [PATCH 3250/8282] fix:Modify database/configuration.rst and changelogs/v4.4.0.rst description. --- user_guide_src/source/changelogs/v4.4.0.rst | 3 +-- user_guide_src/source/database/configuration.rst | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 959dc75bdd87..8d3cc6894dfc 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -60,8 +60,7 @@ Others ------ - **Database:** Added the ``numberNative`` attribute to the Database Config for MySQLi to keep the variable type obtained after SQL Query consistent with the type set in the database. - See `configuration.rst `_ - for details. + See :ref:`Database Configuration `. Model ===== diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 1683ce801518..cfd666988ac3 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -104,6 +104,8 @@ default group's configuration settings. The values should be name following this database.default.password = ''; database.default.database = 'ci4'; +.. _database-configuration-explanation-of-values: + ********************** Explanation of Values: ********************** From 0a8c9711597c7bc88de429e72b30a5285ecbc4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E9=8A=98=E5=87=B1?= Date: Sun, 19 Feb 2023 14:41:18 +0800 Subject: [PATCH 3251/8282] fix:Modify changelogs/v4.4.0.rst description and remove the numberNative attribute from the $test array in app/Config/Database.php --- app/Config/Database.php | 39 ++++++++++----------- user_guide_src/source/changelogs/v4.4.0.rst | 2 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/Config/Database.php b/app/Config/Database.php index 9e752027feed..e2450ec16cf1 100644 --- a/app/Config/Database.php +++ b/app/Config/Database.php @@ -50,26 +50,25 @@ class Database extends Config * running PHPUnit database tests. */ public array $tests = [ - 'DSN' => '', - 'hostname' => '127.0.0.1', - 'username' => '', - 'password' => '', - 'database' => ':memory:', - 'DBDriver' => 'SQLite3', - 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS - 'pConnect' => false, - 'DBDebug' => true, - 'charset' => 'utf8', - 'DBCollat' => 'utf8_general_ci', - 'swapPre' => '', - 'encrypt' => false, - 'compress' => false, - 'strictOn' => false, - 'failover' => [], - 'port' => 3306, - 'foreignKeys' => true, - 'busyTimeout' => 1000, - 'numberNative' => false, + 'DSN' => '', + 'hostname' => '127.0.0.1', + 'username' => '', + 'password' => '', + 'database' => ':memory:', + 'DBDriver' => 'SQLite3', + 'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS + 'pConnect' => false, + 'DBDebug' => true, + 'charset' => 'utf8', + 'DBCollat' => 'utf8_general_ci', + 'swapPre' => '', + 'encrypt' => false, + 'compress' => false, + 'strictOn' => false, + 'failover' => [], + 'port' => 3306, + 'foreignKeys' => true, + 'busyTimeout' => 1000, ]; public function __construct() diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 8d3cc6894dfc..24ef1efc1707 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -59,7 +59,7 @@ Forge Others ------ -- **Database:** Added the ``numberNative`` attribute to the Database Config for MySQLi to keep the variable type obtained after SQL Query consistent with the type set in the database. +- **MySQLi:** Added the ``numberNative`` attribute to the Database Config to keep the variable type obtained after SQL Query consistent with the type set in the database. See :ref:`Database Configuration `. Model From c1d68ce00494bf51d851f6668e3313ca129e91a3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 08:57:14 +0900 Subject: [PATCH 3252/8282] docs: make doc link paths relative --- user_guide_src/source/incoming/filters.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index ca63f38b391a..036c14ddd992 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -6,7 +6,7 @@ Controller Filters :local: :depth: 2 -Controller Filters allow you to perform actions either before or after the controllers execute. Unlike :doc:`events `, +Controller Filters allow you to perform actions either before or after the controllers execute. Unlike :doc:`events <../extending/events>`, you can choose the specific URIs in which the filters will be applied to. Incoming filters may modify the Request while after filters can act on and even modify the Response, allowing for a lot of flexibility and power. Some common examples of tasks that might be performed with filters are: @@ -60,7 +60,7 @@ This is typically used to perform redirects, like in this example: .. literalinclude:: filters/002.php If a ``Response`` instance is returned, the Response will be sent back to the client and script execution will stop. -This can be useful for implementing rate limiting for APIs. See :doc:`Throttler ` for an +This can be useful for implementing rate limiting for APIs. See :doc:`Throttler <../libraries/throttler>` for an example. .. _after-filters: @@ -165,7 +165,7 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen Confirming Filters ****************** -CodeIgniter has the following :doc:`command ` to check the filters for a route. +CodeIgniter has the following :doc:`command <../cli/spark_commands>` to check the filters for a route. .. _spark-filter-check: From ab0acdc6153026ba496fcb552935ea583aa7f331 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 08:57:50 +0900 Subject: [PATCH 3253/8282] docs: add property types in sample code --- user_guide_src/source/incoming/filters/003.php | 2 +- user_guide_src/source/incoming/filters/004.php | 2 +- user_guide_src/source/incoming/filters/005.php | 4 +++- user_guide_src/source/incoming/filters/006.php | 4 +++- user_guide_src/source/incoming/filters/007.php | 4 +++- user_guide_src/source/incoming/filters/008.php | 4 +++- user_guide_src/source/incoming/filters/009.php | 4 +++- user_guide_src/source/incoming/filters/011.php | 2 +- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php index 2e7770e88ddd..af170fa37ac0 100644 --- a/user_guide_src/source/incoming/filters/003.php +++ b/user_guide_src/source/incoming/filters/003.php @@ -6,7 +6,7 @@ class Filters extends BaseConfig { - public $aliases = [ + public array $aliases = [ 'csrf' => \CodeIgniter\Filters\CSRF::class, ]; diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php index c645d9f8191d..304bd21b53eb 100644 --- a/user_guide_src/source/incoming/filters/004.php +++ b/user_guide_src/source/incoming/filters/004.php @@ -6,7 +6,7 @@ class Filters extends BaseConfig { - public $aliases = [ + public array $aliases = [ 'apiPrep' => [ \App\Filters\Negotiate::class, \App\Filters\ApiAuth::class, diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php index 226db2389c58..8b00ce682b1b 100644 --- a/user_guide_src/source/incoming/filters/005.php +++ b/user_guide_src/source/incoming/filters/005.php @@ -6,7 +6,9 @@ class Filters extends BaseConfig { - public $globals = [ + // ... + + public array $globals = [ 'before' => [ 'csrf', ], diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php index bfddf66c3c4e..a7f4336a635f 100644 --- a/user_guide_src/source/incoming/filters/006.php +++ b/user_guide_src/source/incoming/filters/006.php @@ -6,7 +6,9 @@ class Filters extends BaseConfig { - public $globals = [ + // ... + + public array $globals = [ 'before' => [ 'csrf' => ['except' => 'api/*'], ], diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php index d7f21efa1344..b3c9cc8ed996 100644 --- a/user_guide_src/source/incoming/filters/007.php +++ b/user_guide_src/source/incoming/filters/007.php @@ -6,7 +6,9 @@ class Filters extends BaseConfig { - public $globals = [ + // ... + + public array $globals = [ 'before' => [ 'csrf' => ['except' => ['foo/*', 'bar/*']], ], diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php index 1d99d0226a79..749da8098c6b 100644 --- a/user_guide_src/source/incoming/filters/008.php +++ b/user_guide_src/source/incoming/filters/008.php @@ -6,7 +6,9 @@ class Filters extends BaseConfig { - public $methods = [ + // ... + + public array $methods = [ 'post' => ['foo', 'bar'], 'get' => ['baz'], ]; diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php index 162af6dcbaec..274a4cb6256b 100644 --- a/user_guide_src/source/incoming/filters/009.php +++ b/user_guide_src/source/incoming/filters/009.php @@ -6,7 +6,9 @@ class Filters extends BaseConfig { - public $filters = [ + // ... + + public array $filters = [ 'foo' => ['before' => ['admin/*'], 'after' => ['users/*']], 'bar' => ['before' => ['api/*', 'admin/*']], ]; diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php index fa12db31a9e7..6c12e301ff6b 100644 --- a/user_guide_src/source/incoming/filters/011.php +++ b/user_guide_src/source/incoming/filters/011.php @@ -6,7 +6,7 @@ class Filters extends BaseConfig { - public $aliases = [ + public array $aliases = [ // ... 'secureheaders' => \App\Filters\SecureHeaders::class, ]; From 4a4e8d6048ef7901990d57e1cd8fbbed38404790 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:10:43 +0900 Subject: [PATCH 3254/8282] docs: make the first letter capital --- user_guide_src/source/incoming/filters.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 036c14ddd992..b9c6b1c20c55 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -152,8 +152,8 @@ a list of URI patterns that filter should apply to: .. literalinclude:: filters/009.php -Filter arguments -================= +Filter Arguments +================ When configuring filters, additional arguments may be passed to a filter when setting up the route: From 7b05b725e77b0fb2821ac611dcc47d594a4e8248 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:11:19 +0900 Subject: [PATCH 3255/8282] docs: add sub section title --- user_guide_src/source/incoming/filters.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index b9c6b1c20c55..80b6a908a43e 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -114,6 +114,9 @@ run on every request. Filters can be specified by adding their alias to either t .. literalinclude:: filters/005.php +Except for a Few URIs +--------------------- + There are times where you want to apply a filter to almost every request, but have a few that should be left alone. One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from third-party websites to hit one or two specific URI's, while keeping the rest of them protected. To do this, add From 35029c5cc601eb560a09c9bad454483748cf1093 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:12:14 +0900 Subject: [PATCH 3256/8282] docs: text decration --- user_guide_src/source/incoming/filters.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 80b6a908a43e..7acf229a4ded 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -120,7 +120,7 @@ Except for a Few URIs There are times where you want to apply a filter to almost every request, but have a few that should be left alone. One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from third-party websites to hit one or two specific URI's, while keeping the rest of them protected. To do this, add -an array with the 'except' key and a URI to match as the value alongside the alias: +an array with the ``except`` key and a URI to match as the value alongside the alias: .. literalinclude:: filters/006.php @@ -150,7 +150,7 @@ all requests that were run from the command line. $filters ======== -This property is an array of filter aliases. For each alias, you can specify before and after arrays that contain +This property is an array of filter aliases. For each alias, you can specify ``before`` and ``after`` arrays that contain a list of URI patterns that filter should apply to: .. literalinclude:: filters/009.php From 40f994e8b05bb094d3d071da2b3a60a4b8e0a034 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:12:37 +0900 Subject: [PATCH 3257/8282] docs: add literal for asterisk --- user_guide_src/source/incoming/filters.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index 7acf229a4ded..dd8c9ac21d39 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -125,7 +125,7 @@ an array with the ``except`` key and a URI to match as the value alongside the a .. literalinclude:: filters/006.php Any place you can use a URI in the filter settings, you can use a regular expression or, like in this example, use -an asterisk for a wildcard that will match all characters after that. In this example, any URL's starting with ``api/`` +an asterisk (``*``) for a wildcard that will match all characters after that. In this example, any URL's starting with ``api/`` would be exempted from CSRF protection, but the site's forms would all be protected. If you need to specify multiple URI's you can use an array of URI patterns: From b7a62ee77de375a5121fbd9832b45b02fd6afba5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:13:31 +0900 Subject: [PATCH 3258/8282] docs: change paragraph structure --- user_guide_src/source/incoming/filters.rst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index dd8c9ac21d39..cab286cf95fc 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -134,18 +134,20 @@ URI's you can use an array of URI patterns: $methods ======== +.. Warning:: If you use ``$methods`` filters, you should :ref:`disable Auto Routing (Legacy) ` + because :ref:`auto-routing-legacy` permits any HTTP method to access a controller. + Accessing the controller with a method you don't expect could bypass the filter. + You can apply filters to all requests of a certain HTTP method, like POST, GET, PUT, etc. In this array, you would -specify the method name in lowercase. It's value would be an array of filters to run. Unlike the ``$globals`` or the -``$filters`` properties, these will only run as before filters: +specify the method name in **lowercase**. It's value would be an array of filters to run: .. literalinclude:: filters/008.php -In addition to the standard HTTP methods, this also supports one special case: 'cli'. The 'cli' method would apply to -all requests that were run from the command line. +.. note:: Unlike the ``$globals`` or the + ``$filters`` properties, these will only run as before filters. -.. Warning:: If you use ``$methods`` filters, you should :ref:`disable Auto Routing (Legacy) ` - because :ref:`auto-routing-legacy` permits any HTTP method to access a controller. - Accessing the controller with a method you don't expect could bypass the filter. +In addition to the standard HTTP methods, this also supports one special case: ``cli``. The ``cli`` method would apply to +all requests that were run from the command line. $filters ======== From 62b43b9d6f6b1f13e22771236a88992ee2a8544c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:31:02 +0900 Subject: [PATCH 3259/8282] docs: add TOC --- user_guide_src/source/incoming/content_negotiation.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst index ceb0ce866193..35185db029f3 100644 --- a/user_guide_src/source/incoming/content_negotiation.rst +++ b/user_guide_src/source/incoming/content_negotiation.rst @@ -9,6 +9,10 @@ is done by analyzing four different headers which can each support multiple valu Trying to match this up manually can be pretty challenging. CodeIgniter provides the ``Negotiator`` class that can handle this for you. +.. contents:: + :local: + :depth: 2 + ================= Loading the Class ================= From cccb3c57c52225a6cd8f977435baaf9de7d00341 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:32:32 +0900 Subject: [PATCH 3260/8282] docs: fix section title marks --- .../source/incoming/content_negotiation.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst index 35185db029f3..043a6cf7201f 100644 --- a/user_guide_src/source/incoming/content_negotiation.rst +++ b/user_guide_src/source/incoming/content_negotiation.rst @@ -1,6 +1,6 @@ -******************* +################### Content Negotiation -******************* +################### Content negotiation is a way to determine what type of content to return to the client based on what the client can handle, and what the server can handle. This can be used to determine whether the client is wanting HTML or JSON @@ -13,9 +13,9 @@ can handle this for you. :local: :depth: 2 -================= +***************** Loading the Class -================= +***************** You can load an instance of the class manually through the Service class: @@ -32,9 +32,9 @@ method: When accessed this way, the first parameter is the type of content you're trying to find a match for, while the second is an array of supported values. -=========== +*********** Negotiating -=========== +*********** In this section, we will discuss the 4 types of content that can be negotiated and show how that would look using both of the methods described above to access the negotiator. From 968f03f8c06c07a6402f009a6b2d185eebcb16fa Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:46:34 +0900 Subject: [PATCH 3261/8282] docs: fix section title marks --- user_guide_src/source/incoming/message.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst index 411f53990162..8edc3e27fbef 100644 --- a/user_guide_src/source/incoming/message.rst +++ b/user_guide_src/source/incoming/message.rst @@ -1,6 +1,6 @@ -============= +############# HTTP Messages -============= +############# The Message class provides an interface to the portions of an HTTP message that are common to both requests and responses, including the message body, protocol version, utilities for working with From 23087c6dec524da935d28e604aa2cc38637cb997 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:48:17 +0900 Subject: [PATCH 3262/8282] docs: move "What is Content Negotiation?" to content_negotiation.rst --- .../source/incoming/content_negotiation.rst | 20 +++++++++++++++++++ user_guide_src/source/incoming/message.rst | 19 ------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst index 043a6cf7201f..a27754607503 100644 --- a/user_guide_src/source/incoming/content_negotiation.rst +++ b/user_guide_src/source/incoming/content_negotiation.rst @@ -13,6 +13,26 @@ can handle this for you. :local: :depth: 2 +**************************** +What is Content Negotiation? +**************************** + +At it's heart Content Negotiation is simply a part of the HTTP specification that allows a single +resource to serve more than one type of content, allowing the clients to request the type of +data that works best for them. + +A classic example of this is a browser that cannot display PNG files can request only GIF or +JPEG images. When the server receives the request, it looks at the available file types the client +is requesting and selects the best match from the image formats that it supports, in this case +likely choosing a JPEG image to return. + +This same negotiation can happen with four types of data: + +* **Media/Document Type** - this could be image format, or HTML vs. XML or JSON. +* **Character Set** - The character set the returned document should be set in. Typically is UTF-8. +* **Document Encoding** - Typically the type of compression used on the results. +* **Document Language** - For sites that support multiple languages, this helps determine which to return. + ***************** Loading the Class ***************** diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst index 8edc3e27fbef..2a865c49b532 100644 --- a/user_guide_src/source/incoming/message.rst +++ b/user_guide_src/source/incoming/message.rst @@ -11,25 +11,6 @@ This class is the parent class that both the :doc:`Request Class Date: Mon, 20 Feb 2023 09:50:43 +0900 Subject: [PATCH 3263/8282] docs: remove incorrect out-of-dated description --- user_guide_src/source/incoming/message.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst index 2a865c49b532..3d52eb0ca765 100644 --- a/user_guide_src/source/incoming/message.rst +++ b/user_guide_src/source/incoming/message.rst @@ -7,9 +7,7 @@ requests and responses, including the message body, protocol version, utilities the headers, and methods for handling content negotiation. This class is the parent class that both the :doc:`Request Class ` and the -:doc:`Response Class ` extend from. As such, some methods, such as the content -negotiation methods, may apply only to a request or response, and not the other one, but they have -been included here to keep the header methods together. +:doc:`Response Class ` extend from. *************** Class Reference From eee7759e09ad27b2b1c16a2be43dc8cb5b1718d1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:52:05 +0900 Subject: [PATCH 3264/8282] docs: make doc link paths relative --- user_guide_src/source/incoming/message.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst index 3d52eb0ca765..a575a4aa2765 100644 --- a/user_guide_src/source/incoming/message.rst +++ b/user_guide_src/source/incoming/message.rst @@ -6,8 +6,8 @@ The Message class provides an interface to the portions of an HTTP message that requests and responses, including the message body, protocol version, utilities for working with the headers, and methods for handling content negotiation. -This class is the parent class that both the :doc:`Request Class ` and the -:doc:`Response Class ` extend from. +This class is the parent class that both the :doc:`Request Class <../incoming/request>` and the +:doc:`Response Class <../outgoing/response>` extend from. *************** Class Reference @@ -47,7 +47,7 @@ Class Reference :returns: void Scans and parses the headers found in the SERVER data and stores it for later access. - This is used by the :doc:`IncomingRequest Class ` to make + This is used by the :doc:`IncomingRequest Class <../incoming/incomingrequest>` to make the current request's headers available. The headers are any SERVER data that starts with ``HTTP_``, like ``HTTP_HOST``. Each message From 53b4e7f47c27fb2ee40e3ef40d3d6c65620d2a6d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 09:53:54 +0900 Subject: [PATCH 3265/8282] docs: move paragraph --- .../source/incoming/content_negotiation.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst index a27754607503..702bb40afe64 100644 --- a/user_guide_src/source/incoming/content_negotiation.rst +++ b/user_guide_src/source/incoming/content_negotiation.rst @@ -2,13 +2,6 @@ Content Negotiation ################### -Content negotiation is a way to determine what type of content to return to the client based on what the client -can handle, and what the server can handle. This can be used to determine whether the client is wanting HTML or JSON -returned, whether the image should be returned as a jpg or png, what type of compression is supported and more. This -is done by analyzing four different headers which can each support multiple value options, each with their own priority. -Trying to match this up manually can be pretty challenging. CodeIgniter provides the ``Negotiator`` class that -can handle this for you. - .. contents:: :local: :depth: 2 @@ -17,6 +10,14 @@ can handle this for you. What is Content Negotiation? **************************** +Content negotiation is a way to determine what type of content to return to the client based on what the client +can handle, and what the server can handle. This can be used to determine whether the client is wanting HTML or JSON +returned, whether the image should be returned as a JPEG or PNG, what type of compression is supported and more. This +is done by analyzing four different headers which can each support multiple value options, each with their own priority. + +Trying to match this up manually can be pretty challenging. CodeIgniter provides the ``Negotiator`` class that +can handle this for you. + At it's heart Content Negotiation is simply a part of the HTTP specification that allows a single resource to serve more than one type of content, allowing the clients to request the type of data that works best for them. From 2c815c64ed1e2b591d049d867fb34a7cc9695abb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Feb 2023 19:05:40 +0900 Subject: [PATCH 3266/8282] feat: add new setter/getter method for Entity --- system/Entity/Entity.php | 18 +++++++-- tests/system/Entity/EntityTest.php | 59 ++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php index 5220ae5b0aa8..ffb693cae467 100644 --- a/system/Entity/Entity.php +++ b/system/Entity/Entity.php @@ -456,11 +456,19 @@ public function __set(string $key, $value = null) $value = $this->castAs($value, $key, 'set'); - // if a set* method exists for this key, use that method to + // if a setter method exists for this key, use that method to // insert this value. should be outside $isNullable check, // so maybe wants to do sth with null value automatically $method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key))); + // If a "`_set` + $key" method exists, it is a setter. + if (method_exists($this, '_' . $method)) { + $this->{'_' . $method}($value); + + return $this; + } + + // If a "`set` + $key" method exists, it is also a setter. if (method_exists($this, $method) && $method !== 'setAttributes') { $this->{$method}($value); @@ -499,9 +507,13 @@ public function __get(string $key) // Convert to CamelCase for the method $method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key))); - // if a get* method exists for this key, + // if a getter method exists for this key, // use that method to insert this value. - if (method_exists($this, $method)) { + if (method_exists($this, '_' . $method)) { + // If a "`_get` + $key" method exists, it is a getter. + $result = $this->{'_' . $method}(); + } elseif (method_exists($this, $method)) { + // If a "`get` + $key" method exists, it is also a getter. $result = $this->{$method}(); } diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 79aeb53f3199..41192e3f9805 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -82,6 +82,19 @@ public function testGetterSetters() $this->assertSame('bar:thanks:bar', $entity->bar); } + public function testNewGetterSetters() + { + $entity = $this->getNewSetterGetterEntity(); + + $entity->bar = 'thanks'; + + $this->assertSame('bar:thanks:bar', $entity->bar); + + $entity->setBar('BAR'); + + $this->assertSame('BAR', $entity->getBar()); + } + public function testUnsetUnsetsAttribute() { $entity = $this->getEntity(); @@ -1096,6 +1109,52 @@ public function getFakeBar() }; } + protected function getNewSetterGetterEntity() + { + return new class () extends Entity { + protected $attributes = [ + 'foo' => null, + 'bar' => null, + 'default' => 'sumfin', + 'created_at' => null, + ]; + protected $original = [ + 'foo' => null, + 'bar' => null, + 'default' => 'sumfin', + 'created_at' => null, + ]; + protected $datamap = [ + 'createdAt' => 'created_at', + ]; + private string $bar; + + public function setBar($value) + { + $this->bar = $value; + + return $this; + } + + public function getBar() + { + return $this->bar; + } + + public function _setBar($value) + { + $this->attributes['bar'] = "bar:{$value}"; + + return $this; + } + + public function _getBar() + { + return "{$this->attributes['bar']}:bar"; + } + }; + } + protected function getMappedEntity() { return new class () extends Entity { From 6f52f1e5169d54adc5887528786ad46b9fccc39b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 10:49:41 +0900 Subject: [PATCH 3267/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.4.0.rst | 3 +++ user_guide_src/source/models/entities.rst | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index a4d2afbafec2..48d48d6d8c73 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -62,6 +62,9 @@ Others Model ===== +- Added special getter/setter to Entity to avoid method name conflicts. + See :ref:`entities-special-getter-setter`. + Libraries ========= diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst index df625dd73833..b93777ea125e 100644 --- a/user_guide_src/source/models/entities.rst +++ b/user_guide_src/source/models/entities.rst @@ -131,6 +131,25 @@ business logic and create objects that are pleasant to use. .. literalinclude:: entities/007.php +.. _entities-special-getter-setter: + +Special Getter/Setter +--------------------- + +.. versionadded:: 4.4.0 + +For example, if your Entity's parent class already has a ``getParent()`` method +defined, and your Entity also has a column named ``parent``, when you try to add +business logic to the ``getParent()`` method in your Entity class, the method is +already defined. + +In such a case, you can use the special getter/setter. Instead of ``getX()``/``setX()``, +set ``_getX()``/``_setX()``. + +In the above example, if your Entity has the ``_getParent()`` method, the method +will be used when you get ``$entity->parent``, and the ``_setParent()`` method +will be used when you set ``$entity->parent``. + Data Mapping ============ From 1f5d0415dd255fd5e02ada995fea56c624926711 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 15:56:45 +0000 Subject: [PATCH 3268/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.16...0.15.17) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d0c2bd1e4dda..98fc97c5fc81 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.16", + "rector/rector": "0.15.17", "vimeo/psalm": "^5.0" }, "suggest": { From 94fe3291561138150f70aba099b938a5feaaf5d1 Mon Sep 17 00:00:00 2001 From: grimpirate Date: Mon, 20 Feb 2023 23:31:09 -0500 Subject: [PATCH 3269/8282] Update user_guide_src/source/dbmgmt/forge.rst Co-authored-by: kenjis --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 668325da0fa4..e55867cc287b 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -198,7 +198,7 @@ you may add them directly in forge: .. literalinclude:: forge/012.php -You can specify the desired action for the "on delete" and "on update" properties of the constraint as well as the name: +You can specify the desired action for the "on update" and "on delete" properties of the constraint as well as the name: .. literalinclude:: forge/013.php From dc0225e1a6073f86127f9e04b942b1caa26fc1be Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Feb 2023 16:40:08 +0900 Subject: [PATCH 3270/8282] test: fix out-of-dated test code --- tests/system/CodeIgniterTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 1a5e50fc0775..be66a072a0c1 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -709,9 +709,9 @@ public function testPageCacheSendSecureHeaders() public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $expectedPagesInCache, array $testingUrls) { // Suppress command() output - CITestStreamFilter::$buffer = ''; - $outputStreamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter'); - $errorStreamFilter = stream_filter_append(STDERR, 'CITestStreamFilter'); + CITestStreamFilter::registration(); + CITestStreamFilter::addOutputFilter(); + CITestStreamFilter::addErrorFilter(); // Create cache config with cacheQueryString value from the dataProvider $cacheConfig = new Cache(); @@ -756,8 +756,8 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e $this->assertSame($expectedPagesInCache, $newPagesCached); // Remove stream filters - stream_filter_remove($outputStreamFilter); - stream_filter_remove($errorStreamFilter); + CITestStreamFilter::removeOutputFilter(); + CITestStreamFilter::removeErrorFilter(); } public function cacheQueryStringProvider(): array From 0ed690876c8a95ee8673572a0a5f0db992c44459 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Tue, 21 Feb 2023 08:52:56 +0100 Subject: [PATCH 3271/8282] docs: $systemDirectory path in existing project. --- user_guide_src/source/installation/installing_composer.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 00f736dbe603..ca9eacf28314 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -152,7 +152,7 @@ Setting Up 1. Copy the **app**, **public**, **tests** and **writable** folders from **vendor/codeigniter4/framework** to your project root 2. Copy the **env**, **phpunit.xml.dist** and **spark** files, from **vendor/codeigniter4/framework** to your project root - 3. You will have to adjust the ``$systemDirectory`` property in **app/Config/Paths.php** to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``. + 3. You will have to adjust the ``$systemDirectory`` property in **app/Config/Paths.php** to refer to the vendor one, e.g., ``__DIR__ . '/../../vendor/codeigniter4/framework/system'``. Initial Configuration --------------------- From 13b6b0e2ad366716bca70b35c6da4840a046e894 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 09:58:07 +0900 Subject: [PATCH 3272/8282] refactor: initialize $files To suppress PHPStan error. --- system/Commands/Utilities/Routes/ControllerFinder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php index 7e7865876750..e7d828c0fe57 100644 --- a/system/Commands/Utilities/Routes/ControllerFinder.php +++ b/system/Commands/Utilities/Routes/ControllerFinder.php @@ -44,6 +44,7 @@ public function find(): array $nsArray = explode('\\', trim($this->namespace, '\\')); $count = count($nsArray); $ns = ''; + $files = []; for ($i = 0; $i < $count; $i++) { $ns .= '\\' . array_shift($nsArray); From d4e47a3497d9aaf87334728ee0f244ee4a8e4e75 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 09:58:53 +0900 Subject: [PATCH 3273/8282] chore: remove ignore patterns that are no longer needed --- phpstan-baseline.neon.dist | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 2d1f9ddd3c41..6fd838f0f174 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -20,11 +20,6 @@ parameters: count: 1 path: system/Cache/Handlers/FileHandler.php - - - message: "#^Unreachable statement \\- code above always terminates\\.$#" - count: 1 - path: system/Cache/Handlers/MemcachedHandler.php - - message: "#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$redis \\(Redis\\) in isset\\(\\) is not nullable\\.$#" count: 1 @@ -50,16 +45,6 @@ parameters: count: 1 path: system/Database/BaseConnection.php - - - message: "#^Unreachable statement \\- code above always terminates\\.$#" - count: 2 - path: system/Database/BaseResult.php - - - - message: "#^While loop condition is always true\\.$#" - count: 2 - path: system/Database/BaseResult.php - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$DBDriver\\.$#" count: 2 @@ -260,21 +245,11 @@ parameters: count: 1 path: system/Router/Router.php - - - message: "#^Strict comparison using \\=\\=\\= between string and true will always evaluate to false\\.$#" - count: 1 - path: system/Session/Handlers/RedisHandler.php - - message: "#^Property CodeIgniter\\\\Session\\\\Session\\:\\:\\$sessionExpiration \\(int\\) in isset\\(\\) is not nullable\\.$#" count: 1 path: system/Session/Session.php - - - message: "#^Negated boolean expression is always false\\.$#" - count: 1 - path: system/Test/CIUnitTestCase.php - - message: "#^Access to an undefined property object\\:\\:\\$createdField\\.$#" count: 1 From 4bbecfd201a57bcfa9c4a373df37aab3565f863e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Feb 2023 10:23:25 +0900 Subject: [PATCH 3274/8282] docs: add section title --- user_guide_src/source/concepts/autoloader.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index ee2dc5a8a3d8..a285ab96de2a 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -13,6 +13,9 @@ classes that your project is using. Keeping track of where every single file is, hard-coding that location into your files in a series of ``requires()`` is a massive headache and very error-prone. That's where autoloaders come in. +CodeIgniter4 Autoloader +*********************** + CodeIgniter provides a very flexible autoloader that can be used with very little configuration. It can locate individual namespaced classes that adhere to `PSR-4 `_ autoloading From e92a9f652affbd615c14fa5a0107ae1f38347bdb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Feb 2023 10:23:42 +0900 Subject: [PATCH 3275/8282] docs: add note for case-sensitive file systems --- user_guide_src/source/concepts/autoloader.rst | 6 ++++++ user_guide_src/source/tutorial/static_pages.rst | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index a285ab96de2a..5f30ce43865d 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -30,6 +30,12 @@ they work in sequence and don't get in each other's way. The autoloader is always active, being registered with ``spl_autoload_register()`` at the beginning of the framework's execution. +.. important:: You should always be careful about the case of filenames. Many + developers develop on case-insensitive file systems on Windows or macOS. + However, most server environments use case-sensitive file systems. If the + file name case is incorrect, the autoloader cannot find the file on the + server. + Configuration ************* diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst index 26a25de7e661..c862b05be3ec 100644 --- a/user_guide_src/source/tutorial/static_pages.rst +++ b/user_guide_src/source/tutorial/static_pages.rst @@ -19,6 +19,12 @@ Let's Make our First Controller Create a file at **app/Controllers/Pages.php** with the following code. +.. important:: You should always be careful about the case of filenames. Many + developers develop on case-insensitive file systems on Windows or macOS. + However, most server environments use case-sensitive file systems. If the + file name case is incorrect, code that works locally will not work on the + server. + .. literalinclude:: static_pages/001.php You have created a class named ``Pages``, with a ``view()`` method that accepts From c35c30a2e1dfa560937505fee247da344e676d99 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 10:32:51 +0900 Subject: [PATCH 3276/8282] docs: add note for case-sensitive file systems in installation/running.rst --- user_guide_src/source/installation/running.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 4f24edd76950..97d0a052065b 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -9,6 +9,12 @@ A CodeIgniter 4 app can be run in a number of different ways: hosted on a web se using virtualization, or using CodeIgniter's command line tool for testing. This section addresses how to use each technique, and explains some of the pros and cons of them. +.. important:: You should always be careful about the case of filenames. Many + developers develop on case-insensitive file systems on Windows or macOS. + However, most server environments use case-sensitive file systems. If the + file name case is incorrect, code that works locally will not work on the + server. + If you're new to CodeIgniter, please read the :doc:`Getting Started ` section of the User Guide to begin learning how to build dynamic PHP applications. Enjoy! From 0d4c3717e1e3d81f53cb39725bc1d197d66fcb98 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 10:33:06 +0900 Subject: [PATCH 3277/8282] docs: add item in troubleshooting.rst --- .../source/installation/troubleshooting.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst index 30a8d0f55184..0d9685558670 100644 --- a/user_guide_src/source/installation/troubleshooting.rst +++ b/user_guide_src/source/installation/troubleshooting.rst @@ -56,6 +56,19 @@ If you see "No input file specified", try to change the rewrite rule like the fo RewriteRule ^([\s\S]*)$ index.php?/$1 [L,NC,QSA] +My app works fine locally but not on the production server +---------------------------------------------------------- + +Make sure that the case of the folder and file names matches the code. + +Many developers develop on case-insensitive file systems on Windows or macOS. +However, most server environments use case-sensitive file systems. + +For example, when you have **app/Controllers/Product.php**, you must use +``Product`` as the short classname, not ``product``. + +If the file name case is incorrect, the file is not found on the server. + The tutorial gives 404 errors everywhere :( ------------------------------------------- From 505bd2bcb00691a17c3f9e2408abe728d9406ee5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 11:24:12 +0900 Subject: [PATCH 3278/8282] docs: add note for URI::getSegment() --- user_guide_src/source/libraries/uri.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index 43e77e0626e2..79ea65cbe66e 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -213,6 +213,10 @@ You can also set a different default value for a particular segment by using the .. literalinclude:: uri/024.php +.. note:: You can get the last +1 segment. When you try to get the last +2 or + more segment, an exception will be thrown by default. You could prevent + throwing exceptions with the ``setSilent()`` method. + You can get a count of the total segments: .. literalinclude:: uri/025.php From 1d4f677a347d61717aaab7c2403f3da982c061ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 15:15:16 +0000 Subject: [PATCH 3279/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.17...0.15.18) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 98fc97c5fc81..f8c44b8730f7 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.17", + "rector/rector": "0.15.18", "vimeo/psalm": "^5.0" }, "suggest": { From b7ceda5f29c1c73665a1684acabb34c16a711e68 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 23 Feb 2023 01:13:36 +0700 Subject: [PATCH 3280/8282] temporary skip RemoveAlwaysTrueIfConditionRector as check truthy by @param doc --- rector.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rector.php b/rector.php index 797387ba4aba..10a3f9c226af 100644 --- a/rector.php +++ b/rector.php @@ -29,6 +29,7 @@ use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; +use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; @@ -114,6 +115,10 @@ GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', ], + + // temporary skip as remove on variable check from @param doc + // ref https://github.com/rectorphp/rector-src/pull/3402 + RemoveAlwaysTrueIfConditionRector::class, ]); // auto import fully qualified class names From 85574fa7df0e78565285cd34133713720c9d2e55 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 23 Feb 2023 01:15:56 +0700 Subject: [PATCH 3281/8282] using @see --- rector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rector.php b/rector.php index 10a3f9c226af..a0a8bcd9fcae 100644 --- a/rector.php +++ b/rector.php @@ -117,7 +117,7 @@ ], // temporary skip as remove on variable check from @param doc - // ref https://github.com/rectorphp/rector-src/pull/3402 + // @see https://github.com/rectorphp/rector-src/pull/3402 RemoveAlwaysTrueIfConditionRector::class, ]); From 17e4b3de688ec55400436992c47ebd9e825f675b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 23 Feb 2023 01:30:31 +0700 Subject: [PATCH 3282/8282] Add RawSql[] on @param on Basebuilder::updateFields() --- system/Database/BaseBuilder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 653f43013f15..da7e329a50ff 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -2021,9 +2021,9 @@ private function setAlias(string $alias): BaseBuilder /** * Sets update fields for upsert, update * - * @param string|string[] $set - * @param bool $addToDefault adds update fields to the default ones - * @param array|null $ignore ignores items in set + * @param RawSql[]|string|string[] $set + * @param bool $addToDefault adds update fields to the default ones + * @param array|null $ignore ignores items in set * * @return $this */ From b9af2b8f6335ed9f8318598e94bc4ab7dc5b5cb3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:09:16 +0900 Subject: [PATCH 3283/8282] test: remove setUp()/tearDown() CIUnitTestCase::setUp() calls Factories::reset(). --- tests/system/HTTP/URITest.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 14de6e3d587b..0d4b5e3cdcf9 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -26,16 +26,6 @@ */ final class URITest extends CIUnitTestCase { - protected function setUp(): void - { - parent::setUp(); - } - - protected function tearDown(): void - { - Factories::reset('config'); - } - public function testConstructorSetsAllParts() { $uri = new URI('http://username:password@hostname:9090/path?arg=value#anchor'); From 09c19deabeb420bed7aedefef477a9d7ec910527 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:12:55 +0900 Subject: [PATCH 3284/8282] test: add empty lines --- tests/system/HTTP/URITest.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 0d4b5e3cdcf9..dea7f4a2df8d 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -60,6 +60,7 @@ public function testSegmentsIsPopulatedRightForMultipleSegments() public function testSegmentOutOfRange() { $this->expectException(HTTPException::class); + $uri = new URI('http://hostname/path/to/script'); $uri->getSegment(5); } @@ -68,12 +69,14 @@ public function testSegmentOutOfRangeWithSilent() { $url = 'http://abc.com/a123/b/c'; $uri = new URI($url); + $this->assertSame('', $uri->setSilent()->getSegment(22)); } public function testSegmentOutOfRangeWithDefaultValue() { $this->expectException(HTTPException::class); + $url = 'http://abc.com/a123/b/c'; $uri = new URI($url); $uri->getSegment(22, 'something'); @@ -83,6 +86,7 @@ public function testSegmentOutOfRangeWithSilentAndDefaultValue() { $url = 'http://abc.com/a123/b/c'; $uri = new URI($url); + $this->assertSame('something', $uri->setSilent()->getSegment(22, 'something')); } @@ -126,10 +130,12 @@ public function testSimpleUri() { $url = 'http://example.com'; $uri = new URI($url); + $this->assertSame($url, (string) $uri); $url = 'http://example.com/'; $uri = new URI($url); + $this->assertSame($url, (string) $uri); } @@ -140,12 +146,14 @@ public function testEmptyUri() $this->assertSame('http://' . $url, (string) $uri); $url = '/'; $uri = new URI($url); + $this->assertSame('http://', (string) $uri); } public function testMalformedUri() { $this->expectException(HTTPException::class); + $url = 'http://abc:a123'; new URI($url); } @@ -154,6 +162,7 @@ public function testMissingScheme() { $url = 'http://foo.bar/baz'; $uri = new URI($url); + $this->assertSame('http', $uri->getScheme()); $this->assertSame('foo.bar', $uri->getAuthority()); $this->assertSame('/baz', $uri->getPath()); @@ -165,6 +174,7 @@ public function testSchemeSub() $url = 'example.com'; $uri = new URI('http://' . $url); $uri->setScheme('x'); + $this->assertSame('x://' . $url, (string) $uri); } @@ -245,6 +255,7 @@ public function testSetPortInvalidValues() $this->expectException(HTTPException::class); $this->expectExceptionMessage(lang('HTTP.invalidPort', ['70000'])); + $uri->setPort(70000); } @@ -265,6 +276,7 @@ public function testSetPortTooSmall() $this->expectException(HTTPException::class); $this->expectExceptionMessage(lang('HTTP.invalidPort', [-1])); + $uri->setPort(-1); } @@ -275,12 +287,14 @@ public function testSetPortZero() $this->expectException(HTTPException::class); $this->expectExceptionMessage(lang('HTTP.invalidPort', [0])); + $uri->setPort(0); } public function testCatchesBadPort() { $this->expectException(HTTPException::class); + $url = 'http://username:password@hostname:90909/path?arg=value#anchor'; $uri = new URI(); $uri->setURI($url); @@ -407,6 +421,7 @@ public function testSetQueryThrowsErrorWhenFragmentPresent() $uri = new URI($url); $this->expectException(HTTPException::class); + $uri->setQuery('?key=value#fragment'); } @@ -936,6 +951,7 @@ public function testZeroAsURIPath() { $url = 'http://example.com/0'; $uri = new URI($url); + $this->assertSame($url, (string) $uri); $this->assertSame('/0', $uri->getPath()); } @@ -944,6 +960,7 @@ public function testEmptyURIPath() { $url = 'http://example.com/'; $uri = new URI($url); + $this->assertSame([], $uri->getSegments()); $this->assertSame(0, $uri->getTotalSegments()); } @@ -963,6 +980,7 @@ public function testSetURISilent() { $url = ':'; $uri = new URI(); + $uri->setSilent()->setURI($url); $this->assertTrue(true); From 18c89c4e6ead7fc9c3470f87934442bf71ce72ef Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:15:05 +0900 Subject: [PATCH 3285/8282] test: break long lines --- tests/system/HTTP/URITest.php | 45 ++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index dea7f4a2df8d..f413e20d4327 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -798,9 +798,18 @@ public function testGetQueryWithStrings() */ public function testNoExtraSlashes() { - $this->assertSame('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder'))); - $this->assertSame('http://localhost/subfolder', (string) (new URI('localhost/subfolder'))); - $this->assertSame('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder'))); + $this->assertSame( + 'http://entirely.different.com/subfolder', + (string) (new URI('entirely.different.com/subfolder')) + ); + $this->assertSame( + 'http://localhost/subfolder', + (string) (new URI('localhost/subfolder')) + ); + $this->assertSame( + 'http://localtest.me/subfolder', + (string) (new URI('localtest.me/subfolder')) + ); } public function testSetSegment() @@ -880,7 +889,10 @@ public function testBasedNoIndex() Services::injectMock('request', $request); // going through request - $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->getUri()); + $this->assertSame( + 'http://example.com/ci/v4/controller/method', + (string) $request->getUri() + ); $this->assertSame('ci/v4/controller/method', $request->getUri()->getPath()); // standalone @@ -907,12 +919,21 @@ public function testBasedWithIndex() Services::injectMock('request', $request); // going through request - $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->getUri()); - $this->assertSame('ci/v4/index.php/controller/method', $request->getUri()->getPath()); + $this->assertSame( + 'http://example.com/ci/v4/index.php/controller/method', + (string) $request->getUri() + ); + $this->assertSame( + 'ci/v4/index.php/controller/method', + $request->getUri()->getPath() + ); // standalone $uri = new URI('http://example.com/ci/v4/index.php/controller/method'); - $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri); + $this->assertSame( + 'http://example.com/ci/v4/index.php/controller/method', + (string) $uri + ); $this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath()); $this->assertSame($uri->getPath(), '/' . $request->getUri()->getPath()); @@ -938,13 +959,19 @@ public function testForceGlobalSecureRequests() Services::injectMock('request', $request); // Detected by request - $this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->getUri()); + $this->assertSame( + 'https://example.com/ci/v4/controller/method', + (string) $request->getUri() + ); // Standalone $uri = new URI('http://example.com/ci/v4/controller/method'); $this->assertSame('https://example.com/ci/v4/controller/method', (string) $uri); - $this->assertSame(trim($uri->getPath(), '/'), trim($request->getUri()->getPath(), '/')); + $this->assertSame( + trim($uri->getPath(), '/'), + trim($request->getUri()->getPath(), '/') + ); } public function testZeroAsURIPath() From 9966e5abd47c34567d17c1ff2ad5590712e504b9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:16:44 +0900 Subject: [PATCH 3286/8282] test: add empty lines --- tests/system/HTTP/URITest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index f413e20d4327..316985540a8a 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -352,6 +352,7 @@ public function testPathGetsFiltered($path, $expected) { $uri = new URI(); $uri->setPath($path); + $this->assertSame($expected, $uri->getPath()); } @@ -466,6 +467,7 @@ public function authorityInfo() public function testAuthorityReturnsExceptedValues($url, $expected) { $uri = new URI($url); + $this->assertSame($expected, $uri->getAuthority()); } From 9e46442dde6277341223b1fa42b0626d655052ff Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:21:47 +0900 Subject: [PATCH 3287/8282] test: remove empty lines --- tests/system/HTTP/URITest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 316985540a8a..b9d32d83236f 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -122,7 +122,6 @@ public function testCanCastAsString() $uri = new URI($url); $expected = 'http://username@hostname:9090/path?arg=value#anchor'; - $this->assertSame($expected, (string) $uri); } @@ -497,7 +496,6 @@ public function testAuthorityRemovesDefaultPorts($scheme, $port) $uri = new URI($url); $expected = "{$scheme}://example.com/path"; - $this->assertSame($expected, (string) $uri); } From 695db91e0c948ad56c23c0fb400732bddfd92382 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:22:11 +0900 Subject: [PATCH 3288/8282] test: remove unneeded variable concatenation --- tests/system/HTTP/URITest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index b9d32d83236f..d2b8fea81586 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -142,7 +142,9 @@ public function testEmptyUri() { $url = ''; $uri = new URI($url); - $this->assertSame('http://' . $url, (string) $uri); + + $this->assertSame('http://', (string) $uri); + $url = '/'; $uri = new URI($url); From 859060bfed3eab6c0eb9ba28900fb9df7256cf17 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:24:36 +0900 Subject: [PATCH 3289/8282] test: move $expected lines --- tests/system/HTTP/URITest.php | 47 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index d2b8fea81586..8dceb6623593 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -184,10 +184,10 @@ public function testSetSchemeSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'https://example.com/path'; - $uri->setScheme('https'); + $this->assertSame('https', $uri->getScheme()); + $expected = 'https://example.com/path'; $this->assertSame($expected, (string) $uri); } @@ -196,10 +196,10 @@ public function testSetUserInfoSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://user@example.com/path'; - $uri->setUserInfo('user', 'password'); + $this->assertSame('user', $uri->getUserInfo()); + $expected = 'http://user@example.com/path'; $this->assertSame($expected, (string) $uri); } @@ -208,17 +208,16 @@ public function testUserInfoCanShowPassword() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://user@example.com/path'; - $uri->setUserInfo('user', 'password'); + $this->assertSame('user', $uri->getUserInfo()); + $expected = 'http://user@example.com/path'; $this->assertSame($expected, (string) $uri); $uri->showPassword(); - $expected = 'http://user:password@example.com/path'; - $this->assertSame('user:password', $uri->getUserInfo()); + $expected = 'http://user:password@example.com/path'; $this->assertSame($expected, (string) $uri); } @@ -227,10 +226,10 @@ public function testSetHostSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://another.com/path'; - $uri->setHost('another.com'); + $this->assertSame('another.com', $uri->getHost()); + $expected = 'http://another.com/path'; $this->assertSame($expected, (string) $uri); } @@ -239,10 +238,10 @@ public function testSetPortSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com:9000/path'; - $uri->setPort(9000); + $this->assertSame(9000, $uri->getPort()); + $expected = 'http://example.com:9000/path'; $this->assertSame($expected, (string) $uri); } @@ -306,10 +305,10 @@ public function testSetPathSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/somewhere/else'; - $uri->setPath('somewhere/else'); + $this->assertSame('somewhere/else', $uri->getPath()); + $expected = 'http://example.com/somewhere/else'; $this->assertSame($expected, (string) $uri); } @@ -362,10 +361,10 @@ public function testSetFragmentSetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/path#good-stuff'; - $uri->setFragment('#good-stuff'); + $this->assertSame('good-stuff', $uri->getFragment()); + $expected = 'http://example.com/path#good-stuff'; $this->assertSame($expected, (string) $uri); } @@ -374,10 +373,10 @@ public function testSetQuerySetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/path?key=value&second_key=value.2'; - $uri->setQuery('?key=value&second.key=value.2'); + $this->assertSame('key=value&second_key=value.2', $uri->getQuery()); + $expected = 'http://example.com/path?key=value&second_key=value.2'; $this->assertSame($expected, (string) $uri); } @@ -386,10 +385,10 @@ public function testSetQuerySetsValueWithUseRawQueryString() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/path?key=value&second.key=value.2'; - $uri->useRawQueryString()->setQuery('?key=value&second.key=value.2'); + $this->assertSame('key=value&second.key=value.2', $uri->getQuery()); + $expected = 'http://example.com/path?key=value&second.key=value.2'; $this->assertSame($expected, (string) $uri); } @@ -398,10 +397,10 @@ public function testSetQueryArraySetsValue() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/path?key=value&second_key=value.2'; - $uri->setQueryArray(['key' => 'value', 'second.key' => 'value.2']); + $this->assertSame('key=value&second_key=value.2', $uri->getQuery()); + $expected = 'http://example.com/path?key=value&second_key=value.2'; $this->assertSame($expected, (string) $uri); } @@ -410,10 +409,10 @@ public function testSetQueryArraySetsValueWithUseRawQueryString() $url = 'http://example.com/path'; $uri = new URI($url); - $expected = 'http://example.com/path?key=value&second.key=value.2'; - $uri->useRawQueryString()->setQueryArray(['key' => 'value', 'second.key' => 'value.2']); + $this->assertSame('key=value&second.key=value.2', $uri->getQuery()); + $expected = 'http://example.com/path?key=value&second.key=value.2'; $this->assertSame($expected, (string) $uri); } From 656af0a44a53bbbccb19737f6d304fbe4ea0d370 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:25:17 +0900 Subject: [PATCH 3290/8282] test: fix @param types --- tests/system/HTTP/URITest.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 8dceb6623593..a72576879615 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -345,8 +345,8 @@ public function invalidPaths() /** * @dataProvider invalidPaths * - * @param mixed $path - * @param mixed $expected + * @param string $path + * @param string $expected */ public function testPathGetsFiltered($path, $expected) { @@ -461,8 +461,8 @@ public function authorityInfo() /** * @dataProvider authorityInfo * - * @param mixed $url - * @param mixed $expected + * @param string $url + * @param string $expected */ public function testAuthorityReturnsExceptedValues($url, $expected) { @@ -488,8 +488,8 @@ public function defaultPorts() /** * @dataProvider defaultPorts * - * @param mixed $scheme - * @param mixed $port + * @param string $scheme + * @param int $port */ public function testAuthorityRemovesDefaultPorts($scheme, $port) { @@ -611,8 +611,8 @@ public function defaultDots() /** * @dataProvider defaultDots * - * @param mixed $path - * @param mixed $expected + * @param string $path + * @param string $expected */ public function testRemoveDotSegments($path, $expected) { @@ -652,8 +652,8 @@ public function defaultResolutions() /** * @dataProvider defaultResolutions * - * @param mixed $rel - * @param mixed $expected + * @param string $rel + * @param string $expected */ public function testResolveRelativeURI($rel, $expected) { @@ -669,8 +669,8 @@ public function testResolveRelativeURI($rel, $expected) /** * @dataProvider defaultResolutions * - * @param mixed $rel - * @param mixed $expected + * @param string $rel + * @param string $expected */ public function testResolveRelativeURIHTTPS($rel, $expected) { From ab5393b801b5b03dcc095680c0bbaeda66ea0fa7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:26:57 +0900 Subject: [PATCH 3291/8282] test: remove empty lines --- tests/system/HTTP/URITest.php | 39 ++++++++++++----------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index a72576879615..0a5f90f8b8e8 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -658,8 +658,7 @@ public function defaultResolutions() public function testResolveRelativeURI($rel, $expected) { $base = 'http://a/b/c/d'; - - $uri = new URI($base); + $uri = new URI($base); $new = $uri->resolveRelativeURI($rel); @@ -674,8 +673,7 @@ public function testResolveRelativeURI($rel, $expected) */ public function testResolveRelativeURIHTTPS($rel, $expected) { - $base = 'https://a/b/c/d'; - + $base = 'https://a/b/c/d'; $expected = str_replace('http:', 'https:', $expected); $uri = new URI($base); @@ -688,8 +686,7 @@ public function testResolveRelativeURIHTTPS($rel, $expected) public function testResolveRelativeURIWithNoBase() { $base = 'http://a'; - - $uri = new URI($base); + $uri = new URI($base); $new = $uri->resolveRelativeURI('x'); @@ -699,8 +696,7 @@ public function testResolveRelativeURIWithNoBase() public function testAddQueryVar() { $base = 'http://example.com/foo'; - - $uri = new URI($base); + $uri = new URI($base); $uri->addQuery('bar', 'baz'); @@ -712,8 +708,7 @@ public function testAddQueryVar() */ public function testSetQueryDecode() { - $base = 'http://example.com/foo'; - + $base = 'http://example.com/foo'; $uri = new URI($base); $encoded = urlencode('you+alice+to+the+little'); @@ -727,8 +722,7 @@ public function testSetQueryDecode() public function testAddQueryVarRespectsExistingQueryVars() { $base = 'http://example.com/foo?bar=baz'; - - $uri = new URI($base); + $uri = new URI($base); $uri->addQuery('baz', 'foz'); @@ -738,8 +732,7 @@ public function testAddQueryVarRespectsExistingQueryVars() public function testStripQueryVars() { $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz'; - - $uri = new URI($base); + $uri = new URI($base); $uri->stripQuery('bar', 'baz'); @@ -749,8 +742,7 @@ public function testStripQueryVars() public function testKeepQueryVars() { $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz'; - - $uri = new URI($base); + $uri = new URI($base); $uri->keepQuery('bar', 'baz'); @@ -769,8 +761,7 @@ public function testEmptyQueryVars() public function testGetQueryExcept() { $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz'; - - $uri = new URI($base); + $uri = new URI($base); $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']])); } @@ -778,8 +769,7 @@ public function testGetQueryExcept() public function testGetQueryOnly() { $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz'; - - $uri = new URI($base); + $uri = new URI($base); $this->assertSame('bar=baz', $uri->getQuery(['only' => ['bar']])); $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar'])); @@ -788,8 +778,7 @@ public function testGetQueryOnly() public function testGetQueryWithStrings() { $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz'; - - $uri = new URI($base); + $uri = new URI($base); $this->assertSame('bar=baz', $uri->getQuery(['only' => 'bar'])); } @@ -862,10 +851,8 @@ public function testSetBadSegment() public function testSetBadSegmentSilent() { - $base = 'http://example.com/foo/bar/baz'; - - $uri = new URI($base); - + $base = 'http://example.com/foo/bar/baz'; + $uri = new URI($base); $segments = $uri->getSegments(); $uri->setSilent()->setSegment(6, 'banana'); From 1950d23e5bd2517c8a6a703702908b4a6f166ce7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:28:04 +0900 Subject: [PATCH 3292/8282] test: add empty lines --- tests/system/HTTP/URITest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 0a5f90f8b8e8..5406add500ff 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -755,6 +755,7 @@ public function testEmptyQueryVars() $uri = new URI($base); $uri->setQuery('foo=&bar=baz&baz=foz'); + $this->assertSame('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri); } @@ -843,6 +844,7 @@ public function testSetSegmentFallback() public function testSetBadSegment() { $this->expectException(HTTPException::class); + $base = 'http://example.com/foo/bar/baz'; $uri = new URI($base); @@ -854,6 +856,7 @@ public function testSetBadSegmentSilent() $base = 'http://example.com/foo/bar/baz'; $uri = new URI($base); $segments = $uri->getSegments(); + $uri->setSilent()->setSegment(6, 'banana'); $this->assertSame($segments, $uri->getSegments()); From 7c8c7036e495e21dd986c4e505f7a4ca5bdfd4ae Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:29:35 +0900 Subject: [PATCH 3293/8282] test: move lines --- tests/system/HTTP/URITest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 5406add500ff..884488f777aa 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -752,8 +752,8 @@ public function testKeepQueryVars() public function testEmptyQueryVars() { $base = 'http://example.com/foo'; + $uri = new URI($base); - $uri = new URI($base); $uri->setQuery('foo=&bar=baz&baz=foz'); $this->assertSame('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri); @@ -806,8 +806,8 @@ public function testNoExtraSlashes() public function testSetSegment() { $base = 'http://example.com/foo/bar/baz'; + $uri = new URI($base); - $uri = new URI($base); $uri->setSegment(2, 'banana'); $this->assertSame('foo/banana/baz', $uri->getPath()); @@ -846,8 +846,8 @@ public function testSetBadSegment() $this->expectException(HTTPException::class); $base = 'http://example.com/foo/bar/baz'; + $uri = new URI($base); - $uri = new URI($base); $uri->setSegment(6, 'banana'); } From 36e13cad4bbb70c5fd8d76dbc01a9f09e19029e5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 13:33:14 +0900 Subject: [PATCH 3294/8282] test: add tests --- tests/system/HTTP/URITest.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 884488f777aa..a83cb81a78c7 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -138,6 +138,32 @@ public function testSimpleUri() $this->assertSame($url, (string) $uri); } + public function testSimpleUriWithPath() + { + $url = 'http://example.com/one/two'; + $uri = new URI($url); + + $this->assertSame($url, (string) $uri); + + $url = 'http://example.com/one/two/'; + $uri = new URI($url); + + $this->assertSame($url, (string) $uri); + } + + public function testSimpleUriWithPathDoubleSlashes() + { + $url = 'http://example.com/one/two//'; + $uri = new URI($url); + + $this->assertSame('http://example.com/one/two/', (string) $uri); + + $url = 'http://example.com//one/two/'; + $uri = new URI($url); + + $this->assertSame('http://example.com/one/two/', (string) $uri); + } + public function testEmptyUri() { $url = ''; @@ -979,6 +1005,7 @@ public function testEmptyURIPath() $url = 'http://example.com/'; $uri = new URI($url); + $this->assertSame('/', $uri->getPath()); $this->assertSame([], $uri->getSegments()); $this->assertSame(0, $uri->getTotalSegments()); } From e14da58a465540557dd695f833cff7bd6ce4f3df Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 17:16:33 +0900 Subject: [PATCH 3295/8282] test: add assertions --- tests/system/HTTP/URITest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index a83cb81a78c7..2d4c0797f6bf 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -131,11 +131,13 @@ public function testSimpleUri() $uri = new URI($url); $this->assertSame($url, (string) $uri); + $this->assertSame('', $uri->getPath()); $url = 'http://example.com/'; $uri = new URI($url); $this->assertSame($url, (string) $uri); + $this->assertSame('/', $uri->getPath()); } public function testSimpleUriWithPath() @@ -144,11 +146,13 @@ public function testSimpleUriWithPath() $uri = new URI($url); $this->assertSame($url, (string) $uri); + $this->assertSame('/one/two', $uri->getPath()); $url = 'http://example.com/one/two/'; $uri = new URI($url); $this->assertSame($url, (string) $uri); + $this->assertSame('/one/two/', $uri->getPath()); } public function testSimpleUriWithPathDoubleSlashes() @@ -157,11 +161,13 @@ public function testSimpleUriWithPathDoubleSlashes() $uri = new URI($url); $this->assertSame('http://example.com/one/two/', (string) $uri); + $this->assertSame('/one/two/', $uri->getPath()); $url = 'http://example.com//one/two/'; $uri = new URI($url); $this->assertSame('http://example.com/one/two/', (string) $uri); + $this->assertSame('/one/two/', $uri->getPath()); } public function testEmptyUri() From 301176cc9f1a2e6c1cb94f4441f8ec4a1d43887a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 13:27:15 +0900 Subject: [PATCH 3296/8282] test: use dataProvider --- tests/system/HTTP/URITest.php | 161 ++++++++++++++++++++++++++-------- 1 file changed, 124 insertions(+), 37 deletions(-) diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 2d4c0797f6bf..c9d6bb97f5d9 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -125,49 +125,66 @@ public function testCanCastAsString() $this->assertSame($expected, (string) $uri); } - public function testSimpleUri() - { - $url = 'http://example.com'; - $uri = new URI($url); - - $this->assertSame($url, (string) $uri); - $this->assertSame('', $uri->getPath()); - - $url = 'http://example.com/'; - $uri = new URI($url); - - $this->assertSame($url, (string) $uri); - $this->assertSame('/', $uri->getPath()); - } - - public function testSimpleUriWithPath() + /** + * @dataProvider provideURLs + */ + public function testSimpleUri(string $url, string $expectedURL, string $expectedPath) { - $url = 'http://example.com/one/two'; - $uri = new URI($url); - - $this->assertSame($url, (string) $uri); - $this->assertSame('/one/two', $uri->getPath()); - - $url = 'http://example.com/one/two/'; $uri = new URI($url); - $this->assertSame($url, (string) $uri); - $this->assertSame('/one/two/', $uri->getPath()); + $this->assertSame($expectedURL, (string) $uri); + $this->assertSame($expectedPath, $uri->getPath()); } - public function testSimpleUriWithPathDoubleSlashes() + public function provideURLs(): array { - $url = 'http://example.com/one/two//'; - $uri = new URI($url); - - $this->assertSame('http://example.com/one/two/', (string) $uri); - $this->assertSame('/one/two/', $uri->getPath()); - - $url = 'http://example.com//one/two/'; - $uri = new URI($url); - - $this->assertSame('http://example.com/one/two/', (string) $uri); - $this->assertSame('/one/two/', $uri->getPath()); + return [ + '' => [ + 'http://example.com', // url + 'http://example.com', // expectedURL + '', // expectedPath + ], + '/' => [ + 'http://example.com/', + 'http://example.com/', + '/', + ], + '/one/two' => [ + 'http://example.com/one/two', + 'http://example.com/one/two', + '/one/two', + ], + '/one/two/' => [ + 'http://example.com/one/two/', + 'http://example.com/one/two/', + '/one/two/', + ], + '/one/two//' => [ + 'http://example.com/one/two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '//one/two//' => [ + 'http://example.com//one/two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '//one//two//' => [ + 'http://example.com//one//two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '///one/two' => [ + 'http://example.com///one/two', // url + 'http://example.com/one/two', // expectedURL + '/one/two', // expectedPath + ], + '/one/two///' => [ + 'http://example.com/one/two///', + 'http://example.com/one/two/', + '/one/two/', + ], + ]; } public function testEmptyUri() @@ -344,6 +361,76 @@ public function testSetPathSetsValue() $this->assertSame($expected, (string) $uri); } + /** + * @dataProvider providePaths + */ + public function testSetPath(string $path, string $expectedURL, string $expectedPath) + { + $url = 'http://example.com/'; + $uri = new URI($url); + + $uri->setPath($path); + + $this->assertSame($expectedURL, (string) $uri); + $this->assertSame($expectedPath, $uri->getPath()); + } + + public function providePaths(): array + { + return [ + '' => [ + '', // path + 'http://example.com', // expectedURL + '', // expectedPath + ], + '/' => [ + '/', + 'http://example.com/', + '/', + ], + '/one/two' => [ + '/one/two', + 'http://example.com/one/two', + '/one/two', + ], + '//one/two' => [ + '//one/two', + 'http://example.com/one/two', + '/one/two', + ], + '/one/two/' => [ + '/one/two/', + 'http://example.com/one/two/', + '/one/two/', + ], + '/one/two//' => [ + '/one/two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '//one/two//' => [ + '//one/two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '//one//two//' => [ + '//one//two//', + 'http://example.com/one/two/', + '/one/two/', + ], + '///one/two' => [ + '///one/two', + 'http://example.com/one/two', + '/one/two', + ], + '/one/two///' => [ + '/one/two///', // path + 'http://example.com/one/two/', // expectedURL + '/one/two/', // expectedPath + ], + ]; + } + public function invalidPaths() { return [ From b663775b32a84f602d83cdce6d35409b31c07923 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 Feb 2023 10:16:55 +0900 Subject: [PATCH 3297/8282] docs: add note for URI Segments --- user_guide_src/source/libraries/uri.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index 43e77e0626e2..aa0605cf269e 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -204,7 +204,13 @@ to an on-page anchor. Media URI's can make use of them in various other ways. URI Segments ============ -Each section of the path between the slashes is a single segment. The URI class provides a simple way to determine +Each section of the path between the slashes is a single segment. + +.. note:: URI Segments mean only the URI path part relative to the baseURL. If + your baseURL contains sub folders, the values will be different from the + current URI path. + +The URI class provides a simple way to determine what the values of the segments are. The segments start at 1 being the furthest left of the path. .. literalinclude:: uri/023.php From 3c485311c47fcffd38a250b5146c89b6bcb24c7e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 17:54:32 +0900 Subject: [PATCH 3298/8282] docs: improve description --- user_guide_src/source/libraries/uri.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index aa0605cf269e..f253c767f86b 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -206,9 +206,9 @@ URI Segments Each section of the path between the slashes is a single segment. -.. note:: URI Segments mean only the URI path part relative to the baseURL. If - your baseURL contains sub folders, the values will be different from the - current URI path. +.. note:: In the case of your site URI, URI Segments mean only the URI path part + relative to the baseURL. If your baseURL contains sub folders, the values + will be different from the current URI path. The URI class provides a simple way to determine what the values of the segments are. The segments start at 1 being the furthest left of the path. From 64cd54687ac27b345327e23af237dbbcb5786149 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 19:02:51 +0900 Subject: [PATCH 3299/8282] docs: fix section title marks --- user_guide_src/source/incoming/restful.rst | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst index 8fbefe0e1973..9240ac8b476d 100644 --- a/user_guide_src/source/incoming/restful.rst +++ b/user_guide_src/source/incoming/restful.rst @@ -1,5 +1,6 @@ +######################### RESTful Resource Handling -####################################################### +######################### .. contents:: :local: @@ -22,8 +23,9 @@ most "RESTful" your application would be considered. CodeIgniter makes it easy to create RESTful APIs for your resources, with its resource routes and `ResourceController`. +*************** Resource Routes -============================================================ +*************** You can quickly create a handful of RESTful routes for a single resource with the ``resource()`` method. This creates the five most common routes needed for full CRUD of a resource: create a new resource, update an existing one, @@ -43,7 +45,7 @@ generate update and delete methods that work with HTML forms: .. literalinclude:: restful/002.php Change the Controller Used --------------------------- +========================== You can specify the controller that should be used by passing in the ``controller`` option with the name of the controller that should be used: @@ -51,7 +53,7 @@ the controller that should be used: .. literalinclude:: restful/003.php Change the Placeholder Used ---------------------------- +=========================== By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing in the ``placeholder`` option with the new string to use: @@ -59,7 +61,7 @@ in the ``placeholder`` option with the new string to use: .. literalinclude:: restful/004.php Limit the Routes Made ---------------------- +===================== You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should be created. Only routes that match one of these methods will be created. The rest will be ignored: @@ -72,8 +74,9 @@ Otherwise you can remove unused routes with the ``except`` option. This should a Valid methods are: ``index``, ``show``, ``create``, ``update``, ``new``, ``edit`` and ``delete``. +****************** ResourceController -============================================================ +****************** The ``ResourceController`` provides a convenient starting point for your RESTful API, with methods that correspond to the resource routes above. @@ -87,8 +90,9 @@ The routing for this would be: .. literalinclude:: restful/008.php +**************** Presenter Routes -============================================================ +**************** You can quickly create a presentation controller which aligns with a resource controller, using the ``presenter()`` method. This @@ -111,7 +115,7 @@ controller. You need to distinguish them, for instance: The second parameter accepts an array of options that can be used to modify the routes that are generated. Change the Controller Used --------------------------- +========================== You can specify the controller that should be used by passing in the ``controller`` option with the name of the controller that should be used: @@ -119,7 +123,7 @@ the controller that should be used: .. literalinclude:: restful/011.php Change the Placeholder Used ---------------------------- +=========================== By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing in the ``placeholder`` option with the new string to use: @@ -127,7 +131,7 @@ in the ``placeholder`` option with the new string to use: .. literalinclude:: restful/012.php Limit the Routes Made ---------------------- +===================== You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should be created. Only routes that match one of these methods will be created. The rest will be ignored: @@ -140,8 +144,9 @@ Otherwise you can remove unused routes with the ``except`` option. This should a Valid methods are: ``index``, ``show``, ``new``, ``create``, ``edit``, ``update``, ``remove`` and ``delete``. +***************** ResourcePresenter -============================================================ +***************** The ``ResourcePresenter`` provides a convenient starting point for presenting views of your resource, and processing data from forms in those views, @@ -156,8 +161,9 @@ The routing for this would be: .. literalinclude:: restful/016.php +******************************* Presenter/Controller Comparison -============================================================= +******************************* This table presents a comparison of the default routes created by `resource()` and `presenter()` with their corresponding Controller functions. From 7cc02e824669c8adaaa7225f63e84623f861b3d7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 15:43:08 +0900 Subject: [PATCH 3300/8282] docs: add PHPDoc --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index d370e34ca22e..85e43e4c2a1b 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -122,7 +122,7 @@ class CodeIgniter /** * Cache expiration time * - * @var int + * @var int seconds */ protected static $cacheTTL = 0; From 2e80f8364c26310e105f31d1fb0add9656e52bcd Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 15:44:20 +0900 Subject: [PATCH 3301/8282] refactor: use config() instead of new keyword --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 85e43e4c2a1b..544fcb2b813e 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -351,7 +351,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon // Check for a cached page. Execution will stop // if the page has been cached. - $cacheConfig = new Cache(); + $cacheConfig = config(Cache::class); $response = $this->displayCache($cacheConfig); if ($response instanceof ResponseInterface) { if ($returnResponse) { From a17a2a09c8a1fd835c87848fa065b9577e716e7c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 15:45:31 +0900 Subject: [PATCH 3302/8282] test: change to something more realistic A CodeIgniter instance handle one request. Use page caching in the run() method, instead of forcing to call cachePage(). Do not register invalid routes with query string. --- tests/system/CodeIgniterTest.php | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 4c6ec5ce8689..f5c1b3e8cfc5 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -761,7 +761,7 @@ public function testPageCacheWithCacheQueryString( CITestStreamFilter::addErrorFilter(); // Create cache config with cacheQueryString value from the dataProvider - $cacheConfig = new Cache(); + $cacheConfig = config(Cache::class); $cacheConfig->cacheQueryString = $cacheQueryStringValue; // Clear cache before starting the test @@ -773,15 +773,16 @@ public function testPageCacheWithCacheQueryString( // Generate request to each URL from the testing array foreach ($testingUrls as $testingUrl) { + $this->resetServices(); $_SERVER['REQUEST_URI'] = '/' . $testingUrl; - $routes = Services::routes(true); - $routes->add($testingUrl, static function () { - // Don't cache the page in the run() function because CodeIgniter - // class will create default $cacheConfig and overwrite settings - // from the dataProvider - CodeIgniter::cache(0); + $this->codeigniter = new MockCodeIgniter(new App()); + + $routes = Services::routes(true); + $routePath = explode('?', $testingUrl)[0]; + $string = 'This is a test page, to check cache configuration'; + $routes->add($routePath, static function () use ($string) { + CodeIgniter::cache(60); $response = Services::response(); - $string = 'This is a test page, to check cache configuration'; return $response->setBody($string); }); @@ -792,9 +793,15 @@ public function testPageCacheWithCacheQueryString( // Cache the page output using default caching function and $cacheConfig // with value from the data provider + ob_start(); $this->codeigniter->run(); - // Cache the page using our own $cacheConfig confugration - $this->codeigniter->cachePage($cacheConfig); + $output = ob_get_clean(); + + $this->assertSame($string, $output); + + if (count(ob_list_handlers()) > 1) { + ob_end_clean(); + } } // Calculate how much cached items exist in the cache after the test requests From 08493fb33f7b9ed01c917b6de4538762a9c77bf4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 15:50:53 +0900 Subject: [PATCH 3303/8282] docs: fix PHPDoc types --- system/CodeIgniter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 544fcb2b813e..2ad67b50e4a6 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -734,7 +734,7 @@ public static function cache(int $time) * Caches the full response from the current request. Used for * full-page caching for very high performance. * - * @return mixed + * @return bool */ public function cachePage(Cache $config) { @@ -920,7 +920,7 @@ protected function createController() * 2. PHP CLI: accessed by CLI via php public/index.php, arguments become URI segments, * sent to Controllers via Routes, output varies * - * @param mixed $class + * @param Controller $class * * @return false|ResponseInterface|string|void */ From 1dfa4fefc65b67319bff33f6eecb2f7ae2841788 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 08:48:46 +0900 Subject: [PATCH 3304/8282] refactor: use config() in display404errors() --- system/CodeIgniter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 2ad67b50e4a6..32db30f90591 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -965,7 +965,7 @@ protected function display404errors(PageNotFoundException $e) unset($override); - $cacheConfig = new Cache(); + $cacheConfig = config(Cache::class); $this->gatherOutput($cacheConfig, $returned); if ($this->returnResponse) { return $this->response; From 797b51ee8d2effe2ba23d524d0c38478dc80ad2a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:07:49 +0900 Subject: [PATCH 3305/8282] refactor: replace `Cache-control` with `Cache-Control` --- system/HTTP/DownloadResponse.php | 5 ++--- system/HTTP/ResponseTrait.php | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php index 899bec8583c6..d5824da1cabc 100644 --- a/system/HTTP/DownloadResponse.php +++ b/system/HTTP/DownloadResponse.php @@ -227,9 +227,8 @@ public function setContentType(string $mime, string $charset = 'UTF-8') */ public function noCache(): self { - $this->removeHeader('Cache-control'); - - $this->setHeader('Cache-control', ['private', 'no-transform', 'no-store', 'must-revalidate']); + $this->removeHeader('Cache-Control'); + $this->setHeader('Cache-Control', ['private', 'no-transform', 'no-store', 'must-revalidate']); return $this; } diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index 0ad3239e3cbd..dd490e90145d 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -345,8 +345,8 @@ protected function formatBody($body, string $format) */ public function noCache() { - $this->removeHeader('Cache-control'); - $this->setHeader('Cache-control', ['no-store', 'max-age=0', 'no-cache']); + $this->removeHeader('Cache-Control'); + $this->setHeader('Cache-Control', ['no-store', 'max-age=0', 'no-cache']); return $this; } @@ -399,7 +399,7 @@ public function setCache(array $options = []) unset($options['last-modified']); } - $this->setHeader('Cache-control', $options); + $this->setHeader('Cache-Control', $options); return $this; } From e90d56f5d7541e106adf0d1006feea12cebbc5ea Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:08:25 +0900 Subject: [PATCH 3306/8282] docs: replace `Content-type` with `Content-Type` --- user_guide_src/source/concepts/http/002.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/http/002.php b/user_guide_src/source/concepts/http/002.php index 9a15a6d42d5e..20b58ca5f0b7 100644 --- a/user_guide_src/source/concepts/http/002.php +++ b/user_guide_src/source/concepts/http/002.php @@ -6,7 +6,7 @@ $response->setStatusCode(Response::HTTP_OK); $response->setBody($output); -$response->setHeader('Content-type', 'text/html'); +$response->setHeader('Content-Type', 'text/html'); $response->noCache(); // Sends the output to the browser From b3405c6ae9e343c9e088900e1e7eebdd297a33d6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:13:40 +0900 Subject: [PATCH 3307/8282] docs: add section title marks --- user_guide_src/source/incoming/request.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst index c68045d6aad2..3fb8079f7382 100644 --- a/user_guide_src/source/incoming/request.rst +++ b/user_guide_src/source/incoming/request.rst @@ -13,6 +13,7 @@ from the Request class to add specific functionality. In practice, you will need See the documentation for the :doc:`IncomingRequest Class ` and :doc:`CURLRequest Class ` for more usage details. +*************** Class Reference *************** From e68245147bd74e7c5b43a527c0adbf86d29a8a11 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:15:40 +0900 Subject: [PATCH 3308/8282] docs: use relative paths --- user_guide_src/source/incoming/request.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst index 3fb8079f7382..26b08425591a 100644 --- a/user_guide_src/source/incoming/request.rst +++ b/user_guide_src/source/incoming/request.rst @@ -10,8 +10,8 @@ This class provides the common functionality they both need, but both cases have custom classes that extend from the Request class to add specific functionality. In practice, you will need to use these classes. -See the documentation for the :doc:`IncomingRequest Class ` and -:doc:`CURLRequest Class ` for more usage details. +See the documentation for the :doc:`IncomingRequest Class <./incomingrequest>` and +:doc:`CURLRequest Class <../libraries/curlrequest>` for more usage details. *************** Class Reference @@ -96,7 +96,7 @@ Class Reference :rtype: mixed This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()`` methods from the - :doc:`IncomingRequest Class `, only it fetches server data (``$_SERVER``): + :doc:`IncomingRequest Class <./incomingrequest>`, only it fetches server data (``$_SERVER``): .. literalinclude:: request/004.php @@ -114,7 +114,7 @@ Class Reference :rtype: mixed This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()`` methods from the - :doc:`IncomingRequest Class `, only it fetches env data (``$_ENV``): + :doc:`IncomingRequest Class <./incomingrequest>`, only it fetches env data (``$_ENV``): .. literalinclude:: request/006.php From 983b0dadc3452411c64c1a1e8cc707ac94dc641e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:16:03 +0900 Subject: [PATCH 3309/8282] docs: decorate text --- user_guide_src/source/incoming/request.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst index 26b08425591a..d15da89ec14e 100644 --- a/user_guide_src/source/incoming/request.rst +++ b/user_guide_src/source/incoming/request.rst @@ -24,11 +24,11 @@ Class Reference .. php:method:: getIPAddress() :returns: The user's IP Address, if it can be detected. If the IP address - is not a valid IP address, then will return 0.0.0.0. + is not a valid IP address, then will return ``0.0.0.0``. :rtype: string Returns the IP address for the current user. If the IP address is not valid, the method - will return '0.0.0.0': + will return ``0.0.0.0``: .. literalinclude:: request/001.php @@ -43,7 +43,7 @@ Class Reference .. important:: This method is deprecated. It will be removed in future releases. :param string $ip: IP address - :param string $which: IP protocol ('ipv4' or 'ipv6') + :param string $which: IP protocol (``ipv4`` or ``ipv6``) :returns: true if the address is valid, false if not :rtype: bool @@ -54,7 +54,7 @@ Class Reference .. literalinclude:: request/002.php - Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify + Accepts an optional second string parameter of ``ipv4`` or ``ipv6`` to specify an IP format. The default checks for both formats. .. php:method:: getMethod([$upper = false]) From fa4a0486ad1acf0786355c0d92ae9541769f368d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 13:22:11 +0900 Subject: [PATCH 3310/8282] test: update assertions --- tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php | 4 ++-- tests/system/HTTP/CURLRequestTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php index f3540379dd6c..ad64e66af506 100644 --- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php +++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php @@ -759,14 +759,14 @@ public function testSendContinuedWithManyHeaders() Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/ Content-Type: application/xml; charset=utf-8 Transfer-Encoding: chunked\x0d\x0a\x0d\x0aUpdate success! config"; - $request->setOutput($output); + $response = $request->get('answer'); $this->assertSame('Update success! config', $response->getBody()); $responseHeaderKeys = [ - 'Cache-control', + 'Cache-Control', 'Content-Type', 'Server', 'Connection', diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 555bd4146d58..74e6f38e9325 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -742,14 +742,14 @@ public function testSendContinuedWithManyHeaders() Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/ Content-Type: application/xml; charset=utf-8 Transfer-Encoding: chunked\x0d\x0a\x0d\x0aUpdate success! config"; - $request->setOutput($output); + $response = $request->get('answer'); $this->assertSame('Update success! config', $response->getBody()); $responseHeaderKeys = [ - 'Cache-control', + 'Cache-Control', 'Content-Type', 'Server', 'Connection', From 7410504f9e370f4c3d42394b49b685ab915830dc Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 17:27:11 +0900 Subject: [PATCH 3311/8282] docs: fix conflict --- user_guide_src/source/incoming/filters.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst index b6082522cf6e..6c6b525ce838 100644 --- a/user_guide_src/source/incoming/filters.rst +++ b/user_guide_src/source/incoming/filters.rst @@ -161,12 +161,10 @@ a list of URI patterns that filter should apply to: .. literalinclude:: filters/009.php -<<<<<<< HEAD .. _filters-filters-filter-arguments: -======= + Filter Arguments ================ ->>>>>>> upstream/develop Filter Arguments ---------------- From a54ee527e1f4d369ee8c1e2ec65b697cc1bef2a9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 21:51:26 +0900 Subject: [PATCH 3312/8282] test: use ob_get_level() --- tests/system/CodeIgniterTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index f5c1b3e8cfc5..a7f5b9bd1908 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -53,7 +53,7 @@ protected function tearDown(): void { parent::tearDown(); - if (count(ob_list_handlers()) > 1) { + if (ob_get_level() > 1) { ob_end_clean(); } @@ -799,7 +799,7 @@ public function testPageCacheWithCacheQueryString( $this->assertSame($string, $output); - if (count(ob_list_handlers()) > 1) { + if (ob_get_level() > 1) { ob_end_clean(); } } From 4726bd50deb4c7ea8514321896f2996913f83fa2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 15:36:44 +0900 Subject: [PATCH 3313/8282] feat: SQLSRV getFieldData() supports nullable --- system/Database/SQLSRV/Connection.php | 10 +++++++--- tests/system/Database/Live/ForgeTest.php | 15 ++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php index 5d9b208d6010..97f876b2d9d0 100755 --- a/system/Database/SQLSRV/Connection.php +++ b/system/Database/SQLSRV/Connection.php @@ -341,9 +341,11 @@ protected function _enableForeignKeyChecks() */ protected function _fieldData(string $table): array { - $sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, COLUMN_DEFAULT - FROM INFORMATION_SCHEMA.COLUMNS - WHERE TABLE_NAME= ' . $this->escape(($table)); + $sql = 'SELECT + COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, + COLUMN_DEFAULT, IS_NULLABLE + FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_NAME= ' . $this->escape(($table)); if (($query = $this->query($sql)) === false) { throw new DatabaseException(lang('Database.failGetFieldData')); @@ -362,6 +364,8 @@ protected function _fieldData(string $table): array $retVal[$i]->max_length = $query[$i]->CHARACTER_MAXIMUM_LENGTH > 0 ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION; + + $retVal[$i]->nullable = $query[$i]->IS_NULLABLE !== 'NO'; } return $retVal; diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index d859bc93833c..44fe174fdf1e 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -848,6 +848,7 @@ public function testAddFields() 'name' => [ 'type' => 'VARCHAR', 'constraint' => 255, + 'null' => true, ], 'active' => [ 'type' => 'INTEGER', @@ -889,7 +890,7 @@ public function testAddFields() 'name' => 'name', 'type' => 'varchar', 'max_length' => 255, - 'nullable' => false, + 'nullable' => true, 'default' => null, 'primary_key' => 0, ], @@ -929,7 +930,7 @@ public function testAddFields() 2 => [ 'name' => 'name', 'type' => 'character varying', - 'nullable' => false, + 'nullable' => true, 'default' => null, 'max_length' => '255', ], @@ -965,7 +966,7 @@ public function testAddFields() 'max_length' => null, 'default' => null, 'primary_key' => false, - 'nullable' => false, + 'nullable' => true, ], 3 => [ 'name' => 'active', @@ -983,24 +984,28 @@ public function testAddFields() 'type' => 'int', 'default' => null, 'max_length' => 10, + 'nullable' => false, ], 1 => [ 'name' => 'username', 'type' => 'varchar', 'default' => null, 'max_length' => 255, + 'nullable' => false, ], 2 => [ 'name' => 'name', 'type' => 'varchar', 'default' => null, 'max_length' => 255, + 'nullable' => true, ], 3 => [ 'name' => 'active', 'type' => 'int', 'default' => '((0))', // Why? 'max_length' => 10, + 'nullable' => false, ], ]; } elseif ($this->db->DBDriver === 'OCI8') { @@ -1023,8 +1028,8 @@ public function testAddFields() 'name' => 'name', 'type' => 'VARCHAR2', 'max_length' => '255', - 'default' => '', - 'nullable' => false, + 'default' => null, + 'nullable' => true, ], 3 => [ 'name' => 'active', From a98658ba820f68fa6e070e4e6f57d63b2b415f7e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 17:22:03 +0900 Subject: [PATCH 3314/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + user_guide_src/source/database/metadata.rst | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 24ef1efc1707..6cbf8e80952f 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -61,6 +61,7 @@ Others - **MySQLi:** Added the ``numberNative`` attribute to the Database Config to keep the variable type obtained after SQL Query consistent with the type set in the database. See :ref:`Database Configuration `. +- **SQLSRV:** Field Metadata now includes ``nullable``. See :ref:`db-metadata-getfielddata`. Model ===== diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst index 101d0a605683..607a1025be8b 100644 --- a/user_guide_src/source/database/metadata.rst +++ b/user_guide_src/source/database/metadata.rst @@ -78,6 +78,8 @@ performing an action. Returns a boolean true/false. Usage example: Retrieve Field Metadata ======================= +.. _db-metadata-getfielddata: + $db->getFieldData() ------------------- @@ -104,9 +106,11 @@ database: - type - the type of the column - max_length - maximum length of the column - primary_key - integer ``1`` if the column is a primary key (all integer ``1``, even if there are multiple primary keys), otherwise integer ``0`` (This field is currently only available for MySQL and SQLite3) -- nullable - boolean ``true`` if the column is nullable, otherwise boolean ``false`` (This field is currently not available in SQL Server) +- nullable - boolean ``true`` if the column is nullable, otherwise boolean ``false`` - default - the default value +.. note:: Since v4.4.0, SQLSRV supported ``nullable``. + List the Indexes in a Table =========================== From 4cc9259fbea9e61502da0f0194738aa7248773c1 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Mon, 27 Feb 2023 00:32:01 +0800 Subject: [PATCH 3315/8282] Fix handling of null bytes in `Exceptions::renderBacktrace()` --- system/Debug/Exceptions.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 6dc098d4af10..143d17ed56a3 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -531,9 +531,6 @@ private static function renderBacktrace(array $backtrace): string case is_resource($value): return sprintf('resource (%s)', get_resource_type($value)); - case is_string($value): - return var_export(clean_path($value), true); - default: return var_export($value, true); } From 69ed98db7cf55bb4e118986750f700e3a581a3e0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 Feb 2023 10:43:13 +0900 Subject: [PATCH 3316/8282] refactor: deprecate Autoloader::sanitizeFilename() --- system/Autoloader/Autoloader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index f838451ce6fb..f4251cf06537 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -306,8 +306,6 @@ protected function loadInNamespace(string $class) */ protected function includeFile(string $file) { - $file = $this->sanitizeFilename($file); - if (is_file($file)) { include_once $file; @@ -327,6 +325,8 @@ protected function includeFile(string $file) * and end of filename. * * @return string The sanitized filename + * + * @deprecated No longer used. See https://github.com/codeigniter4/CodeIgniter4/issues/7055 */ public function sanitizeFilename(string $filename): string { From 5ca1a9540e2fb700986afbcc54a5f3bcba60668e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 Feb 2023 10:49:15 +0900 Subject: [PATCH 3317/8282] docs: update user guide --- user_guide_src/source/installation/installing_composer.rst | 7 +++++-- user_guide_src/source/installation/installing_manual.rst | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index ca9eacf28314..1bd6194e2fad 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -44,9 +44,12 @@ The command above will create a **project-root** folder. If you omit the "project-root" argument, the command will create an "appstarter" folder, which can be renamed as appropriate. -.. note:: CodeIgniter autoloader does not allow special characters that are illegal in filenames on certain operating systems. +.. note:: Before v4.4.0, CodeIgniter autoloader did not allow special + characters that are illegal in filenames on certain operating systems. The symbols that can be used are ``/``, ``_``, ``.``, ``:``, ``\`` and space. - So if you install CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter won't work. + So if you installed CodeIgniter under the folder that contains the special + characters like ``(``, ``)``, etc., CodeIgniter didn't work. Since v4.4.0, + this restriction has been removed. .. important:: When you deploy to your production server, don't forget to run the following command:: diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst index 7e592046f3a5..8b55e375de0b 100644 --- a/user_guide_src/source/installation/installing_manual.rst +++ b/user_guide_src/source/installation/installing_manual.rst @@ -22,9 +22,12 @@ Installation Download the `latest version `_, and extract it to become your project root. -.. note:: CodeIgniter autoloader does not allow special characters that are illegal in filenames on certain operating systems. +.. note:: Before v4.4.0, CodeIgniter autoloader did not allow special + characters that are illegal in filenames on certain operating systems. The symbols that can be used are ``/``, ``_``, ``.``, ``:``, ``\`` and space. - So if you install CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter won't work. + So if you installed CodeIgniter under the folder that contains the special + characters like ``(``, ``)``, etc., CodeIgniter didn't work. Since v4.4.0, + this restriction has been removed. Initial Configuration ===================== From dab1ae67542910764b91a2beac0f9279524ad5fb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 Feb 2023 10:52:06 +0900 Subject: [PATCH 3318/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 19663e6b524d..5f902d226f85 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -94,11 +94,18 @@ Changes - **Config:** The deprecated Cookie items in **app/Config/App.php** has been removed. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. +- **Autoloader:** Before v4.4.0, CodeIgniter autoloader did not allow special + characters that are illegal in filenames on certain operating systems. + The symbols that can be used are ``/``, ``_``, ``.``, ``:``, ``\`` and space. + So if you installed CodeIgniter under the folder that contains the special + characters like ``(``, ``)``, etc., CodeIgniter didn't work. Since v4.4.0, + this restriction has been removed. Deprecations ************ - **Entity:** ``Entity::setAttributes()`` is deprecated. Use ``Entity::injectRawData()`` instead. +- **Autoloader:** ``Autoloader::sanitizeFilename()`` is deprecated. Bugs Fixed ********** From 788d346d4a9492edbf08a925722861eff7405c91 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Mon, 27 Feb 2023 00:56:26 +0800 Subject: [PATCH 3319/8282] fix: incorrect metadata querying of Redis cache --- system/Cache/Handlers/RedisHandler.php | 3 +-- tests/system/Cache/Handlers/AbstractHandlerTest.php | 2 +- tests/system/Cache/Handlers/RedisHandlerTest.php | 10 ++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php index 8b3af5856319..6874a86c8f2c 100644 --- a/system/Cache/Handlers/RedisHandler.php +++ b/system/Cache/Handlers/RedisHandler.php @@ -233,12 +233,11 @@ public function getCacheInfo() */ public function getMetaData(string $key) { - $key = static::validateKey($key, $this->prefix); $value = $this->get($key); if ($value !== null) { $time = Time::now()->getTimestamp(); - $ttl = $this->redis->ttl($key); + $ttl = $this->redis->ttl(static::validateKey($key, $this->prefix)); return [ 'expire' => $ttl > 0 ? $time + $ttl : null, diff --git a/tests/system/Cache/Handlers/AbstractHandlerTest.php b/tests/system/Cache/Handlers/AbstractHandlerTest.php index 75e45218e215..e426e02eb3c5 100644 --- a/tests/system/Cache/Handlers/AbstractHandlerTest.php +++ b/tests/system/Cache/Handlers/AbstractHandlerTest.php @@ -19,7 +19,7 @@ */ abstract class AbstractHandlerTest extends CIUnitTestCase { - protected $handler; + protected BaseHandler $handler; protected static $key1 = 'key1'; protected static $key2 = 'key2'; protected static $key3 = 'key3'; diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php index a31561336873..83a30a0de362 100644 --- a/tests/system/Cache/Handlers/RedisHandlerTest.php +++ b/tests/system/Cache/Handlers/RedisHandlerTest.php @@ -198,6 +198,16 @@ public function testGetCacheInfo() $this->assertIsArray($this->handler->getCacheInfo()); } + public function testGetMetadataNotNull(): void + { + $this->handler->save(self::$key1, 'value'); + + $metadata = $this->handler->getMetaData(self::$key1); + + $this->assertNotNull($metadata); + $this->assertIsArray($metadata); + } + public function testIsSupported() { $this->assertTrue($this->handler->isSupported()); From 1336c08f37a1ddf9efa6af805ff3285832823437 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 28 Feb 2023 11:40:08 +0900 Subject: [PATCH 3320/8282] docs: add note for CSP and Debug Toolbar --- user_guide_src/source/outgoing/response.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index c3c10bc8d40d..0fcd5d45d7d5 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -140,6 +140,13 @@ visit the following sites: Turning CSP On -------------- +.. important:: The :ref:`Debug Toolbar ` may use Kint, which + outputs inline scripts. Therefore, when CSP is turned on, CSP nonce is + automatically output for the Debug Toolbar. However, if you are not using + CSP nonce, this will change the CSP header to something you do not intend, + and it will behave differently than in production; if you want to verify CSP + behavior, turn off the Debug Toolbar. + By default, support for this is off. To enable support in your application, edit the ``CSPEnabled`` value in **app/Config/App.php**: From 22807e013bfb3a7d9f1d7f26d86bab1f6553a175 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 15:56:52 +0000 Subject: [PATCH 3321/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.18...0.15.19) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f8c44b8730f7..13587f68d032 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.18", + "rector/rector": "0.15.19", "vimeo/psalm": "^5.0" }, "suggest": { From da9045c7850fbf84df824ae7a779c635cd4f2fbe Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 28 Feb 2023 22:58:18 +0700 Subject: [PATCH 3322/8282] enable RemoveAlwaysTrueIfConditionRector --- rector.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rector.php b/rector.php index a0a8bcd9fcae..797387ba4aba 100644 --- a/rector.php +++ b/rector.php @@ -29,7 +29,6 @@ use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; -use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector; use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector; use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector; use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector; @@ -115,10 +114,6 @@ GetMockBuilderGetMockToCreateMockRector::class => [ __DIR__ . '/tests/system/Email/EmailTest.php', ], - - // temporary skip as remove on variable check from @param doc - // @see https://github.com/rectorphp/rector-src/pull/3402 - RemoveAlwaysTrueIfConditionRector::class, ]); // auto import fully qualified class names From 98c4c0d0488885298a26f0875122e4b75f53fbdf Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 28 Feb 2023 23:08:25 +0700 Subject: [PATCH 3323/8282] skip fixture --- rector.php | 1 + 1 file changed, 1 insertion(+) diff --git a/rector.php b/rector.php index 797387ba4aba..d79d47cb3fee 100644 --- a/rector.php +++ b/rector.php @@ -78,6 +78,7 @@ __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php', __DIR__ . '/system/ThirdParty', __DIR__ . '/tests/system/Config/fixtures', + __DIR__ . '/tests/system/Filters/fixtures', __DIR__ . '/tests/_support', JsonThrowOnErrorRector::class, StringifyStrNeedlesRector::class, From f1f24074664951cb4c80a0f66e06bb3cc946c541 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Mar 2023 15:07:49 +0900 Subject: [PATCH 3324/8282] fix: add missing TLS 1.3 support --- system/Email/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Email/Email.php b/system/Email/Email.php index 488a5ee76f04..0136e7db1db6 100644 --- a/system/Email/Email.php +++ b/system/Email/Email.php @@ -1883,7 +1883,7 @@ protected function SMTPConnect() $crypto = stream_socket_enable_crypto( $this->SMTPConnect, true, - STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT + STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT ); if ($crypto !== true) { From ba868855d37a96820171c1bfb10f9c83061838a4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Mar 2023 15:09:50 +0900 Subject: [PATCH 3325/8282] style: break long line --- system/Email/Email.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/Email/Email.php b/system/Email/Email.php index 0136e7db1db6..fe68ff2deda9 100644 --- a/system/Email/Email.php +++ b/system/Email/Email.php @@ -1883,7 +1883,10 @@ protected function SMTPConnect() $crypto = stream_socket_enable_crypto( $this->SMTPConnect, true, - STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT + STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT + | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT + | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT + | STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT ); if ($crypto !== true) { From 9c70a642d8c8355634a6169433c9dbed703ad8d4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Mar 2023 15:20:28 +0900 Subject: [PATCH 3326/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.3.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 6be500a3a589..6c796f8373e1 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -9,6 +9,11 @@ Release Date: Unreleased :local: :depth: 3 +SECURITY +******** + +- **Email:** Added missing TLS 1.3 support. + BREAKING ******** From a69ee43d2eb20289cecb352bcbe2ac45ea2e5d6a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 1 Mar 2023 15:27:31 +0900 Subject: [PATCH 3327/8282] chore: update Kint to 5.0.4 --- admin/framework/composer.json | 2 +- composer.json | 2 +- system/ThirdParty/Kint/resources/compiled/solarized-dark.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 2f3022a92b2b..905e123cd89a 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -13,7 +13,7 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.3", + "kint-php/kint": "^5.0.4", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", "friendsofphp/php-cs-fixer": "3.13.0", diff --git a/composer.json b/composer.json index 13587f68d032..313dd11df23f 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.3", + "kint-php/kint": "^5.0.4", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", "friendsofphp/php-cs-fixer": "3.13.0", diff --git a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css index 1d3c28b0b80c..4ab5e287c54a 100644 --- a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css +++ b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css @@ -1 +1 @@ -.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}input.kint-note-input{width:100%}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd} +.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd} From ddc44af397865217b72e00dc7e9eef26c6614bed Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 1 Mar 2023 21:31:22 +0700 Subject: [PATCH 3328/8282] Fix @param null $arguments on FilterInterface --- system/Filters/FilterInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php index 32a18de74682..8055d11e7949 100644 --- a/system/Filters/FilterInterface.php +++ b/system/Filters/FilterInterface.php @@ -29,7 +29,7 @@ interface FilterInterface * sent back to the client, allowing for error pages, * redirects, etc. * - * @param null $arguments + * @param array|null $arguments * * @return mixed */ @@ -41,7 +41,7 @@ public function before(RequestInterface $request, $arguments = null); * to stop execution of other after filters, short of * throwing an Exception or Error. * - * @param null $arguments + * @param array|null $arguments * * @return mixed */ From a6df5faf68206ec2be0a8b963af794c000c3f46a Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 2 Mar 2023 05:32:56 +0700 Subject: [PATCH 3329/8282] Fix @param null on RequestTrait --- system/HTTP/RequestTrait.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 5dc0359b3488..1a326071dbe9 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -191,8 +191,8 @@ private function getClientIP(string $header): ?string * Fetch an item from the $_SERVER array. * * @param array|string|null $index Index for item to be fetched from $_SERVER - * @param int|null $filter A filter name to be applied - * @param null $flags + * @param int|string|null $filter A filter name to be applied + * @param array|int|null $flags * * @return mixed */ @@ -204,9 +204,9 @@ public function getServer($index = null, $filter = null, $flags = null) /** * Fetch an item from the $_ENV array. * - * @param null $index Index for item to be fetched from $_ENV - * @param null $filter A filter name to be applied - * @param null $flags + * @param string|null $index Index for item to be fetched from $_ENV + * @param int|string|null $filter A filter name to be applied + * @param array|int|null $flags * * @return mixed */ From f65409b33ae74bad3c06f619b7b96296335836e7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 Feb 2023 10:21:40 +0900 Subject: [PATCH 3330/8282] feat: add setValidLocales() --- system/HTTP/IncomingRequest.php | 12 ++++++++++++ tests/system/HTTP/IncomingRequestTest.php | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 008a865bcdcd..8012df3eb8e3 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -548,6 +548,18 @@ public function setLocale(string $locale) return $this; } + /** + * Set the valid locales. + * + * @return $this + */ + public function setValidLocales(array $locales) + { + $this->validLocales = $locales; + + return $this; + } + /** * Gets the current locale, with a fallback to the default * locale if none is set. diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index f6994f722ce9..2b61850ec579 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -205,6 +205,21 @@ public function testSetBadLocale() $this->assertSame('es', $request->getLocale()); } + public function testSetValidLocales() + { + $config = new App(); + $config->supportedLocales = ['en', 'es']; + $config->defaultLocale = 'es'; + $config->baseURL = 'http://example.com/'; + + $request = new IncomingRequest($config, new URI(), null, new UserAgent()); + + $request->setValidLocales(['ja']); + $request->setLocale('ja'); + + $this->assertSame('ja', $request->getLocale()); + } + /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774 */ From 3b3a5e8f5ed61bde026267bf605df7ffc8c74f76 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Mar 2023 11:43:13 +0900 Subject: [PATCH 3331/8282] docs: add docs --- user_guide_src/source/outgoing/localization.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 2cff7700b091..86769f009f80 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -54,6 +54,9 @@ will be used to set the locale. Should you ever need to set the locale directly you may use ``IncomingRequest::setLocale(string $locale)``. +Since v4.4.0, ``IncomingRequest::setValidLocales()`` has been added to set +(and reset) valid locales that are set from ``Config\App::$supportedLocales`` setting. + Content Negotiation ------------------- From 561e2497035c8a0b93a71bb720aed0cc494b9004 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 Mar 2023 11:43:26 +0900 Subject: [PATCH 3332/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 5f902d226f85..1781eaaff0d8 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -85,6 +85,7 @@ Others ``product/15`` where ``15`` is an arbitrary number. See :ref:`controller-default-method-fallback` for details. - **Filters:** Now you can use Filter Arguments with :ref:`$filters property `. +- **Request:** Added ``IncomingRequest::setValidLocales()`` method to set valid locales. Message Changes *************** From 0ead60be3ec798a671e5d63d770054119db35f48 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 2 Mar 2023 12:30:15 +0700 Subject: [PATCH 3333/8282] use array|string|null on index, and int|null for filter --- system/HTTP/RequestTrait.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 1a326071dbe9..2392ecbc4a79 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -191,7 +191,7 @@ private function getClientIP(string $header): ?string * Fetch an item from the $_SERVER array. * * @param array|string|null $index Index for item to be fetched from $_SERVER - * @param int|string|null $filter A filter name to be applied + * @param int|null $filter A filter name to be applied * @param array|int|null $flags * * @return mixed @@ -204,9 +204,9 @@ public function getServer($index = null, $filter = null, $flags = null) /** * Fetch an item from the $_ENV array. * - * @param string|null $index Index for item to be fetched from $_ENV - * @param int|string|null $filter A filter name to be applied - * @param array|int|null $flags + * @param array|string|null $index Index for item to be fetched from $_ENV + * @param int|null $filter A filter name to be applied + * @param array|int|null $flags * * @return mixed */ From a64f99bd821ed07a9175881c1f624d4d7524b0ea Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 1 Mar 2023 21:45:39 +0700 Subject: [PATCH 3334/8282] Fix @param null on RequestInterface --- system/HTTP/RequestInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php index fd2cdfbbc949..cd30101eb9d2 100644 --- a/system/HTTP/RequestInterface.php +++ b/system/HTTP/RequestInterface.php @@ -40,8 +40,8 @@ public function isValidIP(string $ip, ?string $which = null): bool; * Fetch an item from the $_SERVER array. * Supplied by RequestTrait. * - * @param string $index Index for item to be fetched from $_SERVER - * @param null $filter A filter name to be applied + * @param string $index Index for item to be fetched from $_SERVER + * @param int|null $filter A filter name to be applied * * @return mixed */ From a6f146c96ad2159b1ae277ecab0b8c05a6a54b04 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 1 Mar 2023 21:50:37 +0700 Subject: [PATCH 3335/8282] allow int at @param filter --- system/HTTP/RequestInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php index cd30101eb9d2..155ca69bafd7 100644 --- a/system/HTTP/RequestInterface.php +++ b/system/HTTP/RequestInterface.php @@ -40,8 +40,8 @@ public function isValidIP(string $ip, ?string $which = null): bool; * Fetch an item from the $_SERVER array. * Supplied by RequestTrait. * - * @param string $index Index for item to be fetched from $_SERVER - * @param int|null $filter A filter name to be applied + * @param string $index Index for item to be fetched from $_SERVER + * @param int|string|null $filter A filter name to be applied * * @return mixed */ From 4b48e4e6657752ff78d763edfea960001c794025 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 2 Mar 2023 12:23:58 +0700 Subject: [PATCH 3336/8282] use array|string|null on index, and int|null for filter --- system/HTTP/RequestInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php index 155ca69bafd7..367c494928b8 100644 --- a/system/HTTP/RequestInterface.php +++ b/system/HTTP/RequestInterface.php @@ -40,8 +40,8 @@ public function isValidIP(string $ip, ?string $which = null): bool; * Fetch an item from the $_SERVER array. * Supplied by RequestTrait. * - * @param string $index Index for item to be fetched from $_SERVER - * @param int|string|null $filter A filter name to be applied + * @param array|string|null $index Index for item to be fetched from $_SERVER + * @param int|null $filter A filter name to be applied * * @return mixed */ From 2cbbda730b2946606db265ae95554d35902d2a9a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 4 Mar 2023 21:14:47 +0900 Subject: [PATCH 3337/8282] docs: add warning --- user_guide_src/source/helpers/text_helper.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst index cb745b24c8b0..17c2358d330f 100755 --- a/user_guide_src/source/helpers/text_helper.rst +++ b/user_guide_src/source/helpers/text_helper.rst @@ -30,6 +30,10 @@ The following functions are available: Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes. + .. warning:: Except for type **crypto**, no cryptographically secure + strings are generated. Therefore, it must not be used for cryptographic + purposes or purposes that requires return values to be unguessable. + The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available: From 5df7def45f18444c3d15e20062ca99b32e58075c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 Mar 2023 14:49:16 +0900 Subject: [PATCH 3338/8282] chore: remove php-cs-fixer Use coding-standard's dependency. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 313dd11df23f..df93360432ad 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,6 @@ "kint-php/kint": "^5.0.4", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", - "friendsofphp/php-cs-fixer": "3.13.0", "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", "nexusphp/tachycardia": "^1.0", From 4f4a11092360ee9dfd027bebc9f19c5332ec92ce Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 Mar 2023 15:23:15 +0900 Subject: [PATCH 3339/8282] fix: use random_int() in random_string('numeric') --- system/Helpers/text_helper.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php index 51b2c7dbafa7..38b0a6bbde4b 100755 --- a/system/Helpers/text_helper.php +++ b/system/Helpers/text_helper.php @@ -543,7 +543,6 @@ function random_string(string $type = 'alnum', int $len = 8): string { switch ($type) { case 'alnum': - case 'numeric': case 'nozero': case 'alpha': switch ($type) { @@ -555,10 +554,6 @@ function random_string(string $type = 'alnum', int $len = 8): string $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; break; - case 'numeric': - $pool = '0123456789'; - break; - case 'nozero': $pool = '123456789'; break; @@ -566,6 +561,12 @@ function random_string(string $type = 'alnum', int $len = 8): string return substr(str_shuffle(str_repeat($pool, (int) ceil($len / strlen($pool)))), 0, $len); + case 'numeric': + $max = 10 ** $len - 1; + $rand = random_int(0, $max); + + return sprintf('%0' . $len . 'd', $rand); + case 'md5': return md5(uniqid((string) mt_rand(), true)); From 9ea7ce3e23cab573e854376e4db1a75e0ff83477 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 Mar 2023 15:25:16 +0900 Subject: [PATCH 3340/8282] docs: update docs --- user_guide_src/source/changelogs/v4.3.3.rst | 1 + user_guide_src/source/helpers/text_helper.rst | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 6c796f8373e1..2cd881203e1a 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -13,6 +13,7 @@ SECURITY ******** - **Email:** Added missing TLS 1.3 support. +- **Text Helper:** The :php:func:`random_string()` type **numeric** is now cryptographically secure. BREAKING ******** diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst index 17c2358d330f..9dc2346135aa 100755 --- a/user_guide_src/source/helpers/text_helper.rst +++ b/user_guide_src/source/helpers/text_helper.rst @@ -30,7 +30,7 @@ The following functions are available: Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes. - .. warning:: Except for type **crypto**, no cryptographically secure + .. warning:: Except for type **numeric** and **crypto**, no cryptographically secure strings are generated. Therefore, it must not be used for cryptographic purposes or purposes that requires return values to be unguessable. @@ -49,6 +49,9 @@ The following functions are available: .. note:: When you use **crypto**, you must set an even number to the second parameter. Since v4.2.2, if you set an odd number, ``InvalidArgumentException`` will be thrown. + .. note:: Since v4.3.3, **numeric** uses ``random_int()``. In the previous + versions, it used ``str_shuffle()`` that is not cryptographically secure. + Usage example: .. literalinclude:: text_helper/002.php From 63d165e83c8ca8c73800a0e2134664cff9c6e39c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:56:47 +0000 Subject: [PATCH 3341/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.19...0.15.21) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df93360432ad..beb77d7dc7b5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.19", + "rector/rector": "0.15.21", "vimeo/psalm": "^5.0" }, "suggest": { From 2a7f2f73ed91f92f5b022773bb69cc0534537d12 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 09:10:30 +0900 Subject: [PATCH 3342/8282] fix: use first exception in exceptionHandler() --- system/Debug/Exceptions.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 143d17ed56a3..531e95fd9808 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -119,6 +119,11 @@ public function exceptionHandler(Throwable $exception) [$statusCode, $exitCode] = $this->determineCodes($exception); + // Get the first exception. + while ($prevException = $exception->getPrevious()) { + $exception = $prevException; + } + if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) { log_message('critical', "{message}\nin {exFile} on line {exLine}.\n{trace}", [ 'message' => $exception->getMessage(), From fc1870bac30b7e8f4b20f1cd41f1179247bdce91 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 10:15:16 +0900 Subject: [PATCH 3343/8282] docs: add note for addColumn() and NULL --- user_guide_src/source/dbmgmt/forge.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index e55867cc287b..bfb3bca9aea1 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -254,6 +254,9 @@ The ``addColumn()`` method is used to modify an existing table. It accepts the same field array as :ref:`Creating Tables `, and can be used to add additional fields. +.. note:: Unlike when creating a table, if ``null`` is not specified, the column + will be ``NULL``, not ``NOT NULL``. + .. literalinclude:: forge/022.php If you are using MySQL or CUBIRD, then you can take advantage of their From dfa98974562e26bb28ae1d2f01fac8b76685e0b8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:18:55 +0900 Subject: [PATCH 3344/8282] docs: fix section title marks --- user_guide_src/source/libraries/validation.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 7e1731de5f82..8bcd92644825 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -1,5 +1,6 @@ .. _validation: +########## Validation ########## @@ -10,6 +11,7 @@ helps minimize the amount of code you'll write. :local: :depth: 2 +******** Overview ******** @@ -42,6 +44,7 @@ messages, various control structures are usually placed within the form HTML. Form validation, while simple to create, is generally very messy and tedious to implement. +************************ Form Validation Tutorial ************************ @@ -197,6 +200,7 @@ Then add validation rules in the controller (**Form.php**): If you submit the form you should see the success page or the form with error messages. +********************* Config for Validation ********************* @@ -238,6 +242,7 @@ If you want to use traditional rules, you need to change the rule classes in **a .. literalinclude:: validation/003.php +******************* Loading the Library ******************* @@ -251,6 +256,7 @@ for including multiple Rulesets, and collections of rules that can be easily reu .. note:: You may never need to use this method, as both the :doc:`Controller ` and the :doc:`Model ` provide methods to make validation even easier. +************************ Setting Validation Rules ************************ @@ -311,6 +317,7 @@ data to be validated: is not HTML form post (``Content-Type: multipart/form-data``), or gets data from :ref:`$request->getVar() `. +*********************** Working with Validation *********************** @@ -426,6 +433,7 @@ So it will ignore the row in the database that has ``id=4`` when it verifies the This can also be used to create more dynamic rules at runtime, as long as you take care that any dynamic keys passed in don't conflict with your form data. +******************* Working With Errors ******************* @@ -532,6 +540,7 @@ When specifying a field with a wildcard, all errors matching the mask will be ch .. _validation-customizing-error-display: +************************* Customizing Error Display ************************* @@ -580,6 +589,7 @@ right after the name of the field the error should belong to:: showError('username', 'my_single') ?> +********************* Creating Custom Rules ********************* @@ -654,6 +664,7 @@ Or you can use the following parameters: .. literalinclude:: validation/041.php +*************** Available Rules *************** From e61a39fda76f979a42463a3354bc984a019d0500 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:19:41 +0900 Subject: [PATCH 3345/8282] docs: replace With with with in title --- user_guide_src/source/libraries/validation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 8bcd92644825..9e2feb643cc5 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -434,7 +434,7 @@ This can also be used to create more dynamic rules at runtime, as long as you ta keys passed in don't conflict with your form data. ******************* -Working With Errors +Working with Errors ******************* The Validation library provides several methods to help you set error messages, provide From ef287b75c6733d558d2fbef5f1f8a69f2b96553e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:25:42 +0900 Subject: [PATCH 3346/8282] docs: make file paths bold For consistency. --- user_guide_src/source/libraries/validation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 9e2feb643cc5..d392b9723980 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -440,7 +440,7 @@ Working with Errors The Validation library provides several methods to help you set error messages, provide custom error messages, and retrieve one or more errors to display. -By default, error messages are derived from language strings in ``system/Language/en/Validation.php``, where +By default, error messages are derived from language strings in **system/Language/en/Validation.php**, where each rule has an entry. .. _validation-custom-errors: @@ -479,7 +479,7 @@ Translation Of Messages And Validation Labels ============================================= To use translated strings from language files, we can simply use the dot syntax. -Let's say we have a file with translations located here: ``app/Languages/en/Rules.php``. +Let's say we have a file with translations located here: **app/Languages/en/Rules.php**. We can simply use the language lines defined in this file, like this: .. literalinclude:: validation/025.php From 85e08c8a4859ddf7001175db6f9d57d7af62fa2e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:26:19 +0900 Subject: [PATCH 3347/8282] docs: fix file paths --- user_guide_src/source/libraries/validation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index d392b9723980..585786343beb 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -571,7 +571,7 @@ error message. This is used with the ``showError()`` method where a field must b Configuration ============= -Once you have your views created, you need to let the Validation library know about them. Open ``Config/Validation.php``. +Once you have your views created, you need to let the Validation library know about them. Open **app/Config/Validation.php**. Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an short alias they can be referenced by. If we were to add our example file from above, it would look something like: @@ -602,7 +602,7 @@ autoloader can find it. These files are called RuleSets. Adding a RuleSet ---------------- -To add a new RuleSet, edit **Config/Validation.php** and +To add a new RuleSet, edit **app/Config/Validation.php** and add the new file to the ``$ruleSets`` array: .. literalinclude:: validation/033.php @@ -618,7 +618,7 @@ a boolean true or false value signifying true if it passed the test or false if .. literalinclude:: validation/034.php -By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used +By default, the system will look within **system/Language/en/Validation.php** for the language strings used within errors. In custom rules, you may provide error messages by accepting a ``&$error`` variable by reference in the second parameter: From a2f2deaa0eb4bc85c4f76b2e565b92fc311ac319 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:51:12 +0900 Subject: [PATCH 3348/8282] docs: make uppercase letters in title lower --- user_guide_src/source/libraries/validation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 585786343beb..28fdc8b85324 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -475,7 +475,7 @@ at least 6 characters." .. note:: When using label-style error messages, if you pass the second parameter to ``setRules()``, it will be overwritten with the value of the first parameter. -Translation Of Messages And Validation Labels +Translation of Messages and Validation Labels ============================================= To use translated strings from language files, we can simply use the dot syntax. From 6f1db3c0f266a9a3646e335098ee5c4ade792905 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 11:54:32 +0900 Subject: [PATCH 3349/8282] docs: add "Redirect and Validation Errors" --- user_guide_src/source/helpers/form_helper.rst | 2 +- .../source/libraries/validation.rst | 19 +++++++++++++++++++ .../source/libraries/validation/042.php | 6 ++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 user_guide_src/source/libraries/validation/042.php diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst index cb60013843cc..6bb94e319840 100644 --- a/user_guide_src/source/helpers/form_helper.rst +++ b/user_guide_src/source/helpers/form_helper.rst @@ -534,7 +534,7 @@ The following functions are available: that are stored in the session. To store the errors in the session, you need to use ``withInput()`` with :php:func:`redirect() `. The returned array is the same as ``Validation::getErrors()``. - See :ref:`Validation ` for details. + See :ref:`Validation ` for details. Example:: diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 28fdc8b85324..fc0b93709e47 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -538,6 +538,25 @@ When specifying a field with a wildcard, all errors matching the mask will be ch .. literalinclude:: validation/029.php +.. _validation-redirect-and-validation-errors: + +Redirect and Validation Errors +============================== + +PHP shares nothing between requests. So when you redirect if a validation fails, +there will be no validation errors in the redirected request because the validation +has run in the previous request. + +In that case, you need to use Form helper function :php:func:`validation_errors()`, +:php:func:`validation_list_errors()` and :php:func:`validation_show_error()`. +These functions check the validation errors that are stored in the session. + +To store the validation errors in the session, you need to use ``withInput()`` +with :php:func:`redirect() `: + +.. literalinclude:: validation/042.php + :lines: 2- + .. _validation-customizing-error-display: ************************* diff --git a/user_guide_src/source/libraries/validation/042.php b/user_guide_src/source/libraries/validation/042.php new file mode 100644 index 000000000000..057364b4fe7a --- /dev/null +++ b/user_guide_src/source/libraries/validation/042.php @@ -0,0 +1,6 @@ +validateData($data, $rules)) { + return redirect()->back()->withInput(); +} From bb7204d0d68d01832cefc4e171a39bdd23c3d39c Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 13:59:34 +0900 Subject: [PATCH 3350/8282] fix: use random_byte() in random_string() alnum,nozero,alpha --- system/Helpers/text_helper.php | 65 +++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php index 38b0a6bbde4b..7b52fa347698 100755 --- a/system/Helpers/text_helper.php +++ b/system/Helpers/text_helper.php @@ -559,7 +559,7 @@ function random_string(string $type = 'alnum', int $len = 8): string break; } - return substr(str_shuffle(str_repeat($pool, (int) ceil($len / strlen($pool)))), 0, $len); + return _from_random($len, $pool); case 'numeric': $max = 10 ** $len - 1; @@ -587,6 +587,69 @@ function random_string(string $type = 'alnum', int $len = 8): string } } +if (! function_exists('_from_random')) { + /** + * The following function was derived from code of Symfony (v6.2.7 - 2023-02-28) + * https://github.com/symfony/symfony/blob/80cac46a31d4561804c17d101591a4f59e6db3a2/src/Symfony/Component/String/ByteString.php#L45 + * Code subject to the MIT license (https://github.com/symfony/symfony/blob/v6.2.7/LICENSE). + * Copyright (c) 2004-present Fabien Potencier + * + * The following method was derived from code of the Hack Standard Library (v4.40 - 2020-05-03) + * https://github.com/hhvm/hsl/blob/80a42c02f036f72a42f0415e80d6b847f4bf62d5/src/random/private.php#L16 + * Code subject to the MIT license (https://github.com/hhvm/hsl/blob/master/LICENSE). + * Copyright (c) 2004-2020, Facebook, Inc. (https://www.facebook.com/) + * + * @internal Outside the framework this should not be used directly. + */ + function _from_random(int $length, string $pool): string + { + if ($length <= 0) { + throw new InvalidArgumentException( + sprintf('A strictly positive length is expected, "%d" given.', $length) + ); + } + + $poolSize = \strlen($pool); + $bits = (int) ceil(log($poolSize, 2.0)); + if ($bits <= 0 || $bits > 56) { + throw new InvalidArgumentException( + 'The length of the alphabet must in the [2^1, 2^56] range.' + ); + } + + $string = ''; + + while ($length > 0) { + $urandomLength = (int) ceil(2 * $length * $bits / 8.0); + $data = random_bytes($urandomLength); + $unpackedData = 0; + $unpackedBits = 0; + + for ($i = 0; $i < $urandomLength && $length > 0; $i++) { + // Unpack 8 bits + $unpackedData = ($unpackedData << 8) | \ord($data[$i]); + $unpackedBits += 8; + + // While we have enough bits to select a character from the alphabet, keep + // consuming the random data + for (; $unpackedBits >= $bits && $length > 0; $unpackedBits -= $bits) { + $index = ($unpackedData & ((1 << $bits) - 1)); + $unpackedData >>= $bits; + // Unfortunately, the alphabet size is not necessarily a power of two. + // Worst case, it is 2^k + 1, which means we need (k+1) bits and we + // have around a 50% chance of missing as k gets larger + if ($index < $poolSize) { + $string .= $pool[$index]; + $length--; + } + } + } + } + + return $string; + } +} + if (! function_exists('increment_string')) { /** * Add's _1 to a string or increment the ending number to allow _2, _3, etc From 73d930e72ce20cb03bb07df310d9edce7067e2d1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 7 Mar 2023 14:08:32 +0900 Subject: [PATCH 3351/8282] docs: update docs --- user_guide_src/source/changelogs/v4.3.3.rst | 3 ++- user_guide_src/source/helpers/text_helper.rst | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 2cd881203e1a..231f27c3aab1 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -13,7 +13,8 @@ SECURITY ******** - **Email:** Added missing TLS 1.3 support. -- **Text Helper:** The :php:func:`random_string()` type **numeric** is now cryptographically secure. +- **Text Helper:** The :php:func:`random_string()` type **alpha**, **alnum**, + **numeric** and **nozero** are now cryptographically secure. BREAKING ******** diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst index 9dc2346135aa..18ee0e7071a9 100755 --- a/user_guide_src/source/helpers/text_helper.rst +++ b/user_guide_src/source/helpers/text_helper.rst @@ -30,7 +30,8 @@ The following functions are available: Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes. - .. warning:: Except for type **numeric** and **crypto**, no cryptographically secure + .. warning:: Except for type **alpha**, **alnum**, **numeric**, **nozero**, + and **crypto**, no cryptographically secure strings are generated. Therefore, it must not be used for cryptographic purposes or purposes that requires return values to be unguessable. @@ -49,8 +50,10 @@ The following functions are available: .. note:: When you use **crypto**, you must set an even number to the second parameter. Since v4.2.2, if you set an odd number, ``InvalidArgumentException`` will be thrown. - .. note:: Since v4.3.3, **numeric** uses ``random_int()``. In the previous - versions, it used ``str_shuffle()`` that is not cryptographically secure. + .. note:: Since v4.3.3, **alpha**, **alnum** and **nozero** use ``random_byte()``, + and **numeric** uses ``random_int()``. + In the previous versions, it used ``str_shuffle()`` that is not + cryptographically secure. Usage example: From 0d5a26f27dcdaa7e7c6f12d38ffe8a1d031c608f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 09:18:04 +0900 Subject: [PATCH 3352/8282] docs: fix out-of-dated description on App namespace --- user_guide_src/source/concepts/autoloader.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 5f30ce43865d..e6553a96054f 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -60,8 +60,9 @@ have a trailing slash. > php spark namespaces -By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers, -libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace. +By default, the application folder is namespace to the ``App`` namespace. You must namespace the controllers, +libraries, or models in the application directory, and they will be found under the ``App`` namespace. + You may change this namespace by editing the **app/Config/Constants.php** file and setting the new namespace value under the ``APP_NAMESPACE`` setting: From 5ecf70dae521ca91a9d7fe7b4d7b740c8ae2db62 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 09:19:02 +0900 Subject: [PATCH 3353/8282] docs: add missing $ --- user_guide_src/source/concepts/autoloader.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index e6553a96054f..3781367ce922 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -47,7 +47,7 @@ Namespaces The recommended method for organizing your classes is to create one or more namespaces for your application's files. This is most important for any business-logic related classes, entity classes, -etc. The ``psr4`` array in the configuration file allows you to map the namespace to the directory +etc. The ``$psr4`` array in the configuration file allows you to map the namespace to the directory those classes can be found in: .. literalinclude:: autoloader/001.php From e7fe68e5549b291b41d6def58fb77e58a2b1ed08 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 09:51:32 +0900 Subject: [PATCH 3354/8282] docs: update sample code --- user_guide_src/source/concepts/autoloader.rst | 1 + .../source/concepts/autoloader/001.php | 18 ++++++++++++++---- .../source/concepts/autoloader/002.php | 2 +- .../source/concepts/autoloader/003.php | 16 +++++++++++++--- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 3781367ce922..06f02fad42af 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -67,6 +67,7 @@ You may change this namespace by editing the **app/Config/Constants.php** file a new namespace value under the ``APP_NAMESPACE`` setting: .. literalinclude:: autoloader/002.php + :lines: 2- You will need to modify any existing files that are referencing the current namespace. diff --git a/user_guide_src/source/concepts/autoloader/001.php b/user_guide_src/source/concepts/autoloader/001.php index 45ae094fbb3f..68eeaddd625f 100644 --- a/user_guide_src/source/concepts/autoloader/001.php +++ b/user_guide_src/source/concepts/autoloader/001.php @@ -1,6 +1,16 @@ APPPATH, - 'CodeIgniter' => SYSTEMPATH, -]; +namespace Config; + +use CodeIgniter\Config\AutoloadConfig; + +class Autoload extends AutoloadConfig +{ + // ... + public $psr4 = [ + APP_NAMESPACE => APPPATH, // For custom app namespace + 'Config' => APPPATH . 'Config', + ]; + + // ... +} diff --git a/user_guide_src/source/concepts/autoloader/002.php b/user_guide_src/source/concepts/autoloader/002.php index bf19e818c668..c2074c7c8d6f 100644 --- a/user_guide_src/source/concepts/autoloader/002.php +++ b/user_guide_src/source/concepts/autoloader/002.php @@ -1,3 +1,3 @@ APPPATH . 'third_party/markdown.php', -]; +namespace Config; + +use CodeIgniter\Config\AutoloadConfig; + +class Autoload extends AutoloadConfig +{ + // ... + public $classmap = [ + 'Markdown' => APPPATH . 'third_party/markdown.php', + ]; + + // ... +} From 4316498bc347deacbb7dda6303f88388645a9046 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 10:04:03 +0900 Subject: [PATCH 3355/8282] docs: remove incorrect description `APPPATH . 'Config'` does not have a trailing back slash. --- user_guide_src/source/concepts/autoloader.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 06f02fad42af..689b8480ce2e 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -53,8 +53,7 @@ those classes can be found in: .. literalinclude:: autoloader/001.php The key of each row is the namespace itself. This does not need a trailing back slash. -The value is the location to the directory the classes can be found in. They should -have a trailing slash. +The value is the location to the directory the classes can be found in. .. note:: You can check the namespace configuration by ``spark namespaces`` command:: From fd95faf76ce7109d621e11597a2aa955840a267b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 17:08:14 +0900 Subject: [PATCH 3356/8282] docs: fix folder name Co-authored-by: Pooya Parsa Dadashi --- user_guide_src/source/concepts/autoloader/003.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader/003.php b/user_guide_src/source/concepts/autoloader/003.php index 48ce48f051f5..9cd0da4e6404 100644 --- a/user_guide_src/source/concepts/autoloader/003.php +++ b/user_guide_src/source/concepts/autoloader/003.php @@ -8,7 +8,7 @@ class Autoload extends AutoloadConfig { // ... public $classmap = [ - 'Markdown' => APPPATH . 'third_party/markdown.php', + 'Markdown' => APPPATH . 'ThirdParty/markdown.php', ]; // ... From 80ea505d28d590fee553602e583ffe10f593da2d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 17:58:34 +0900 Subject: [PATCH 3357/8282] docs: change to enumerate cryptographically insecure types --- user_guide_src/source/helpers/text_helper.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst index 18ee0e7071a9..cb230d10b31d 100755 --- a/user_guide_src/source/helpers/text_helper.rst +++ b/user_guide_src/source/helpers/text_helper.rst @@ -30,10 +30,9 @@ The following functions are available: Generates a random string based on the type and length you specify. Useful for creating passwords or generating random hashes. - .. warning:: Except for type **alpha**, **alnum**, **numeric**, **nozero**, - and **crypto**, no cryptographically secure - strings are generated. Therefore, it must not be used for cryptographic - purposes or purposes that requires return values to be unguessable. + .. warning:: For types: **basic**, **md5**, and **sha1**, generated strings + are not cryptographically secure. Therefore, these types cannot be used + for cryptographic purposes or purposes requiring unguessable return values. The first parameter specifies the type of string, the second parameter specifies the length. The following choices are available: From 9ed490051cbd4fc9fabfec93932d4b4bfc610070 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 Mar 2023 21:00:29 +0900 Subject: [PATCH 3358/8282] docs: replace folder with directory For consistency. --- user_guide_src/source/concepts/autoloader.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index 689b8480ce2e..f6d38c75b293 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -59,7 +59,7 @@ The value is the location to the directory the classes can be found in. > php spark namespaces -By default, the application folder is namespace to the ``App`` namespace. You must namespace the controllers, +By default, the application directory is namespace to the ``App`` namespace. You must namespace the controllers, libraries, or models in the application directory, and they will be found under the ``App`` namespace. You may change this namespace by editing the **app/Config/Constants.php** file and setting the From 54186a97a2fcb41e27524df68b9d83730aa103d8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Mar 2023 10:25:39 +0900 Subject: [PATCH 3359/8282] fix: remove incorrect description We cannot specify negative number as an option value on CLI. --- system/Commands/Database/MigrateRollback.php | 2 +- user_guide_src/source/dbmgmt/migration.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php index 17434da4b56d..c29ce84be443 100644 --- a/system/Commands/Database/MigrateRollback.php +++ b/system/Commands/Database/MigrateRollback.php @@ -57,7 +57,7 @@ class MigrateRollback extends BaseCommand * @var array */ protected $options = [ - '-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3 or "-2" to roll back twice', + '-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3', '-g' => 'Set database group', '-f' => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment', ]; diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index bf43be4b6199..f38cdaea5dd7 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -144,7 +144,7 @@ Rolls back all migrations, taking the database group to a blank slate, effective You can use (rollback) with the following options: - ``-g`` - to choose database group, otherwise default database group will be used. -- ``-b`` - to choose a batch: natural numbers specify the batch, negatives indicate a relative batch +- ``-b`` - to choose a batch: natural numbers specify the batch. - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment refresh From a152ea74fab95b2a26f67ab5ab0ee92141c04366 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 12 Mar 2023 10:27:16 +0900 Subject: [PATCH 3360/8282] docs: add missing period --- user_guide_src/source/dbmgmt/migration.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index f38cdaea5dd7..117cdaacd099 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -124,7 +124,7 @@ You can use (migrate) with the following options: - ``-g`` - to chose database group, otherwise default database group will be used. - ``-n`` - to choose namespace, otherwise (App) namespace will be used. -- ``--all`` - to migrate all namespaces to the latest migration +- ``--all`` - to migrate all namespaces to the latest migration. This example will migrate ``Acme\Blog`` namespace with any new migrations on the test database group:: @@ -145,7 +145,7 @@ You can use (rollback) with the following options: - ``-g`` - to choose database group, otherwise default database group will be used. - ``-b`` - to choose a batch: natural numbers specify the batch. -- ``-f`` - to force a bypass confirmation question, it is only asked in a production environment +- ``-f`` - to force a bypass confirmation question, it is only asked in a production environment. refresh ======= @@ -158,8 +158,8 @@ You can use (refresh) with the following options: - ``-g`` - to choose database group, otherwise default database group will be used. - ``-n`` - to choose namespace, otherwise (App) namespace will be used. -- ``--all`` - to refresh all namespaces -- ``-f`` - to force a bypass confirmation question, it is only asked in a production environment +- ``--all`` - to refresh all namespaces. +- ``-f`` - to force a bypass confirmation question, it is only asked in a production environment. status ====== From df9906c4c20428c32460538a6aa5fe189e0fedaa Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 13 Mar 2023 17:47:16 +0900 Subject: [PATCH 3361/8282] docs: fix title marks --- user_guide_src/source/incoming/methodspoofing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/methodspoofing.rst b/user_guide_src/source/incoming/methodspoofing.rst index f32dcad04769..a17264f0b21c 100644 --- a/user_guide_src/source/incoming/methodspoofing.rst +++ b/user_guide_src/source/incoming/methodspoofing.rst @@ -1,6 +1,6 @@ -==================== +#################### HTTP Method Spoofing -==================== +#################### When working with HTML forms you can only use GET or POST HTTP verbs. In most cases, this is just fine. However, to support REST-ful routing you need to support other, more correct, verbs, like DELETE or PUT. Since the browsers From 266cef168cc3a5db1d5421808e2dc9c659b7cc17 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 13 Mar 2023 17:47:35 +0900 Subject: [PATCH 3362/8282] docs: update HTML tag --- user_guide_src/source/incoming/methodspoofing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/incoming/methodspoofing.rst b/user_guide_src/source/incoming/methodspoofing.rst index a17264f0b21c..e5dad509de99 100644 --- a/user_guide_src/source/incoming/methodspoofing.rst +++ b/user_guide_src/source/incoming/methodspoofing.rst @@ -11,7 +11,7 @@ To spoof the method, a hidden input is added to the form with the name of ``_met that you want the request to be::
        - + This form is converted into a PUT request and is a true PUT request as far as the routing and the IncomingRequest From 67dc40e3eee2dd181ca5d01b987c05c27687bddd Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Mon, 13 Mar 2023 23:44:09 +0800 Subject: [PATCH 3363/8282] docs: replace type `mixed` in `Cookie` class. --- system/Cookie/Cookie.php | 16 ++++++++-------- system/Cookie/CookieInterface.php | 4 ++-- tests/system/Cookie/CookieTest.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 3fc5ea1deddd..3d707b8b2e7f 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -96,7 +96,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * Default attributes for a Cookie object. The keys here are the * lowercase attribute names. Do not camelCase! * - * @var array + * @var array */ private static array $defaults = [ 'prefix' => '', @@ -124,9 +124,9 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * * This method is called from Response::__construct(). * - * @param array|CookieConfig $config + * @param array|CookieConfig $config * - * @return array The old defaults array. Useful for resetting. + * @return array The old defaults array. Useful for resetting. */ public static function setDefaults($config = []) { @@ -195,9 +195,9 @@ public static function fromHeaderString(string $cookie, bool $raw = false) /** * Construct a new Cookie instance. * - * @param string $name The cookie's name - * @param string $value The cookie's value - * @param array $options The cookie's options + * @param string $name The cookie's name + * @param string $value The cookie's value + * @param array $options The cookie's options * * @throws CookieException */ @@ -595,8 +595,8 @@ public function offsetGet($offset) /** * Offset to set. * - * @param string $offset - * @param mixed $value + * @param string $offset + * @param array|bool|float|int|object|string|null $value * * @throws LogicException */ diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php index 0b2b75783c12..71e855454829 100644 --- a/system/Cookie/CookieInterface.php +++ b/system/Cookie/CookieInterface.php @@ -143,7 +143,7 @@ public function isRaw(): bool; * Gets the options that are passable to the `setcookie` variant * available on PHP 7.3+ * - * @return array + * @return array */ public function getOptions(): array; @@ -162,7 +162,7 @@ public function __toString(); /** * Returns the array representation of the Cookie object. * - * @return array + * @return array */ public function toArray(): array; } diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index 3e9ecca3fed5..b04fae1ae1f4 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -168,7 +168,7 @@ public function testExpirationTime(): void /** * @dataProvider invalidExpiresProvider * - * @param mixed $expires + * @param int|object $expires */ public function testInvalidExpires($expires): void { From 6306ca16a8b74e85f3058cad5db441165fa26ffe Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 14 Mar 2023 00:07:12 +0800 Subject: [PATCH 3364/8282] docs: Add the space between field type and value type. --- system/Cookie/Cookie.php | 8 ++++---- system/Cookie/CookieInterface.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 3d707b8b2e7f..4700326e0b8a 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -96,7 +96,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * Default attributes for a Cookie object. The keys here are the * lowercase attribute names. Do not camelCase! * - * @var array + * @var array */ private static array $defaults = [ 'prefix' => '', @@ -124,9 +124,9 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * * This method is called from Response::__construct(). * - * @param array|CookieConfig $config + * @param array|CookieConfig $config * - * @return array The old defaults array. Useful for resetting. + * @return array The old defaults array. Useful for resetting. */ public static function setDefaults($config = []) { @@ -197,7 +197,7 @@ public static function fromHeaderString(string $cookie, bool $raw = false) * * @param string $name The cookie's name * @param string $value The cookie's value - * @param array $options The cookie's options + * @param array $options The cookie's options * * @throws CookieException */ diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php index 71e855454829..8e8cf00ee763 100644 --- a/system/Cookie/CookieInterface.php +++ b/system/Cookie/CookieInterface.php @@ -143,7 +143,7 @@ public function isRaw(): bool; * Gets the options that are passable to the `setcookie` variant * available on PHP 7.3+ * - * @return array + * @return array */ public function getOptions(): array; @@ -162,7 +162,7 @@ public function __toString(); /** * Returns the array representation of the Cookie object. * - * @return array + * @return array */ public function toArray(): array; } From e9e13ae06e9ce2076f9bd3a8f40f3eb338c73f0f Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 14 Mar 2023 00:19:59 +0800 Subject: [PATCH 3365/8282] fix: cs-fix at cookie.php file. --- system/Cookie/Cookie.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 4700326e0b8a..1927f5fa9bc9 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -195,8 +195,8 @@ public static function fromHeaderString(string $cookie, bool $raw = false) /** * Construct a new Cookie instance. * - * @param string $name The cookie's name - * @param string $value The cookie's value + * @param string $name The cookie's name + * @param string $value The cookie's value * @param array $options The cookie's options * * @throws CookieException From 96d81ca4826c729b7c1039d5fc9347ddbeb96fc4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Mar 2023 10:39:08 +0900 Subject: [PATCH 3366/8282] fix: add support protocol-relative links CI3 supports protocol-relative links --- system/Helpers/url_helper.php | 9 ++++++++- tests/system/Helpers/URLHelper/SiteUrlTest.php | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php index 1a064a76175f..8443c7a02980 100644 --- a/system/Helpers/url_helper.php +++ b/system/Helpers/url_helper.php @@ -117,13 +117,20 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul { $uri = _get_uri($relativePath, $config); - return URI::createURIString( + $uriString = URI::createURIString( $scheme ?? $uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment() ); + + // For protocol-relative links + if ($scheme === '') { + $uriString = '//' . $uriString; + } + + return $uriString; } } diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index e05a7093e3da..acc2643b75ab 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -304,7 +304,21 @@ public function configProvider() ]; } - // base_url + public function testSiteURLWithEmptyStringScheme() + { + $this->config->baseURL = 'http://example.com/'; + $this->config->indexPage = 'index.php'; + $this->config->forceGlobalSecureRequests = false; + + $this->assertSame( + '//example.com/index.php/test', + site_url('test', '', $this->config) + ); + $this->assertSame( + '//example.com/img/test.jpg', + base_url('img/test.jpg', '') + ); + } /** * These tests are only really relevant to show that base_url() From 5f6fb6e5fba117f651a74582c051411d46fd70dd Mon Sep 17 00:00:00 2001 From: Angga Ari Wijaya Date: Thu, 9 Mar 2023 14:36:57 +0700 Subject: [PATCH 3367/8282] fix: respondNoContent() returns Kint script in development mode --- system/API/ResponseTrait.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php index 0b357f0a177b..9e8bad775f78 100644 --- a/system/API/ResponseTrait.php +++ b/system/API/ResponseTrait.php @@ -92,8 +92,10 @@ protected function respond($data = null, ?int $status = null, string $message = if ($data === null && $status === null) { $status = 404; $output = null; + $this->format($data); } elseif ($data === null && is_numeric($status)) { $output = null; + $this->format($data); } else { $status = empty($status) ? 200 : $status; $output = $this->format($data); From 8aa470dbd7f58652f3fee378e4df8637877cc41c Mon Sep 17 00:00:00 2001 From: Angga Ari Wijaya Date: Tue, 14 Mar 2023 11:45:17 +0700 Subject: [PATCH 3368/8282] test: check content type for respondNoContent to make sure Debugbar is not included --- tests/system/API/ResponseTraitTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index 0c060691b0b3..653cac115f21 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -331,6 +331,7 @@ public function testNoContent() $this->invoke($controller, 'respondNoContent', ['']); + $this->assertStringStartsWith('application/json', $this->response->getHeaderLine('Content-Type')); $this->assertSame('No Content', $this->response->getReason()); $this->assertSame(204, $this->response->getStatusCode()); } From 1afa9dadac7071cc58c8ae8412d77d9ae0dc8494 Mon Sep 17 00:00:00 2001 From: totoprayogo1916 Date: Tue, 14 Mar 2023 12:00:52 +0700 Subject: [PATCH 3369/8282] doc: change logo (svg) Signed-off-by: totoprayogo1916 --- user_guide_src/source/_static/ci-logo-text.png | Bin 6076 -> 0 bytes user_guide_src/source/_static/ci-logo-text.svg | 1 + user_guide_src/source/_static/ci-logo.png | Bin 10140 -> 0 bytes user_guide_src/source/conf.py | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 user_guide_src/source/_static/ci-logo-text.png create mode 100644 user_guide_src/source/_static/ci-logo-text.svg delete mode 100644 user_guide_src/source/_static/ci-logo.png diff --git a/user_guide_src/source/_static/ci-logo-text.png b/user_guide_src/source/_static/ci-logo-text.png deleted file mode 100644 index fee0d49bed3d52e5b3d2a9f59cb115045cfdc3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6076 zcmd5=fe&H)BQP>>jqu9<zx1LtPgv|wbs4vz1MZ^4=dJCUxS*0gMxs7fLcpa&6t3I2)MOl$cS!F z_%jLmTUBbPYpQ;$|Ng(1rt1~6TcXlPV|^0>UCG1o`*&Z3&R!+d5ARZ*{~o6fzFnW3Q_h$bkA(r>H_5X@}p~dENQB7tm za)moPT6&92A!NqCrEq*_-We{qEQKvQ3)`7TgL%A2mob) zV2HEnj3mPnU8|NUKRyr7!*_@v6Zhs;I?v3_8fMsnUkD;${btt%wJxi=7Y;%&L8NtB z9Z&x`n%4K$E_spVsRu~0V6>hq`)oBo%!wvWO@f*QvtFG?Qj=CPEq3O~p6akR5x z@Z=!YVe7=i%T)D-ke6yyaKLi-rB>9<%p7N;Ygx zxvr1Bt#f^ugzyvi+-c6wC_!-xotjyTi1;+`&_2cQ|KL9OmZ@>!>zeriF@!~v;Q#or zg{k5pT`ymJhm}G%i$~NAwoSoPpOK76w!IJ<`Lcj;fz@`uJh1(*#^y%>FS%1XV}        ov97wu>1Bk3daIWj49X%kKB*o7e%l zmZaLgEGz4J=`ILw=F7*-wt>^?aT<){EzFBz2N)@;m7p%6KN; zKkZKEiT6k$CVouCW-JA~+i8k~krA!EWUj8y}V8HI*LU0^sQ z+MlR)7M&R`z6}F*#<4r0e>O@MvkuY!#4*dDhd!JI1HV8*RJyhJ(ke=|%2PDXo0SC* zfyIK4Vu?KgMUs?kopN$30yo5|ELFtvhZh4W^@17gPhoF-ZF~w2m#n*K46oa}r{#cWHrq{PTS{B>SzA)^ANlp9> zp7C$jW_5#wc5e^vL*aoZgk`n11?1>5f=7WvT+M}qApfgJIBy60d!$I*57CdfSDlgW z8-*8c684DY*4-sq{s1W&|8lMn zSO)z*Mifm*>HmePS%%bIr{NsmFQ78*v)D3pt(c0#e+Of{NNz_u*b4s@_vaMeSM1M+ zgJ4A!kGM>qmv+G|)SN#JGV-0e_yPgL1D&5P{@O2zvAo4me(7_jxSk+%?|XNSN2v>J zp61YPOAR*mZVYCC$M#}yb=A^HTLmHp>B_t?yKGd{!?OTg-`esRZzr#eED6-bZZK*R zC&rz(NC!oRwhClhCWYa>UK z5#{RLa#bhQOlGr!Tnf2juV4-?!}#ZMi+?shnS*h)boA{$-{_4p8JAwmBh(n<#UH}2 ztL7z&d|vy!8pahAhUMq6?~(RR;5JcWzG|SCR4uc3i}T=p5l*+!ou4HIbAX5nY`51> z4CTzKsY@?-uq~eV=UEk2Bkw~bWJ}}j1+x+GHKX|D<)|#tgGbA>ldd#BMgM#Qa?TOy zf^Z&Z8h4VE;yO<1pK?%hUYtX&s1x}|Tvc~0#)^t1QLlOB!MC&?zfv)j&o3r>ebYKe7x~(2-H+@FmI$E*Ppu{!hxPS*L&6!=v%6VGe@W*eb81hmjR~Q zEe)r0$EjSw)QixPP#p+*k9cH`(yTUWTR-X3T#;y&O*a+ z3ZmSW-@PDLJ_f|w{<1Dq-lfGat5%E#+9Th&OGbOalP)ns>Y^5amuXuSnV&o4NNzcv z@H}pX6nx~UKzh0=<3>NJJshgVKf!bcKc%P(Nt7sZ@%xH!)?|y0ian(?0l-chgwGy> z4FDOn+=bRoJUVzM9hF0t@*({pJoyKw`&$xfy*`^gL9$2#O)84T6QU%?-x|N^Z{AN? z3)3*A2^y%(oVeNKof5&*on*xM{5{A!DM$e zNjCjGmX2sbh)vr&+0o56YG-+q=zbDKXf+#bu{j0zqelZKj^!>k?()YdM45TfMzMawXTCWl0DXE)R0FE0TxN2J+}M^r&cnf}EgzslmT`@a#cWXh&crqIdJ2 z$pG2IQO_7FmD!fD>9BnWTC+lQSJRghiJHp1GxzIh2z#hv~8@PI&JRp z8M}3Ms)aT{aic*22RIW9m(lP=M|Ljm3pf?eOBpX~B=v@uA}ebs5JHYigHT>Nk)gRR zyS=$CXujf?aVkBn`hEAt-!J0)6uzv*snF0F56(i#aW5>clC5t)N;V1f3cl*g+|^1#{@Yr4u$KC^-^Wq2_hU@0rjo7emj2xT^91` z`jwXj#f@Kcvvp{%V~kENG0Hs*-vfbUKEvsVXVW49%N@PBMqL=O4Eeh(k%Cd}z2%3O z7~Aghww~%Scxd*6imD^ZzbB!K(7UVs!oJ2jhfth}%bPZDAl`TZ*98w{GEQv{OFdim zD`x(&?g3uSP(XPi0)JC-p14)!HB$fl;NX0KuZr@h<|G{g|B24@vHVJ&YfS3x)RKVD zasqetV?`fst?w+>amY(K@JKJ=EMl47nMT4sr9GG0hMA0x#tIUWwz_4|%L}dYT<+nY zsac*p&{t^n08k0#V}XEKy`teK7zeSLmd;ITU-VQ--aYPL*7OHIOjxm3AuvEN;hXD6 z%8D#%bdnJRZJV)+?-h7=q-fU{^5zo}cze;{V-#VXbM@t5ow1T66JVT$@*C;LE_@Kz zwuEDRSA5~5#Qe2$ zA3f>=Ts0@Z+wmgN`sXC%#YC1?L(0G&z5vja{;ogXDIu$6-RvS#Z)4W)nt%E5Fd(?* zHFxugmRG-$BC;V~qLSdjC`-F4P|@$U9lvpH^1htkYFck`4X2W5{PF0GI?JK~H(j8^ zTlVC(qYVa)0ga*KIVTHL0Dy-@m=Ce<3&8ARQ#{@|ni5p>_?-_86IuFT;(p`fQ3Ur`72xRd}=K8$Q5C9RaRIf1V7@D~W z#%HDVn&|u4%xDjOCYL8CFN9%l0$A%Mxy8U@Vjd(G9P_X4Ll(BA3L*aNi)BqF$IEN)bHs3)`uV}xbH!* z=38?Gx6pj#j2UvPMUNjHpf4)C>C=)`9}nuzNUhHSQz7)aDLzi-AO}L6dQrZ}Zd5=#;sp7Xx4hFi^MJ0Izw};p=!vLgsD15v*0@TJ zh4hiAu`cg-9|^<)Ih_Q+BVO5ZJCR;hsDlHcp1t7$NHZc$EHHV!iQdgoqL0IA+zY!2 zM*zGMZ^1LZkn$Q;z`j--OMzWbje9_spWt(VB=Mg@F|S-)xy+{_-)Txk4Cix&@;hpJ zK_j3G$iAHwFGwDX?!{DhNNiqC*{29AwS_^ekYqxWyDlprsOT{gnpjNL>C zbQ7>0$l}>*Vn>~oqI!fNSs1^hxu;;s)_kI;`QD5DGe$QK4uW6IMBdfk)}iSyN!Zg+ zMH8-*q_~KKlWCRgY4Xr=kGtz^0m5${OQTj$zsj+KVignDs8eLA+@_kt8y*Xi1rq~( z_dGpH_*B4sSk#l;Ax$Z8-sgS=udXz}QY^S5XffRAWI(aZAi_vP`ks%A@WI3}E&#Bi zJsijCAH!Hxa?JaP$DDVAziRX;SzKwA2hUIujZJ-wexD&77e`;rJDyi2lpfR=m3Dg`5YwJ{o2S+}M_t!NC#j%xQQ*f=BeN3K6xNIP;;;{rEOi3aZH{9Ml>KL=|Q6+Yd4RPsY4Y;>QgB*o%z=C08lW2zE)#6TwZ zrNN?(5SRRNvc$x(>3A>r&PQpNhT$3Mk6pnDZwAULZXQ_u4Ku~Akght=P?wa;JRay> zG?MpzG^l3j4)BtQek(^a4v~Q}jaes-l`ESmwibg~8%8Me*@hg$$29(?4Noweq`1z0 zc4MS$*vg_a+B07I122DUw~Oq&LBOfC>Ypdkc$}n!F=A`im9JzERh!`Ep{Gj6DlPSMi=9-OHjMX6f zH4#i)v_vMvnm~ADlbsFM()O9LrKnL8V9)H#decNYM?;VeFB5Nzbr@JZt@zlgzZNzT zA^;;@cT7LhIh7iyS4^bVElP?Mu;Z$i&%CKt+4#52;?%@)8}V(5Th-_de$l{;YO<{O zc9#T>pY!og>E8B~Jj&EEIuHM@NJ3OduOeEL;S-wj6J!v0;@VEPOqADjqMwCBa*;e8 zlXf%FBs}YVOW833&O@BA`VXl0X7^sioTZ$D8Z;OcL~ym{|^*aGg@T{Q^_FUR9++D+9#0MR)Y=#y;2YEX5hwFv=!XDf^UT zB>xQ_sK4sUCcjN5#6U2ngHfhDCJ7Q}HUG{3rPhb~xjd(p19EwmFj|L~+aZoI_NdWQ zKTwacvNg}Pue{UmlOgyl;sVJqL&tDkxbDDUMv$~p>AmB?_tj=Qw_9ghL{C~Zt2gfJw&rwEMdB1cVz*3%^2)bhrVdZo;}|Zld1{{Vdw17tqOeMq9w9>M z!9j1EztVCOM2k*o$!wzfw7Ci=U;Hky35YBIC(NNemeTE03^hFs-i!4&s^SBcNZs}q z)wATo?Q;9VbIwU$+V2gdD|+8#8W diff --git a/user_guide_src/source/_static/ci-logo.png b/user_guide_src/source/_static/ci-logo.png deleted file mode 100644 index 932d94b7c8fe47f8a25e356ca46044662bb98c77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10140 zcmcJ#_dlC&_%^O~D6xW?wfBCbYPD9iMr%_mD5^HKV+65FRS~1nYO5`3MU`4HqlD1b zNR7m9&7cS|9_{D(zFwd2AMpH;E6JJjI*#K!uRG^;-`DF*zh{1niGhcKf`WqSwy}XF z1qG%3#pg77+KW*Wo&WRV?NX@aExk*)ud?wMUjRYI4xtnjjO>43mne!$xhW_lZr(Py zX&qU*`GW3;m`y#5j{PQhfFP-uAbj&u?#r|XmskyNTHK_`dau=&0KaK^RnluTm03E` z{f5%ZH>{zYH!lOj6ouDRGTndH9#owbP9na~u0Af?>WDZy{b)0^OvHy)k`FfLoZnTB zB+}^73njDsza0jE3Hj)Qn}3PiVcpad>0X*ePc}3Dvi4>`0ad5NXAchSk@@`xxBmI8 zC|QI_T$?P}tS~P4>tt}t^xo{x4OiH}mkB>|eJtBwxp1EgV}Kqwce_YVU|QjC5NSny zy+4Fyu~$6EVt->&Lc-zE;2Yr69zS$_Ec?G%w@r;-fLQF88vZ|nhN;19{{|XFnK|R@ zCkXq?=f%K&kM2jB%q}a^27O@lPm{Q0xt-mA^ws#{&HtKe|3a~-KmqTxGanp?3uyjd zi&ai~#qe-}VVX?Hr604-f1S#CB0a_;j51_)nUJ6Q4;=r2JyNQFoQ88{qn@~n+0tsl z|AVti2fUTTbQE8$8Q6YR@%o=_$V1o%spoWB<#Jb!j(z@+dpiDKpdTm^5&K65ZmM6Q z9)d~#68QtX@DPM#)V$yxokIWhqE`aJ6@N}_tYt5(aU#iCv9kX#Uwf243`CZNbJ!W! zB>%O*@o?_@U;SK>wVo_?OY2^YXdU@~EEWk8NL}Zq0bZ5-Gq05Bdo!aln!KvQ~&&5T1ki`uyhkxu)3t~#$Al1i$ z+$-w@Y5YU~w8~yXd-vBV2<#is07vcK6R!iD(8!)fb;!SXq zkf_%!bVm{$T^t==Y5Jib{}>6*es3bzp?t7Wr7bN83!HnX-71{Jkp}SLpukfbV{Z*Lv0k3avK1 zEP2|ot8mbxK)~+z9x3@3O>5AkF==Os&|RMs^|LL^Tf6|5u?Rs1FrtK=3d{}%+AJ^kDua?&2aldclrdOE~ z*}J=C34bQHb7Iw255!Sn0#pv_v2_0%sGjkF9;tiFWkzG33gIr?HwiR{6zFB9&-flh zM$`6Wd*tFAF=v*cBU8$YtzKmbx{cY%jBm7u!;|bj@OvFlBKHWqA?Ho=F@)VkfR{{8 zEVJ$7|BYXlxi7%26QT+jisCXn9)!HpChpv* zkT;!yAFiy@d65rdM~*2Ffi{z&8!<$>J%7!So;fc+e2~eo6Lu)f$vx_S30s3kENbiS zCT7Fje|vgOO2lm)5sd-`l zBbOxyH&Y*2Vs2QO?FFk^t3O_TM#$D48GdklXpK2#L=GPp$LLT2s>Ma?D)`88TbJ)@ zK5Q^!>wk`7lc6O(_~jIvzXDd?chblBs^rYlig)J3R>~;hZ4JYychFvr%uDF_p4YaX z&2(=M*oH2P))hZR6{p^yG^wUX#-5^BxU~B zvCGM^yEaIE+CQE`-KR~FX9E8{7u=&U2CE7|Re={dhlde>2dl4jzP2!#DCH(FyCW;a_l$^RZZSCC#}Fia(Nmish(=9km4Y#n>hs8!`tK)4g-{#|;@uP|(h5n_S^H zFCD6&-tI?0(o8r5+vGERAL}E@AoRfY!Ks&BaV&1birC0<*3mpXwI;P%`xc*ndyD9g z8;p;6io*)m=34Qt3`YZHYRXPA2--kUZ@ZI%%!pj=tDGJx2FQpOgG*`teiT*hagN67 zr%wJz25kRDxlnB#-4J$B*EoF9es7ClXb)rJvhXsORGB#0D4{ z(OsqIK?siHb%B+98la?NlqIPi-XKlff8~UhZq_= zjS%*eaL6E2N5F5hW8(6^a&<^57Z3chTz}7bonDr--(6VoWs@jc_mdLn>pHo4{lk(G z@*~fR_p-45v&$c{#To;Yr+wasx&#X#oaU!pJdVfdh@~0N(`?uw>kIom?+xB%AArtw z4Z-G@!()R^k;HvML+!8I;4WC7^SlCE=k~92QQiMygzp<^il3}IgU4=>*g_uyI+)s+ zbyCvFv_>5E#N{xf#Ll!Jj&ddr2VPOcD##q%RhA2c-5RzMM${|jr%!+?R;(P6YNt(L$8k==o=MiVhOkd@JBOUzgwr9HksZioD0>Ure z3y5a1hn?Tm3)6RDpa~G`Ti-S#K53UK=Ki1w=xF>(x2fQ(gMABoG1ef=rOhZC*~+?- z_h*L^E%xaaXfI2+j$ndtlE*r~F^HTCC=9BxlZ4W^IuNwQj8KoEW1GH&qte@0AyEd| zlNfaN6e@$-mY1N8=cbv4t%{R+j4w@dK-#>^^oW##)oAPA%~D!=fktD~w=tB&)x`>EtA*>Lp<%%Fntm>nqZvaC6g#-rva4FeSSr z6U!`fTSIg6GI$jb+UHbXnMUiFuf^Pf_gpsPKcm1;Y={x%-swTOn8wzMcgURfs|MM4 zPWf8Jbcigpk1L^My497j_Vku`={m>=+~s=QDlhS_yRh-pJy!O_6lCx8?8GARE}Ol7 z9s6h1g*>O}ZaM=?VL>g?A+5xY03MsR>e|rRpf<7%DU`^4_6N#8)MN3YwKv{-H|RME zmdUl^JZ{)cTABTDpROb8@N=<7v-cu2t%~7wnhs`zLAH$hykVi!8)Q$Ew5HDxHPV{! zQxdPzI$~i;H{Y77d*26dr>|Zp?T`xDs0nI$K2(>)Ad5st1Yc*1t6euj?1A*aU7>mX zkz*33i8)(QY1B}fctEr4m>{59Z7MzH@j`llNnNy1cc&q-E!Rnd#_UA#P$OGwgo_&D zwh!K=3gW3>oT3^xF?EW2WOJSA?(=x1N*S=i!x-kx&_jd$XN<7(d47mj`NjjJa|Wp6 zo|dShT>~ny^JS2O;-A)|JJWm4*Hb)L<}BBXInTVf?1`RF*`-Hrx&~cQ^ODjiM7cM9 z_U|%e&`M1;LL3%d{BFw{=&PibhsRaS?-L6v?0O>P=fiTpd{+3*UtWo3Rj8ZVTEH0S zrv1Hg+5=J&UUW_$4=kC5!vzy0nLI2=;S}&v@opAEZdv!X%bkZN<))%$XSzG8Mu(HLUP2@Di z#NMyL`48KNt3BVY+L$y~ep%@KvmCjSzvVR99Q~44dB~ zinnL^SyI2X&D-^q^pa}JLsfF;*`SAn(VIWM&gyh(S29`+68SnSiM2{hv@Tx;PWLICes;6iB2NN~4O{xpz?Zk-;DTcRBYT|4~kqa&`G8bE}I%<6<(wjGD{GDq+a zSQc@^^E&$~*EI~mO40lIDDD}dm!COBi65`mFkr}}0qiQL{Rd40Vn^e(9r%^`W7`F- z&_7~zB;_93_fG)7iCoXT#j=JozPB1>X%10leq?knu!uqwk#S#O%n6%FNF4YMfbJPuQgg=q%r9IgdHwW>Zy9L8 zb-tTPOtL`q8|4p3))D+&EJO0{Z|?!P947zE5-h(c${s6m5mMS!YavWS#7lF{Z@Il3 z!R;C$%to4;hJ^VK^!1b4+ur#;%nudn;JocVg^Mg8)ZXR(#1?Cf0}c=RJPq0wn0p}a zG;Oxq3)IQU&HXR+A!R5Lo-!aG7w@#HyvhUkd2hz{K7y%i(a}><9cFX0UF{W2LED)h zu6YOCwU-@04>?QLIYq$ZRb>VH7PcGek1t2jOzerEg`Fm5zAOgs#gOB=OWy#YVe-O- zT_$^NqHft#!u=(;p)}Z>jISn(YkCC-8br_LDc^Uy5m}F+ean0Ae>FS=XvxBPQ+|3> zi8dH2`&EnN+C5-uI#SWHc8y!~ib=32MyycGEnIyrao7f3akW=EH{sRcl6LcA?!CIH zOgOUgbf=lNc#p0Z{oB10Jxyd2rg*6rYIyHFT8hs_HmJY>}m86zI#8OPJ3jgcoI(q@$#6Z)?zS zx{i<%ankX$XNg>`Q9HS;i^HX;#CJZuYM|v63@#*};5_a@u#6AV0Qyj7g8Cg8vkWM# z6<)vTRyYuiOxzJlFKdtJUvyv}=dZAeGLY{Sj#W_DByt}JeoHOAI-^|@h_je|sd7Zj zN&rGgbfMM+^&J*0-{|VZiy79qt7YoRcy=8>Ym(+|Ov-i(^@Ou9T4>v_KjR+n`c!gD zD1+>l_~>sau-5&_{I9fnFAMNn>mT0!4isF?N+x-b5n9GF7KJ){=aZ+UXPFEHN6)2% zbZ8Zahd?n2=cf(JIBKbwZOje2{P8+Af=ITyB#6*{18hmaE9yBa5&KI%_1#Pov>8(C zno)~Pk4qDJ9pFqo5kXbP-x$xNm1wDP?f9TBtdKou1+tuJfR<(C&=}@69wy#Dqq?() zV{h@tERMFb5(-*Q9}$l>5`f#h-%_1kM)yn?0yoeaMF!$gVK76JXb_yH`7K*kfEbjxpSctJWk1 zsH*=?Ey+IflH+yH)-8O=-yQw$<5D zIJN|SdNoKEDA-jPqQe3R(1sFIraQT(@J*DyPx`B(oe&d*czGx&bXy40;`n;=&|2v; z^+aM3$o_6NUyNVk^t+pszQ@KSOFalT$U=a8Xh__o9h?rsbTPE#jau1lbki{uObx=7 zJ^b=}q~DBA2)w(zX<~P8c6yn}3IT}K=)7GB)VGOLXWj^OgnoL2foThW0%|X@+hd>b zr7~q8o8}UzCuZ!Cl67C&o&vx6fX+<7X1v6VlILa;tKdIt0!$t%z*R$Ha%fW!VV8#e zsKYP(a>g5yK+cmyv8IhC(}|@?>M|^l)ZM#0m;6xhWpp|bKt;aEXtVl8mUY(?Y+N?Y zAR7*2ZXZ>A*8G^Ex+w&3L~ZM*AQG<7=`p?i!94&_O`{@HC%~z3Fh!kddljl0iz)=^ zkqcCVnT12%5!7P?`ho(H+5|uyhl@U+z-r+44+vq!^=~&5J8g7#Wu22!Dd(0{o>Qqm zHspo5NGeE8EnXhiNXHd37?EbgzMd9Bu@h>xFF2px1#1h3l>Ta$V$Z(F>cyJM+OoX+ z6L>OW%n7*-qn`M4iR%WJfs1u0@kv}=!@fMK&skdV%9v{gcC=yTSv}+tRh#wsAS(Fs zY~F7j5I$J(5PKHenbBE0>mq@~I#b&|bRAJ=nvbx%V477A;nOii9(<`HZB<^Jt;j?B z%n%-qVx_6`GNG$}rwr#}brr0dIH2Ku5A&^jH5F&@@MM`7AMX{_4}5ddFWY|fh~a+f z=zUK)BB!8Qh7pI~2>S1_yx5By2A(-T#ol15;~7J+8~}14qfeRzU99N3VYdF%OBL_e z7XOn`xH{joZm#wjZIx{HB{uu-fbJKC>(?Uu%B&RQJK;foTxQVDjoClT34xd^xX1_i zX8y6?X}?&#;zOwmToH?$;;onGedl}LQLXNnTom850Lh4r@Bdg~(KqUcdujDab2Lk{ znTkJxK4tU|XR>F{FC|A^gk=H_E~%c{Gt=dKH!>!15xjW@~fCJX)gk5gfp- zu>G;u2E^18m3jzA=6PAnt?b zwd8|0ny=?W6;Qj~Pnoo~CtAPjoG()8pc$$^)}2($FTMIF2xM;}j27NDNPQcP$>pnqH#=lkqt&IDGh5|LHCLSCFOWswqR4pOUno5hEtO#_UMhu zgfa}4=P_d$pe#Hoq7#ucG?>Mq)x5BcQzPU-JqT30%v2=apRW))lUuPq=drwzIZeui z}~Z@t7*`#V9pwV9tYFoOncTNn3Om^PG6L zSp(N4i_E}IzPyURN}PGKdln*jGTpus%HbI=7n{P$nSqaHU`iL_yRy;&>XRr8`W z@>6_yVL*@<&To@M_zo=dbT259MnbW?6jV|Nd!U#*b6p(j_BkyXp`b2Kam!FhHnY*MTYQiGRT3eJO1n5dmCIW~~$B+PM->GpY zkH!ig$GB7ZY>k^=$BClrYH{z5L@w$MyM2kU3pm#V!>rs&bwYOMI0KVR)`9b^uL;{z zXQyU>J>q@5%DgppI5-ArCseB9kRn49@re5_r7vefpqmxfR@~&2PCo_y@fWG{wch$u zzix<=;P_E+)<}KPqk~j&EjA0ACw&h`Pucq`*FN>fDLZ`m(bEU2`gO(!PZc8hv!SQi z-MV^sf5?O&LX*{x5u!HW`m6KRsB0(Ay4r#(CQ^JkJ>X7EoO|EA)j0gHEnpfrz;AWxR<%6_R{KUJ~h57#-r^ zigBAdh`wevdnAR^=HzLecR8@&s9A2UkPffilv9s7w5h(|v8>Q{=LZ-wy6qnnQyD?NKTumPe;1$`vD0%#Zg*VbC z!=r019%OsEvlr?d(btr_yF>>*aHZ#Q=)S!7EoE$E0rP!uxlqIOYmPEVvtKCIVb!eyux`eGCoVX!B zV;2dIeMGs8VUr^@YzeJNZjnc$)X98kMp+g%OKt1Li? zyXg#`U4g7N@ERJtcX>`LDTEs;-bWm~bBlT9ocq|canRA5_L7<&Ks+#s0|M9==c=%hoec<)x^ zCO=)R@nvWAKRfV>VCnuXL$F!aT{qrGTGOBm83u+pJexgZG{~OgP^!g3=?CW;YFpD3 zG$6H6OklLI6tOY}4~r8Y-jnPd;miEME<;TIv0L%NsedZk4LfKKz@E9}4#OBH}j^@UrKi`~e3@_P55X*!Wekgk|3vd zt8{=EI6TcoimZCp&8KAT*#^_xZ>+o695*QAH5VItjo(O5I^V3!R6!pxVz`s*y#?wI7;nT!i4SC#J)15si7O2HlVQRJ&5COFqwu zC;|(4^({IkD66;&0~a|=U)>pMB9c8?qShfb-Jj=ZY?XkW`fAQkW?RY`ni2>h2Y1*# zOu%x#>@Id6v>KIvqJ@;v;p-ab$VW7Gmx`lhnxIvHC#y~U>VRqox;T&G>S{s{{1j}2 zcc*pnQ7<$$79z<%$Z9iH399e*v@qhC{!d%fiD6}Bz|T+JKAWe_Ln&~}AI4dGv%^98 z=QGtuHj8`R3&+PEjPX*{q#)gzEv=ryn?qv_=9Iqfe)6A`YpcyDxA~mb9_WAPS3deL z4OI-!G358=z#IA*EETw)iOBS8Y0aOEudIU>Z-Z^HU8TKch9fF~cq_S^_=yEXOIQP(~9BVil-7Q;v-;@p?Seg=y^oG1?}#ghpt4uR?c@IX=TPPz-&*_+7xPlQ(@B5ia2;i^w?SGmbv#L1{z=_u zAvea{w5X#Jw`qnIoRg(fJYIH0T_&_;oKvs@o2YQtCcNj?Ot{C=wi!NNY0g9hdwX@b z%|C0>Xk@(k^5vY}-mLvz=CfUgUe9fnjP3Np=BM{6B)x<#J8H>7GYP|Ev6;MQIz=Lb z1!^a!dvSx_ZnMhQ<6YZ6?;K(h1!yJI3=zZqEvah~A|o2-;vXbla>ExER{Hu<_moM~ z8zze2UU~#(q}Rz-C6=}0PnYDxudzm-m)CSd#}gg7@RK8b8t!Zd!lvHLvplf)m~KIc zDYG{jAU|CHggS4=;k0?a5i%K6-?wMlwNDWlShbkJ`>Vt2Q1-+>@5F2#BYjVN=+Ls| zLMwbAzHFh?N;1gj^lQ-0>C=TNwXLC4pO?+G7LheprGaO00bJzvF2nnmb$^rXR~Y+Z z13oSYpt(}$xDEkl+d9O-9=QzPw!-#nnZC(~Rt!3}_mQK^!F{poQwwpZtEkv{jbW8> zVdE@=;9v!LfjA7+f@8NW6((lg-8{gju2bG#sCNp*{@i1LGo3>ZL&X5X4p0^{Ch_`s z6{qGV%nqylUVmahFJzhUnf=2fm=d7ysendP=f4h?7m7EL0+7Am&e5eJO_`eP$j=)? zz<(VpbI?G~#%dOI*+iU#_YyBcysNx;%INtv`uP&`zups3s#?xgzHafu-9t))Pp6Q}y$!F{GYQl9 zx}#r}efAqq`b49QTC)oHOJm;XFel|1 z?yq_!K_%A423(hycZqXSkjgjl0Oi)H4Ii(PC$Xmg*1?LV4LjaGEZ}nhL4GHcsFzu# z)lH&AT+!X+2XZ{q-v44My3`S+^0~`l+|LX-o|!iJvH!sAZ_m&_g#RbQUg0^_t7~v2 VwrJDq7aevKw++n=YV^Q~{|DH5u0H?( diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 7f7aa87e7c59..936eff54be31 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -89,7 +89,7 @@ # The name of an image file (relative to this directory) to place at the top # of the sidebar. -html_logo = '_static/ci-logo-text.png' +html_logo = '_static/ci-logo-text.svg' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 From cc2cf428ef8966374c6b727ecdf341350aff3ce5 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 14 Mar 2023 14:32:08 +0800 Subject: [PATCH 3370/8282] docs:revert the mixed return type of setDefaults function. --- system/Cookie/Cookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 1927f5fa9bc9..79b7d4f4ef0b 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -126,7 +126,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * * @param array|CookieConfig $config * - * @return array The old defaults array. Useful for resetting. + * @return array The old defaults array. Useful for resetting. */ public static function setDefaults($config = []) { From 3fbad734f79529f1c67ae6f9bc020e4cdafeab15 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 14 Mar 2023 14:43:39 +0800 Subject: [PATCH 3371/8282] docs: remove the object type. --- system/Cookie/Cookie.php | 10 +++++----- system/Cookie/CookieInterface.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 79b7d4f4ef0b..2e2dc5a3e3bb 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -96,7 +96,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * Default attributes for a Cookie object. The keys here are the * lowercase attribute names. Do not camelCase! * - * @var array + * @var array */ private static array $defaults = [ 'prefix' => '', @@ -124,7 +124,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface * * This method is called from Response::__construct(). * - * @param array|CookieConfig $config + * @param array|CookieConfig $config * * @return array The old defaults array. Useful for resetting. */ @@ -195,9 +195,9 @@ public static function fromHeaderString(string $cookie, bool $raw = false) /** * Construct a new Cookie instance. * - * @param string $name The cookie's name - * @param string $value The cookie's value - * @param array $options The cookie's options + * @param string $name The cookie's name + * @param string $value The cookie's value + * @param array $options The cookie's options * * @throws CookieException */ diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php index 8e8cf00ee763..82f7b5e1ffba 100644 --- a/system/Cookie/CookieInterface.php +++ b/system/Cookie/CookieInterface.php @@ -143,7 +143,7 @@ public function isRaw(): bool; * Gets the options that are passable to the `setcookie` variant * available on PHP 7.3+ * - * @return array + * @return array */ public function getOptions(): array; From 74fe8646cd6a16d3c06fd918c7130a2e7beec8ee Mon Sep 17 00:00:00 2001 From: totoprayogo1916 Date: Wed, 15 Mar 2023 16:14:41 +0700 Subject: [PATCH 3372/8282] replace `mixed` in `system\HTTP\IncomingRequest.php` --- system/HTTP/IncomingRequest.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 008a865bcdcd..eca5bfdd6421 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -572,7 +572,7 @@ public function getDefaultLocale(): string * * @param array|string|null $index * @param int|null $filter Filter constant - * @param mixed $flags + * @param array|int|null $flags * * @return array|bool|float|int|stdClass|string|null */ @@ -707,7 +707,7 @@ public function getRawInput() * @param int|null $filter Filter Constant * @param array|int|null $flags Option * - * @return mixed + * @return array|bool|int|object|null */ public function getRawInputVar($index = null, ?int $filter = null, $flags = null) { @@ -759,9 +759,9 @@ public function getRawInputVar($index = null, ?int $filter = null, $flags = null * * @param array|string|null $index Index for item to fetch from $_GET. * @param int|null $filter A filter name to apply. - * @param mixed|null $flags + * @param array|int|null $flags * - * @return mixed + * @return array|bool|string|null */ public function getGet($index = null, $filter = null, $flags = null) { @@ -773,9 +773,9 @@ public function getGet($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to fetch from $_POST. * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * - * @return mixed + * @return array|bool|string|null */ public function getPost($index = null, $filter = null, $flags = null) { @@ -787,9 +787,9 @@ public function getPost($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to fetch from $_POST or $_GET * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * - * @return mixed + * @return array|bool|string|null */ public function getPostGet($index = null, $filter = null, $flags = null) { @@ -809,9 +809,9 @@ public function getPostGet($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to be fetched from $_GET or $_POST * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * - * @return mixed + * @return array|bool|string|null */ public function getGetPost($index = null, $filter = null, $flags = null) { @@ -831,9 +831,9 @@ public function getGetPost($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to be fetched from $_COOKIE * @param int|null $filter A filter name to be applied - * @param mixed $flags + * @param array|int|null $flags * - * @return mixed + * @return array|bool|string|null */ public function getCookie($index = null, $filter = null, $flags = null) { From 9b2eadedbc888a61d25f52b916336fb0fb2f4e38 Mon Sep 17 00:00:00 2001 From: totoprayogo1916 Date: Thu, 16 Mar 2023 23:29:32 +0700 Subject: [PATCH 3373/8282] update docs --- .../source/incoming/incomingrequest.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index f54b1f9ff741..bbcc7cdf0125 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -321,7 +321,7 @@ The methods provided by the parent classes that are available are: :param int $flags: Flags to apply. A list of flags can be found `here `__. :returns: ``$_REQUEST`` if no parameters supplied, otherwise the REQUEST value if found, or null if not - :rtype: mixed|null + :rtype: array|bool|float|int|stdClass|string|null The first parameter will contain the name of the REQUEST item you are looking for: @@ -360,7 +360,7 @@ The methods provided by the parent classes that are available are: :param int $flags: Flags to apply. A list of flags can be found `here `__. :returns: ``$_GET`` if no parameters supplied, otherwise the GET value if found, or null if not - :rtype: mixed|null + :rtype: array|bool|string|null This method is identical to ``getVar()``, only it fetches GET data. @@ -372,7 +372,7 @@ The methods provided by the parent classes that are available are: :param int $flags: Flags to apply. A list of flags can be found `here `__. :returns: ``$_POST`` if no parameters supplied, otherwise the POST value if found, or null if not - :rtype: mixed|null + :rtype: array|bool|string|null This method is identical to ``getVar()``, only it fetches POST data. @@ -385,7 +385,7 @@ The methods provided by the parent classes that are available are: `here `__. :returns: ``$_POST`` and ``$_GET`` combined if no parameters specified (prefer POST value on conflict), otherwise looks for POST value, if nothing found looks for GET value, if no value found returns null - :rtype: mixed|null + :rtype: array|bool|string|null This method works pretty much the same way as ``getPost()`` and ``getGet()``, only combined. It will search through both POST and GET streams for data, looking first in POST, and @@ -405,7 +405,7 @@ The methods provided by the parent classes that are available are: `here `__. :returns: ``$_GET`` and ``$_POST`` combined if no parameters specified (prefer GET value on conflict), otherwise looks for GET value, if nothing found looks for POST value, if no value found returns null - :rtype: mixed|null + :rtype: array|bool|string|null This method works pretty much the same way as ``getPost()`` and ``getGet()``, only combined. It will search through both GET and POST streams for data, looking first in GET, and @@ -419,13 +419,13 @@ The methods provided by the parent classes that are available are: .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]]) :noindex: - :param mixed $index: COOKIE name + :param array|string|null $index: COOKIE name :param int $filter: The type of filter to apply. A list of filters can be found `here `__. :param int $flags: Flags to apply. A list of flags can be found `here `__. :returns: ``$_COOKIE`` if no parameters supplied, otherwise the COOKIE value if found or null if not - :rtype: mixed + :rtype: array|bool|string|null This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data: @@ -442,13 +442,13 @@ The methods provided by the parent classes that are available are: .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]]) :noindex: - :param mixed $index: Value name + :param array|string|null $index: Value name :param int $filter: The type of filter to apply. A list of filters can be found `here `__. :param int $flags: Flags to apply. A list of flags can be found `here `__. :returns: ``$_SERVER`` item value if found, null if not - :rtype: mixed + :rtype: array|bool|string|null This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()`` methods, only it fetches getServer data (``$_SERVER``): @@ -465,7 +465,7 @@ The methods provided by the parent classes that are available are: :param int $filter: The type of filter to apply. A list of filters can be found `here `__. :returns: The User Agent string, as found in the SERVER data, or null if not found. - :rtype: mixed + :rtype: CodeIgniter\\HTTP\\UserAgent This method returns the User Agent string from the SERVER data: From 91006d3225b305c845c4d8a2af4e813058c6e2b4 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 17 Mar 2023 02:27:04 +0800 Subject: [PATCH 3374/8282] docs: change the type. --- system/Cookie/Cookie.php | 4 ++-- system/Cookie/CookieInterface.php | 2 +- tests/system/Cookie/CookieTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 2e2dc5a3e3bb..e94d61baee1d 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -595,8 +595,8 @@ public function offsetGet($offset) /** * Offset to set. * - * @param string $offset - * @param array|bool|float|int|object|string|null $value + * @param string $offset + * @param bool|int|string $value * * @throws LogicException */ diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php index 82f7b5e1ffba..5a21d6ad8308 100644 --- a/system/Cookie/CookieInterface.php +++ b/system/Cookie/CookieInterface.php @@ -162,7 +162,7 @@ public function __toString(); /** * Returns the array representation of the Cookie object. * - * @return array + * @return array */ public function toArray(): array; } diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index b04fae1ae1f4..a4d02bf0a189 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -168,7 +168,7 @@ public function testExpirationTime(): void /** * @dataProvider invalidExpiresProvider * - * @param int|object $expires + * @param DateTimeInterface|int|string $expires */ public function testInvalidExpires($expires): void { From 301d0c3f3298a29538a50f2e65b5419e9a027073 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 17 Mar 2023 02:38:41 +0800 Subject: [PATCH 3375/8282] Docs: Add the namespace using. --- tests/system/Cookie/CookieTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index a4d02bf0a189..0b9aea8a0967 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -15,6 +15,7 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Cookie as CookieConfig; use DateTimeImmutable; +use DateTimeInterface; use DateTimeZone; use Generator; use LogicException; From 9e75e205629a4780888bc13167d45216333c89a9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Mar 2023 10:14:37 +0900 Subject: [PATCH 3376/8282] docs: change to bullet points --- user_guide_src/source/changelogs/v4.3.2.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index 939ee780bb29..d0fccca1ea72 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -18,10 +18,10 @@ Behavior Changes base_url() ---------- -Due to a bug, in previous versions :php:func:`base_url()` without argument returned baseURL -without a trailing slash (``/``) like ``http://localhost:8080``. Now it returns -baseURL with a trailing slash. This is the same behavior as ``base_url()`` in -CodeIgniter 3. +- Due to a bug, in previous versions :php:func:`base_url()` without argument + returned baseURL without a trailing slash (``/``) like ``http://localhost:8080``. +- Now it returns baseURL with a trailing slash. This is the same behavior as + ``base_url()`` in CodeIgniter 3. Changes ******* From 1896042d5c56375fbda8fc3e0bb28e0af1728ec9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Mar 2023 10:16:03 +0900 Subject: [PATCH 3377/8282] docs: fix typo --- user_guide_src/source/installation/upgrade_432.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index 0e8a818124d3..5149c797f9ef 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -18,7 +18,7 @@ Breaking Changes base_url() ========== -The :php:func:`base_url()` behavior has been fix. In previous versions, when you +The :php:func:`base_url()` behavior has been fixed. In previous versions, when you call ``base_url()`` **without argument**, it returned baseURL without a trailing slash (``/``). Now it returns baseURL with a trailing slash. For example: From a853148e002c8a36c9be4a2ab4d8aa967cec0d64 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Mar 2023 10:17:48 +0900 Subject: [PATCH 3378/8282] docs: add missing breaking change in uri_string() --- CHANGELOG.md | 2 +- user_guide_src/source/changelogs/v4.3.2.rst | 11 ++++++++--- user_guide_src/source/changelogs/v4.3.3.rst | 3 +++ user_guide_src/source/helpers/url_helper.rst | 4 ++++ .../source/installation/upgrade_432.rst | 15 +++++++++++++++ 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9786833e1d2e..509652f7ea87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Breaking Changes * fix: base_url() removes trailing slash in baseURL by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7200 +* fix: remove parameter $relative in `uri_string()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7135 ### Fixed Bugs @@ -14,7 +15,6 @@ * fix: remove `All` from `Options All -Indexes` in .htaccess by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/7093 * fix: bug on stuck content-type header in Feature Testing by @baycik in https://github.com/codeigniter4/CodeIgniter4/pull/7112 * fix: ordering `Validation` show error by call `setRule()` by @ddevsr in https://github.com/codeigniter4/CodeIgniter4/pull/7149 -* fix: remove parameter $relative in `uri_string()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7135 * fix: [QueryBuilder] where() generates incorrect SQL when using RawSql by @sclubricants in https://github.com/codeigniter4/CodeIgniter4/pull/7147 * fix: [QueryBuilder] RawSql passed to set() disappears without error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7148 * fix: [Parser] local_currency causes "Passing null to parameter" by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7157 diff --git a/user_guide_src/source/changelogs/v4.3.2.rst b/user_guide_src/source/changelogs/v4.3.2.rst index d0fccca1ea72..03e90d199b43 100644 --- a/user_guide_src/source/changelogs/v4.3.2.rst +++ b/user_guide_src/source/changelogs/v4.3.2.rst @@ -23,11 +23,16 @@ base_url() - Now it returns baseURL with a trailing slash. This is the same behavior as ``base_url()`` in CodeIgniter 3. -Changes -******* +.. _v432-uri-string: + +uri_string() +------------ - The parameter ``$relative`` in :php:func:`uri_string()` was removed. Due to a bug, - the function always returned a path relative to baseURL. No behavior changes. + the function always returned a path relative to baseURL. +- When baseURL is accessed, it will now return an empty string (``''``). This is + the same behavior as ``uri_string()`` in CodeIgniter 3. In previous versions + it returned ``/``. Bugs Fixed ********** diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 2cd881203e1a..396e98027077 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -32,6 +32,9 @@ Bugs Fixed - **Config:** Added missing ``Config\Encryption::$cipher``. - **UserGuide:** Fixed the sample code for :ref:`encryption-compatible-with-ci3`. +- **UserGuide:** Added a missing breaking change in ``uri_string()`` in + :ref:`ChangeLog ` and + :ref:`Upgrading Guide ` v4.3.2. See the repo's `CHANGELOG.md `_ diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 8e2b32ebfae3..eec0c7067d54 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -155,6 +155,10 @@ The following functions are available: However, due to a bug, this function always returned a path relative to baseURL. Since v4.3.2, the parameter has been removed. + .. note:: In previous versions, when you navigate to the baseURL, this function + returned ``/``. Since v4.3.2, the bug has been fixed and it returns an + empty string(``''``). + .. php:function:: index_page([$altConfig = null]) :param \\Config\\App $altConfig: Alternate configuration to use diff --git a/user_guide_src/source/installation/upgrade_432.rst b/user_guide_src/source/installation/upgrade_432.rst index 5149c797f9ef..c9e83843d678 100644 --- a/user_guide_src/source/installation/upgrade_432.rst +++ b/user_guide_src/source/installation/upgrade_432.rst @@ -27,6 +27,21 @@ slash (``/``). Now it returns baseURL with a trailing slash. For example: If you have code to call ``base_url()`` without argument, you may need to adjust the URLs. +.. _upgrade-432-uri-string: + +uri_string() +============ + +The :php:func:`uri_string()` behavior has been fixed. In previous versions, when you +navigate to the baseURL, it returned ``/``. Now it returns an empty string (``''``). + +If you have code to call ``uri_string()``, you may need to adjust it. + +.. note:: The :php:func:`uri_string()` returns a URI path relative to baseURL. + It is not a full URI path if the baseURL contains subfolders. + If you use it for HTML links, it is better to use it with :php:func:`site_url()` + like ``site_url(uri_string())``. + Mandatory File Changes ********************** From 533a0905d0af42647da10efd204c53476d659e84 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 10:05:56 +0900 Subject: [PATCH 3379/8282] chore: update Kint to 5.0.5 --- .../Kint/Zval/Representation/SplFileInfoRepresentation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php index 44980d7e359a..6424ee6a9175 100644 --- a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php +++ b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php @@ -57,7 +57,7 @@ public function __construct(SplFileInfo $fileInfo) $this->path = $fileInfo->getPathname(); try { - if ($fileInfo->getRealPath()) { + if (\strlen($this->path) && $fileInfo->getRealPath()) { $this->perms = $fileInfo->getPerms(); $this->size = $fileInfo->getSize(); $this->owner = $fileInfo->getOwner(); From ba63308809eecf7c96fe0a762edb03ff998ce8f5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:16:01 +0900 Subject: [PATCH 3380/8282] docs: add section title marks --- user_guide_src/source/outgoing/view_renderer.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index 6832ae84b816..1e0451d5358d 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -6,6 +6,7 @@ View Renderer :local: :depth: 2 +*********************** Using the View Renderer *********************** @@ -102,6 +103,7 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods: .. note:: ``saveData`` as defined by the interface must be a boolean, but implementing classes (like ``View`` below) may extend this to include ``null`` values. +*************** Class Reference *************** From 2b530fec7d1fd686f9cf0df71c82ff609c027b73 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:16:34 +0900 Subject: [PATCH 3381/8282] docs: add "Setting View Parameters" section --- user_guide_src/source/outgoing/view_renderer.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index 1e0451d5358d..94f29349bd51 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -46,6 +46,20 @@ script. You will have to give each escaped value a unique parameter name. No special meaning is attached to parameters whose value is an array. It is up to you to process the array appropriately in your PHP code. +Setting View Parameters +======================= + +The :php:meth:`setVar() ` method sets a view parameter. + +.. literalinclude:: view_renderer/008.php + :lines: 2- + +The :php:meth:`setData() ` method sets multiple view +parameters at once. + +.. literalinclude:: view_renderer/007.php + :lines: 2- + Method Chaining =============== From 8a3174dcde461492b440c5cf78a37d62ac96a7c7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:17:46 +0900 Subject: [PATCH 3382/8282] docs: remove Date: Sat, 18 Mar 2023 11:18:17 +0900 Subject: [PATCH 3383/8282] docs: remove :noindex: --- user_guide_src/source/outgoing/view_renderer.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index 99b115b48ac1..39d712826ed3 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -130,7 +130,6 @@ Class Reference .. php:class:: View .. php:method:: render($view[, $options[, $saveData = false]]) - :noindex: :param string $view: File name of the view source :param array $options: Array of options, as key/value pairs @@ -144,7 +143,6 @@ Class Reference :lines: 2- .. php:method:: renderString($view[, $options[, $saveData = false]]) - :noindex: :param string $view: Contents of the view to render, for instance content retrieved from a database :param array $options: Array of options, as key/value pairs @@ -163,7 +161,6 @@ Class Reference appropriately! .. php:method:: setData([$data[, $context = null]]) - :noindex: :param array $data: Array of view data strings, as key/value pairs :param string $context: The context to use for data escaping. @@ -182,7 +179,6 @@ Class Reference until the view is rendered. .. php:method:: setVar($name[, $value = null[, $context = null]]) - :noindex: :param string $name: Name of the view data variable :param mixed $value: The value of this view data From dc9a42444b5219b0635f053cd39e420d9ced43b9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:18:47 +0900 Subject: [PATCH 3384/8282] docs: make function name linkable --- user_guide_src/source/outgoing/view_renderer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index 39d712826ed3..d2e97e5d6a71 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -10,7 +10,7 @@ View Renderer Using the View Renderer *********************** -The ``view()`` function is a convenience function that grabs an instance of the +The :php:func:`view()` function is a convenience function that grabs an instance of the ``renderer`` service, sets the data, and renders the view. While this is often exactly what you want, you may find times where you want to work with it more directly. In that case you can access the View service directly: @@ -84,7 +84,7 @@ If you don't want the data to be escaped, you can pass ``null`` or ``'raw'`` as :lines: 2- If you choose not to escape data, or you are passing in an object instance, you can manually escape the data within -the view with the ``esc()`` function. The first parameter is the string to escape. The second parameter is the +the view with the :php:func:`esc()` function. The first parameter is the string to escape. The second parameter is the context to escape the data for (see below):: getStat()) ?> From b7d56d5e06ee9c1829c557f8885172672472fbae Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:19:18 +0900 Subject: [PATCH 3385/8282] docs: add () after method name --- user_guide_src/source/outgoing/view_renderer.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index d2e97e5d6a71..a40314cc9985 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -118,7 +118,7 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods: - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath; ignored for ``renderString()`` - ``saveData`` - true if the view data parameters should be retained for subsequent calls -.. note:: ``saveData`` as defined by the interface must be a boolean, but implementing +.. note:: ``saveData()`` as defined by the interface must be a boolean, but implementing classes (like ``View`` below) may extend this to include ``null`` values. *************** From a55690a315ee12ede2ec7da7785ad62cfed06c25 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:21:23 +0900 Subject: [PATCH 3386/8282] docs: make method names linkable --- user_guide_src/source/outgoing/view_renderer.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst index a40314cc9985..618a90c4a516 100644 --- a/user_guide_src/source/outgoing/view_renderer.rst +++ b/user_guide_src/source/outgoing/view_renderer.rst @@ -29,7 +29,9 @@ can instantiate it directly: in your library's constructor. Then you can use any of the three standard methods that it provides: -**render(viewpath, options, save)**, **setVar(name, value, context)** and **setData(data, context)**. +:php:meth:`render() `, +:php:meth:`setVar() ` and +:php:meth:`setData() `. What It Does ============ From 06149c2a577e62ccc4054b2c286f2fd96f27b9a1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 11:24:42 +0900 Subject: [PATCH 3387/8282] docs: remove `:noindex:` --- user_guide_src/source/incoming/incomingrequest.rst | 2 -- user_guide_src/source/libraries/email.rst | 1 - 2 files changed, 3 deletions(-) diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index f54b1f9ff741..1cc1c545c084 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -417,7 +417,6 @@ The methods provided by the parent classes that are available are: Although GET data will be preferred in case of name conflict. .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]]) - :noindex: :param mixed $index: COOKIE name :param int $filter: The type of filter to apply. A list of filters can be @@ -440,7 +439,6 @@ The methods provided by the parent classes that are available are: your configured ``Config\Cookie::$prefix`` value. .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]]) - :noindex: :param mixed $index: Value name :param int $filter: The type of filter to apply. A list of filters can be diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index eaccf57da36b..0014d25de02b 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -269,7 +269,6 @@ Class Reference and strip the tags. .. php:method:: setHeader($header, $value) - :noindex: :param string $header: Header name :param string $value: Header value From fcc4de5dbf269ff5474a7b66ac31a3796898b3bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Mar 2023 12:53:11 +0900 Subject: [PATCH 3388/8282] fix: Cache FileHandler error when there is a folder in cache dir ErrorException: Automatic conversion of false to array is deprecated --- system/Cache/Handlers/FileHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php index b95d7f9ee28c..c217c7edde8e 100644 --- a/system/Cache/Handlers/FileHandler.php +++ b/system/Cache/Handlers/FileHandler.php @@ -346,7 +346,7 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, while (false !== ($file = readdir($fp))) { if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) { $this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true); - } elseif ($file[0] !== '.') { + } elseif (! is_dir($sourceDir . $file) && $file[0] !== '.') { $_filedata[$file] = $this->getFileInfo($sourceDir . $file); $_filedata[$file]['relative_path'] = $relativePath; } From 0fb5f6828e4206ddbe0a44821b54d2278ab4a76d Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Tue, 21 Mar 2023 10:15:16 +0330 Subject: [PATCH 3389/8282] docs: add UG common link for more info --- app/Common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Common.php b/app/Common.php index 23e3e614a0a0..95f554425236 100644 --- a/app/Common.php +++ b/app/Common.php @@ -11,5 +11,5 @@ * loaded early on, and may also contain additional functions * that you'd like to use throughout your entire application * - * @see: https://codeigniter4.github.io/CodeIgniter4/ + * @see: https://codeigniter.com/user_guide/extending/common.html */ From 8a256a2f005466c14095cb02c2dea8a659b1a8a4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Mar 2023 18:09:18 +0900 Subject: [PATCH 3390/8282] docs: fix section title level --- user_guide_src/source/dbmgmt/seeds.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst index 9eb9ee4396f9..087011e2fd83 100644 --- a/user_guide_src/source/dbmgmt/seeds.rst +++ b/user_guide_src/source/dbmgmt/seeds.rst @@ -14,8 +14,9 @@ stored within the **app/Database/Seeds** directory. The name of the file must ma .. literalinclude:: seeds/001.php +*************** Nesting Seeders -=============== +*************** Seeders can call other seeders, with the **call()** method. This allows you to easily organize a central seeder, but organize the tasks into separate seeder files: @@ -27,23 +28,25 @@ anywhere the autoloader can find them. This is great for more modular code bases .. literalinclude:: seeds/003.php +************* Using Seeders -============= +************* You can grab a copy of the main seeder through the database config class: .. literalinclude:: seeds/004.php Command Line Seeding --------------------- +==================== You can also seed data from the command line, as part of the Migrations CLI tools, if you don't want to create a dedicated controller:: > php spark db:seed TestSeeder -Creating Seed Files -------------------- +********************* +Creating Seeder Files +********************* Using the command line, you can easily generate seed files. From 00abda1300116e55b60c205e8b6bbd939a882565 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Mar 2023 18:09:53 +0900 Subject: [PATCH 3391/8282] docs: replace seeds with seeders For consistency. --- user_guide_src/source/dbmgmt/seeds.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst index 087011e2fd83..fb21f3ff2e8e 100644 --- a/user_guide_src/source/dbmgmt/seeds.rst +++ b/user_guide_src/source/dbmgmt/seeds.rst @@ -4,10 +4,10 @@ Database Seeding Database seeding is a simple way to add data into your database. It is especially useful during development where you need to populate the database with sample data that you can develop against, but it is not limited to that. -Seeds can contain static data that you don't want to include in a migration, like countries, or geo-coding tables, +Seeders can contain static data that you don't want to include in a migration, like countries, or geo-coding tables, event or setting information, and more. -Database seeds are simple classes that must have a **run()** method, and extend ``CodeIgniter\Database\Seeder``. +Database seeders are simple classes that must have a **run()** method, and extend ``CodeIgniter\Database\Seeder``. Within the **run()** the class can create any form of data that it needs to. It has access to the database connection and the forge through ``$this->db`` and ``$this->forge``, respectively. Seed files must be stored within the **app/Database/Seeds** directory. The name of the file must match the name of the class. From 39af027fbf54d1a5ff05cb3df70e22649d35f9c7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Mar 2023 18:10:18 +0900 Subject: [PATCH 3392/8282] docs: add section title and TOC --- user_guide_src/source/dbmgmt/seeds.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst index fb21f3ff2e8e..bdf2ff28a5fa 100644 --- a/user_guide_src/source/dbmgmt/seeds.rst +++ b/user_guide_src/source/dbmgmt/seeds.rst @@ -7,6 +7,14 @@ you need to populate the database with sample data that you can develop against, Seeders can contain static data that you don't want to include in a migration, like countries, or geo-coding tables, event or setting information, and more. +.. contents:: + :local: + :depth: 2 + +**************** +Database Seeders +**************** + Database seeders are simple classes that must have a **run()** method, and extend ``CodeIgniter\Database\Seeder``. Within the **run()** the class can create any form of data that it needs to. It has access to the database connection and the forge through ``$this->db`` and ``$this->forge``, respectively. Seed files must be From f9cc308250f406f1525cddddce2e797cf0545113 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Mar 2023 18:12:53 +0900 Subject: [PATCH 3393/8282] docs: change text decoration --- user_guide_src/source/dbmgmt/seeds.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst index bdf2ff28a5fa..7ea6ec2e310a 100644 --- a/user_guide_src/source/dbmgmt/seeds.rst +++ b/user_guide_src/source/dbmgmt/seeds.rst @@ -15,8 +15,8 @@ event or setting information, and more. Database Seeders **************** -Database seeders are simple classes that must have a **run()** method, and extend ``CodeIgniter\Database\Seeder``. -Within the **run()** the class can create any form of data that it needs to. It has access to the database +Database seeders are simple classes that must have a ``run()`` method, and extend ``CodeIgniter\Database\Seeder``. +Within the ``run()`` the class can create any form of data that it needs to. It has access to the database connection and the forge through ``$this->db`` and ``$this->forge``, respectively. Seed files must be stored within the **app/Database/Seeds** directory. The name of the file must match the name of the class. @@ -26,12 +26,12 @@ stored within the **app/Database/Seeds** directory. The name of the file must ma Nesting Seeders *************** -Seeders can call other seeders, with the **call()** method. This allows you to easily organize a central seeder, +Seeders can call other seeders, with the ``call()`` method. This allows you to easily organize a central seeder, but organize the tasks into separate seeder files: .. literalinclude:: seeds/002.php -You can also use a fully-qualified class name in the **call()** method, allowing you to keep your seeders +You can also use a fully-qualified class name in the ``call()`` method, allowing you to keep your seeders anywhere the autoloader can find them. This is great for more modular code bases: .. literalinclude:: seeds/003.php @@ -63,10 +63,10 @@ Using the command line, you can easily generate seed files. > php spark make:seeder user --suffix // Output: UserSeeder.php file located at app/Database/Seeds directory. -You can supply the **root** namespace where the seed file will be stored by supplying the ``--namespace`` option:: +You can supply the ``root`` namespace where the seed file will be stored by supplying the ``--namespace`` option:: > php spark make:seeder MySeeder --namespace Acme\\Blog -If ``Acme\Blog`` is mapped to ``app/Blog`` directory, then this command will generate ``MySeeder.php`` at ``app/Blog/Database/Seeds`` directory. +If ``Acme\Blog`` is mapped to **app/Blog** directory, then this command will generate **MySeeder.php** at **app/Blog/Database/Seeds** directory. Supplying the ``--force`` option will overwrite existing files in destination. From 47ef1cb487f64ced5266b93ec3c0b96b9e9b6e42 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Mar 2023 09:05:21 +0900 Subject: [PATCH 3394/8282] docs: add sample command for Windows --- user_guide_src/source/dbmgmt/seeds.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst index 7ea6ec2e310a..a846705e56c8 100644 --- a/user_guide_src/source/dbmgmt/seeds.rst +++ b/user_guide_src/source/dbmgmt/seeds.rst @@ -65,8 +65,12 @@ Using the command line, you can easily generate seed files. You can supply the ``root`` namespace where the seed file will be stored by supplying the ``--namespace`` option:: + For Unix: > php spark make:seeder MySeeder --namespace Acme\\Blog + For Windows: + > php spark make:seeder MySeeder --namespace Acme\Blog + If ``Acme\Blog`` is mapped to **app/Blog** directory, then this command will generate **MySeeder.php** at **app/Blog/Database/Seeds** directory. Supplying the ``--force`` option will overwrite existing files in destination. From c7a92d3bbc99ab3dd5a5afe64191c325d3679e23 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Mar 2023 09:07:10 +0900 Subject: [PATCH 3395/8282] docs: add sample command for Windows --- user_guide_src/source/dbmgmt/migration.rst | 4 ++++ user_guide_src/source/general/modules.rst | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 117cdaacd099..616f782dce01 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -128,8 +128,12 @@ You can use (migrate) with the following options: This example will migrate ``Acme\Blog`` namespace with any new migrations on the test database group:: + For Unix: > php spark migrate -g test -n Acme\\Blog + For Windows: + > php spark migrate -g test -n Acme\Blog + When using the ``--all`` option, it will scan through all namespaces attempting to find any migrations that have not been run. These will all be collected and then sorted as a group by date created. This should help to minimize any potential conflicts between the main application and any modules. diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 6c3eb08f792c..2298c32a986f 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -208,8 +208,12 @@ Seeds Seed files can be used from both the CLI and called from within other seed files as long as the full namespace is provided. If calling on the CLI, you will need to provide double backslashes:: + For Unix: > php spark db:seed Acme\\Blog\\Database\\Seeds\\TestPostSeeder + For Windows: + > php spark db:seed Acme\Blog\Database\Seeds\TestPostSeeder + Helpers ======= From b88fdaf3ebc3810d2ede125ce65cd8fcbf4613d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 15:57:06 +0000 Subject: [PATCH 3396/8282] chore(deps-dev): update rector/rector requirement Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.15.21...0.15.23) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index beb77d7dc7b5..3f176b01f8f4 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.15.21", + "rector/rector": "0.15.23", "vimeo/psalm": "^5.0" }, "suggest": { From 17692315f6506e5626066365434aa4232b9c83db Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 10:40:56 +0900 Subject: [PATCH 3397/8282] docs: increase TOC depth --- user_guide_src/source/libraries/email.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index 0014d25de02b..5c32383dd7c1 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -18,7 +18,7 @@ CodeIgniter's robust Email Class supports the following features: .. contents:: :local: - :depth: 2 + :depth: 3 *********************** Using the Email Library From 97f20e00e42688c5e3a069dbfdcc02ef2d7ef3bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 10:41:43 +0900 Subject: [PATCH 3398/8282] docs: add section title --- user_guide_src/source/libraries/email.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index 5c32383dd7c1..c25d52fca11b 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -44,6 +44,9 @@ messages are sent. You can either set them manually as described here, or automatically via preferences stored in your config file, described below: +Setting Email Preferences by Passing an Array +--------------------------------------------- + Preferences are set by passing an array of preference values to the email initialize method. Here is an example of how you might set some preferences: From ef1914a778562f492a2e1f1abb09148df0fc99b1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 10:42:05 +0900 Subject: [PATCH 3399/8282] docs: fix section level --- user_guide_src/source/libraries/email.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index c25d52fca11b..88dbd4334c61 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -74,7 +74,7 @@ instance property ``$archive``. This is helpful for testing and debugging to determine that actual values at the time of the ``send()`` call. SSL versus TLS for SMTP Protocol -================================ +-------------------------------- To protect the username, password and email content while communicating with the SMTP server, encryption on the channel should be used. Two different standards are widely deployed and From 8c250e1b6643075a3bfae9302b473c1bfdf0a427 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 10:42:22 +0900 Subject: [PATCH 3400/8282] docs: move section down --- user_guide_src/source/libraries/email.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index 88dbd4334c61..0e0b949e1dde 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -66,13 +66,6 @@ Email properties. Then save the file and it will be used automatically. You will NOT need to use the ``$email->initialize()`` method if you set your preferences in the config file. -Reviewing Preferences ---------------------- - -The settings used for the last successful send are available from the -instance property ``$archive``. This is helpful for testing and debugging -to determine that actual values at the time of the ``send()`` call. - SSL versus TLS for SMTP Protocol -------------------------------- @@ -100,6 +93,13 @@ If your configuration requires you to connect to port 587, you should most likel with the SMTP server to switch from clear-text to an encrypted channel. The initial communication will be made in clear-text and the channel will be upgraded to TLS with the ``STARTTLS`` command. +Reviewing Preferences +--------------------- + +The settings used for the last successful send are available from the +instance property ``$archive``. This is helpful for testing and debugging +to determine that actual values at the time of the ``send()`` call. + Email Preferences ================= From 2508a768f2b6c407a29ea06b13190cb3b0227747 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 12:47:54 +0900 Subject: [PATCH 3401/8282] test: Temporary solution for PHP 8.2.4 SIGSEGV #7362 --- tests/system/I18n/TimeLegacyTest.php | 21 +++++++++++---------- tests/system/I18n/TimeTest.php | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/system/I18n/TimeLegacyTest.php b/tests/system/I18n/TimeLegacyTest.php index 02585a25d11e..b839ef4c506c 100644 --- a/tests/system/I18n/TimeLegacyTest.php +++ b/tests/system/I18n/TimeLegacyTest.php @@ -1124,16 +1124,17 @@ public function testGetter() $this->assertNull($time->weekOfWeek); } - public function testUnserializeTimeObject() - { - $time1 = new TimeLegacy('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en'); - $timeCache = serialize($time1); - $time2 = unserialize($timeCache); - - $this->assertInstanceOf(TimeLegacy::class, $time2); - $this->assertTrue($time2->equals($time1)); - $this->assertNotSame($time1, $time2); - } + // @TODO Uncomment when PHP 8.2.4 Segmentation fault fixed. +// public function testUnserializeTimeObject() +// { +// $time1 = new TimeLegacy('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en'); +// $timeCache = serialize($time1); +// $time2 = unserialize($timeCache); +// +// $this->assertInstanceOf(TimeLegacy::class, $time2); +// $this->assertTrue($time2->equals($time1)); +// $this->assertNotSame($time1, $time2); +// } public function testSetTestNowWithFaLocale() { diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index fe1360f576a1..deac2760ac81 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -1127,16 +1127,17 @@ public function testGetter() $this->assertNull($time->weekOfWeek); } - public function testUnserializeTimeObject() - { - $time1 = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en'); - $timeCache = serialize($time1); - $time2 = unserialize($timeCache); - - $this->assertInstanceOf(Time::class, $time2); - $this->assertTrue($time2->equals($time1)); - $this->assertNotSame($time1, $time2); - } + // @TODO Uncomment when PHP 8.2.4 Segmentation fault fixed. +// public function testUnserializeTimeObject() +// { +// $time1 = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en'); +// $timeCache = serialize($time1); +// $time2 = unserialize($timeCache); +// +// $this->assertInstanceOf(Time::class, $time2); +// $this->assertTrue($time2->equals($time1)); +// $this->assertNotSame($time1, $time2); +// } public function testSetTestNowWithTimeZone() { From 970d7ace1f74a29f26af2867f186c4ca6002b930 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Mar 2023 10:04:34 +0900 Subject: [PATCH 3402/8282] refactor: improve error message for HTTP.invalidHTTPProtocol Valid versions are obvious, so not needed. --- system/HTTP/Exceptions/HTTPException.php | 4 ++-- system/HTTP/MessageTrait.php | 2 +- system/Language/en/HTTP.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php index 966c3c7fd7e5..d22c48bcb9f3 100644 --- a/system/HTTP/Exceptions/HTTPException.php +++ b/system/HTTP/Exceptions/HTTPException.php @@ -77,9 +77,9 @@ public static function forInvalidNegotiationType(string $type) * * @return HTTPException */ - public static function forInvalidHTTPProtocol(string $protocols) + public static function forInvalidHTTPProtocol(string $invalidVersion) { - return new static(lang('HTTP.invalidHTTPProtocol', [$protocols])); + return new static(lang('HTTP.invalidHTTPProtocol', [$invalidVersion])); } /** diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php index 7e2665d09157..7482f5f59681 100644 --- a/system/HTTP/MessageTrait.php +++ b/system/HTTP/MessageTrait.php @@ -229,7 +229,7 @@ public function setProtocolVersion(string $version): self $version = number_format((float) $version, 1); if (! in_array($version, $this->validProtocolVersions, true)) { - throw HTTPException::forInvalidHTTPProtocol(implode(', ', $this->validProtocolVersions)); + throw HTTPException::forInvalidHTTPProtocol($version); } $this->protocolVersion = $version; diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php index 942e3cf9dd2a..a7861c7188d1 100644 --- a/system/Language/en/HTTP.php +++ b/system/Language/en/HTTP.php @@ -21,7 +21,7 @@ 'invalidNegotiationType' => '"{0}" is not a valid negotiation type. Must be one of: media, charset, encoding, language.', // Message - 'invalidHTTPProtocol' => 'Invalid HTTP Protocol Version. Must be one of: {0}', + 'invalidHTTPProtocol' => 'Invalid HTTP Protocol Version: {0}', // Negotiate 'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.', From 517eadeda92efac9d6e07e7641b2c0c625cc10f4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Mar 2023 10:11:12 +0900 Subject: [PATCH 3403/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 7b394d66ac15..503922b418e2 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -91,6 +91,8 @@ Others Message Changes *************** +- Improved ``HTTP.invalidHTTPProtocol`` error message. + Changes ******* From 77d31409af3e85e5aedc16b9e5a950446ff1b0b1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 16:03:09 +0900 Subject: [PATCH 3404/8282] refactor: use early return --- system/Security/Security.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index 422e589b81cd..ad6ba0b7de8d 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -342,20 +342,23 @@ private function getPostedToken(RequestInterface $request): ?string assert($request instanceof IncomingRequest); // Does the token exist in POST, HEADER or optionally php:://input - json data. + + if ($tokenName = $request->getPost($this->tokenName)) { + return $tokenName; + } + if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) { - $tokenName = $request->header($this->headerName)->getValue(); - } else { - $body = (string) $request->getBody(); - $json = json_decode($body); + return $request->header($this->headerName)->getValue(); + } - if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) { - $tokenName = $json->{$this->tokenName} ?? null; - } else { - $tokenName = null; - } + $body = (string) $request->getBody(); + $json = json_decode($body); + + if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) { + return $json->{$this->tokenName} ?? null; } - return $request->getPost($this->tokenName) ?? $tokenName; + return null; } /** From c3d8020c841f6d210ea0d6454acd215fdaa7cedd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Mar 2023 16:04:32 +0900 Subject: [PATCH 3405/8282] refactor: rename variable name --- system/Security/Security.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index ad6ba0b7de8d..239156719260 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -343,8 +343,8 @@ private function getPostedToken(RequestInterface $request): ?string // Does the token exist in POST, HEADER or optionally php:://input - json data. - if ($tokenName = $request->getPost($this->tokenName)) { - return $tokenName; + if ($tokenValue = $request->getPost($this->tokenName)) { + return $tokenValue; } if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) { From e6867318b3e33c1535e505098786d666cccd48ff Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 13:12:07 +0900 Subject: [PATCH 3406/8282] docs: replace With with with --- user_guide_src/source/database/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index 73cd1a4ecff9..0862ec0f4125 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -1,5 +1,5 @@ ###################### -Working With Databases +Working with Databases ###################### CodeIgniter comes with a full-featured and very fast abstracted database From b89a97f6517bdcec434b2630fafc95fd85587c05 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 13:12:26 +0900 Subject: [PATCH 3407/8282] docs: increase TOC depth --- user_guide_src/source/database/results.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index 39dd584e8003..2dda585d9b2c 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -6,7 +6,7 @@ There are several ways to generate query results: .. contents:: :local: - :depth: 2 + :depth: 3 ************* Result Arrays From 3201a02ffa0fc60749ed550a3ab9cecccd7dcd2c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 13:12:47 +0900 Subject: [PATCH 3408/8282] docs: add sub section titles --- user_guide_src/source/database/results.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index 2dda585d9b2c..0f64e02c6f3b 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -16,13 +16,21 @@ getResult() =========== This method returns the query result as an array of **objects**, or -**an empty array** on failure. Typically you'll use this in a foreach +**an empty array** on failure. + +Getting an Array of stdClass +---------------------------- + +Typically you'll use this in a foreach loop, like this: .. literalinclude:: results/001.php The above method is an alias of ``getResultObject()``. +Getting an Array of Array +------------------------- + You can pass in the string 'array' if you wish to get your results as an array of arrays: @@ -30,6 +38,9 @@ as an array of arrays: The above usage is an alias of ``getResultArray()``. +Getting an Array of Custom Object +--------------------------------- + You can also pass a string to ``getResult()`` which represents a class to instantiate for each result object From e40d25ff231c63ee7dd6d80c5b242bfbf569a53c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 13:18:30 +0900 Subject: [PATCH 3409/8282] docs: make method names linkable --- user_guide_src/source/database/results.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index 0f64e02c6f3b..a5d490a81a20 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -26,7 +26,7 @@ loop, like this: .. literalinclude:: results/001.php -The above method is an alias of ``getResultObject()``. +The above method is an alias of :php:meth:`CodeIgniter\\Database\\BaseResult::getResultObject()`. Getting an Array of Array ------------------------- @@ -36,7 +36,7 @@ as an array of arrays: .. literalinclude:: results/002.php -The above usage is an alias of ``getResultArray()``. +The above usage is an alias of `getResultArray()`_. Getting an Array of Custom Object --------------------------------- @@ -46,7 +46,7 @@ instantiate for each result object .. literalinclude:: results/003.php -The above method is an alias of ``getCustomResultObject()``. +The above method is an alias of `getCustomResultObject()`_. getResultArray() ================ @@ -283,7 +283,7 @@ Class Reference Returns the query results as an array of rows, where each row is an object of type ``stdClass``. - Usage: see `Result Arrays`_. + Usage: see `Getting an Array of stdClass`_. .. php:method:: getCustomResultObject($class_name) From f5043f5469e1a2ccce5bdca31cecd00dd65075f2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 14:38:51 +0900 Subject: [PATCH 3410/8282] docs: fix PHPDoc types --- system/Database/BaseResult.php | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php index 511c4f92af2a..2f073fd3151c 100644 --- a/system/Database/BaseResult.php +++ b/system/Database/BaseResult.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Database; use CodeIgniter\Entity\Entity; +use stdClass; /** * @template TConnection of object|resource @@ -116,7 +117,9 @@ public function getResult(string $type = 'object'): array /** * Returns the results as an array of custom objects. * - * @return mixed + * @phpstan-param class-string $className + * + * @return array */ public function getCustomResultObject(string $className) { @@ -205,6 +208,9 @@ public function getResultArray(): array * Returns the results as an array of objects. * * If no results, an empty array is returned. + * + * @return array + * @phpstan-return list */ public function getResultObject(): array { @@ -248,10 +254,11 @@ public function getResultObject(): array * * If row doesn't exist, returns null. * - * @param mixed $n The index of the results to return + * @param int $n The index of the results to return * @param string $type The type of result object. 'array', 'object' or class name. * - * @return mixed + * @return array|object|stdClass|null + * @phpstan-return ($type is 'object' ? stdClass|null : ($type is 'array' ? array|null : object|null)) */ public function getRow($n = 0, string $type = 'object') { @@ -285,7 +292,7 @@ public function getRow($n = 0, string $type = 'object') * * If row doesn't exists, returns null. * - * @return mixed + * @return array|null */ public function getCustomRowObject(int $n, string $className) { @@ -309,7 +316,7 @@ public function getCustomRowObject(int $n, string $className) * * If row doesn't exist, returns null. * - * @return mixed + * @return array|null */ public function getRowArray(int $n = 0) { @@ -330,7 +337,7 @@ public function getRowArray(int $n = 0) * * If row doesn't exist, returns null. * - * @return mixed + * @return object|stdClass|null */ public function getRowObject(int $n = 0) { @@ -377,7 +384,7 @@ public function setRow($key, $value = null) /** * Returns the "first" row of the current results. * - * @return mixed + * @return array|object|null */ public function getFirstRow(string $type = 'object') { @@ -389,7 +396,7 @@ public function getFirstRow(string $type = 'object') /** * Returns the "last" row of the current results. * - * @return mixed + * @return array|object|null */ public function getLastRow(string $type = 'object') { @@ -401,7 +408,7 @@ public function getLastRow(string $type = 'object') /** * Returns the "next" row of the current results. * - * @return mixed + * @return array|object|null */ public function getNextRow(string $type = 'object') { @@ -416,7 +423,7 @@ public function getNextRow(string $type = 'object') /** * Returns the "previous" row of the current results. * - * @return mixed + * @return array|object|null */ public function getPreviousRow(string $type = 'object') { @@ -435,7 +442,7 @@ public function getPreviousRow(string $type = 'object') /** * Returns an unbuffered row and move the pointer to the next row. * - * @return mixed + * @return array|object|null */ public function getUnbufferedRow(string $type = 'object') { From df8f305f4fc89775b3da9473f7f9d462d53c94c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 14:39:07 +0900 Subject: [PATCH 3411/8282] docs: fix PHPDoc types in Result --- system/Database/MySQLi/Result.php | 2 +- system/Database/OCI8/Result.php | 2 +- system/Database/Postgre/Result.php | 2 +- system/Database/SQLSRV/Result.php | 2 +- system/Database/SQLite3/Result.php | 2 +- system/Test/Mock/MockResult.php | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php index 550fc0abf835..358a400ca9fe 100644 --- a/system/Database/MySQLi/Result.php +++ b/system/Database/MySQLi/Result.php @@ -141,7 +141,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return bool|Entity|object + * @return Entity|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php index cb192de325f1..f345cb7bd73a 100644 --- a/system/Database/OCI8/Result.php +++ b/system/Database/OCI8/Result.php @@ -92,7 +92,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return bool|Entity|object + * @return Entity|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php index c3fce412223d..e81250c660df 100644 --- a/system/Database/Postgre/Result.php +++ b/system/Database/Postgre/Result.php @@ -107,7 +107,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return bool|Entity|object + * @return Entity|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php index 6e172d8ac770..174b146aab44 100755 --- a/system/Database/SQLSRV/Result.php +++ b/system/Database/SQLSRV/Result.php @@ -147,7 +147,7 @@ protected function fetchAssoc() /** * Returns the result set as an object. * - * @return bool|Entity|object + * @return Entity|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php index 05994469e5eb..d033b65891be 100644 --- a/system/Database/SQLite3/Result.php +++ b/system/Database/SQLite3/Result.php @@ -124,7 +124,7 @@ protected function fetchAssoc() * * Overridden by child classes. * - * @return bool|object + * @return Entity|false|object|stdClass */ protected function fetchObject(string $className = 'stdClass') { diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php index ff40c9449c1b..689a1392ec14 100644 --- a/system/Test/Mock/MockResult.php +++ b/system/Test/Mock/MockResult.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Test\Mock; use CodeIgniter\Database\BaseResult; +use stdClass; /** * @extends BaseResult @@ -82,7 +83,7 @@ protected function fetchAssoc() * * @param string $className * - * @return object + * @return object|stdClass */ protected function fetchObject($className = 'stdClass') { From 0d15f89eb20a47f6dac32c7f5c404ff3d3e3bca1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 19:10:32 +0900 Subject: [PATCH 3412/8282] Prep for 4.3.3 release --- CHANGELOG.md | 27 +++++++++++++++++++ system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/v4.3.3.rst | 2 +- user_guide_src/source/conf.py | 2 +- .../source/installation/upgrade_433.rst | 4 ++- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 509652f7ea87..cabf78eba583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog +## [v4.3.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.3) (2023-03-26) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.2...v4.3.3) + +### Fixed Bugs + +* docs: fix $systemDirectory path in existing project. by @jozefrebjak in https://github.com/codeigniter4/CodeIgniter4/pull/7289 +* docs: fix message.rst and improve content_negotiation.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7280 +* fix: Encryption CI3 compatibility by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7273 +* fix: [QueryBuilder] RawSql causes error when using like() and countAllResults() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7277 +* fix: handling of null bytes in `Exceptions::renderBacktrace()` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/7306 +* fix: incorrect metadata querying of Redis cache by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/7307 +* fix: [Email] add missing TLS 1.3 support by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7317 +* docs: add warning to random_string() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7333 +* fix: random_string() numeric by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7336 +* docs: add note for addColumn() and NULL by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7342 +* fix: respondNoContent() returns Kint script in development mode by @anggadarkprince in https://github.com/codeigniter4/CodeIgniter4/pull/7347 +* fix: use first exception in exceptionHandler() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7341 +* fix: random_string() alpha alnum nozero by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7344 +* fix: migrate:rollback -b negative number by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7350 +* fix: site_url() does not support protocol-relative links by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7353 +* docs: add uri_string() BC in v4.3.2 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7356 +* fix: Cache FileHandler error when there is a folder in cache dir by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7361 + +### Refactoring + +* refactor: consistent header name case by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7299 + ## [v4.3.2](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.2) (2023-02-18) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.1...v4.3.2) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index d370e34ca22e..42ddaa0c073c 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -47,7 +47,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.3.2'; + public const CI_VERSION = '4.3.3'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 4681fde8604b..1430cf767aea 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -1,7 +1,7 @@ Version 4.3.3 ################# -Release Date: Unreleased +Release Date: March 26, 2023 **4.3.3 release of CodeIgniter4** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 936eff54be31..0fae19186417 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -26,7 +26,7 @@ version = '4.3' # The full version, including alpha/beta/rc tags. -release = '4.3.2' +release = '4.3.3' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_433.rst b/user_guide_src/source/installation/upgrade_433.rst index 2196484b502b..95422dddc4c7 100644 --- a/user_guide_src/source/installation/upgrade_433.rst +++ b/user_guide_src/source/installation/upgrade_433.rst @@ -46,4 +46,6 @@ All Changes This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: -- @TODO +- app/Common.php +- app/Config/Encryption.php +- composer.json From 96b45e0aad8219c3371a52522a039b889c183e90 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 19:14:35 +0900 Subject: [PATCH 3413/8282] docs: remove empty section's title --- user_guide_src/source/changelogs/v4.3.3.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.3.3.rst b/user_guide_src/source/changelogs/v4.3.3.rst index 1430cf767aea..cd9d3fc31a40 100644 --- a/user_guide_src/source/changelogs/v4.3.3.rst +++ b/user_guide_src/source/changelogs/v4.3.3.rst @@ -16,18 +16,6 @@ SECURITY - **Text Helper:** The :php:func:`random_string()` type **alpha**, **alnum**, **numeric** and **nozero** are now cryptographically secure. -BREAKING -******** - -Message Changes -*************** - -Changes -******* - -Deprecations -************ - Bugs Fixed ********** From d2a2dff57d279c87cbdbd569ceff005d7921b897 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 19:50:49 +0900 Subject: [PATCH 3414/8282] docs: use getCSP() instead of CSP property The CSP property is deprecated. --- user_guide_src/source/outgoing/response.rst | 2 +- .../source/outgoing/response/012.php | 39 ++++++++++--------- .../source/outgoing/response/013.php | 11 ++++-- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 0fcd5d45d7d5..6c9d2509b385 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -170,7 +170,7 @@ call basis, by providing an optional second parameter to the adding method call. Runtime Configuration --------------------- -If your application needs to make changes at run-time, you can access the instance at ``$this->response->CSP`` in your controllers. The +If your application needs to make changes at run-time, you can access the instance at ``$this->response->getCSP()`` in your controllers. The class holds a number of methods that map pretty clearly to the appropriate header value that you need to set. Examples are shown below, with different combinations of parameters, though all accept either a directive name or an array of them: diff --git a/user_guide_src/source/outgoing/response/012.php b/user_guide_src/source/outgoing/response/012.php index a9487e9379a0..24e145a0fa7b 100644 --- a/user_guide_src/source/outgoing/response/012.php +++ b/user_guide_src/source/outgoing/response/012.php @@ -1,30 +1,33 @@ response->getCSP(); + // specify the default directive treatment -$this->response->CSP->reportOnly(false); +$csp->reportOnly(false); // specify the origin to use if none provided for a directive -$this->response->CSP->setDefaultSrc('cdn.example.com'); +$csp->setDefaultSrc('cdn.example.com'); // specify the URL that "report-only" reports get sent to -$this->response->CSP->setReportURI('http://example.com/csp/reports'); +$csp->setReportURI('http://example.com/csp/reports'); // specify that HTTP requests be upgraded to HTTPS -$this->response->CSP->upgradeInsecureRequests(true); +$csp->upgradeInsecureRequests(true); // add types or origins to CSP directives // assuming that the default treatment is to block rather than just report -$this->response->CSP->addBaseURI('example.com', true); // report only -$this->response->CSP->addChildSrc('https://youtube.com'); // blocked -$this->response->CSP->addConnectSrc('https://*.facebook.com', false); // blocked -$this->response->CSP->addFontSrc('fonts.example.com'); -$this->response->CSP->addFormAction('self'); -$this->response->CSP->addFrameAncestor('none', true); // report this one -$this->response->CSP->addImageSrc('cdn.example.com'); -$this->response->CSP->addMediaSrc('cdn.example.com'); -$this->response->CSP->addManifestSrc('cdn.example.com'); -$this->response->CSP->addObjectSrc('cdn.example.com', false); // reject from here -$this->response->CSP->addPluginType('application/pdf', false); // reject this media type -$this->response->CSP->addScriptSrc('scripts.example.com', true); // allow but report requests from here -$this->response->CSP->addStyleSrc('css.example.com'); -$this->response->CSP->addSandbox(['allow-forms', 'allow-scripts']); +$csp->addBaseURI('example.com', true); // report only +$csp->addChildSrc('https://youtube.com'); // blocked +$csp->addConnectSrc('https://*.facebook.com', false); // blocked +$csp->addFontSrc('fonts.example.com'); +$csp->addFormAction('self'); +$csp->addFrameAncestor('none', true); // report this one +$csp->addImageSrc('cdn.example.com'); +$csp->addMediaSrc('cdn.example.com'); +$csp->addManifestSrc('cdn.example.com'); +$csp->addObjectSrc('cdn.example.com', false); // reject from here +$csp->addPluginType('application/pdf', false); // reject this media type +$csp->addScriptSrc('scripts.example.com', true); // allow but report requests from here +$csp->addStyleSrc('css.example.com'); +$csp->addSandbox(['allow-forms', 'allow-scripts']); diff --git a/user_guide_src/source/outgoing/response/013.php b/user_guide_src/source/outgoing/response/013.php index 959a7bfcabef..a34b34607f26 100644 --- a/user_guide_src/source/outgoing/response/013.php +++ b/user_guide_src/source/outgoing/response/013.php @@ -1,6 +1,9 @@ response->CSP->addChildSrc('https://youtube.com'); // allowed -$this->response->CSP->reportOnly(true); -$this->response->CSP->addChildSrc('https://metube.com'); // allowed but reported -$this->response->CSP->addChildSrc('https://ourtube.com', false); // allowed +// get the CSP instance +$csp = $this->response->getCSP(); + +$csp->addChildSrc('https://youtube.com'); // allowed +$csp->reportOnly(true); +$csp->addChildSrc('https://metube.com'); // allowed but reported +$csp->addChildSrc('https://ourtube.com', false); // allowed From 8c349e5a12b6465a1f99f267e2e5b078aa480844 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 19:51:34 +0900 Subject: [PATCH 3415/8282] docs: add () after method name --- user_guide_src/source/outgoing/response.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 6c9d2509b385..2e9e3ca14f9a 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -180,7 +180,7 @@ name or an array of them: The first parameter to each of the "add" methods is an appropriate string value, or an array of them. -The ``reportOnly`` method allows you to specify the default reporting treatment +The ``reportOnly()`` method allows you to specify the default reporting treatment for subsequent sources, unless over-ridden. For instance, you could specify that youtube.com was allowed, and then provide several allowed but reported sources: From a921e66cb9c3b0b62a92b96f81b6765b9f0e4e5c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 Mar 2023 19:51:49 +0900 Subject: [PATCH 3416/8282] docs: make functions linkable --- user_guide_src/source/outgoing/response.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 2e9e3ca14f9a..e1b5a353b1c7 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -214,7 +214,7 @@ life, and is most secure when generated on the fly. To make this simple, you can If you don't like this auto replacement functionality, you can turn it off with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**. -In this case, you can use the functions, ``csp_script_nonce()`` and ``csp_style_nonce()``:: +In this case, you can use the functions, :php:func:`csp_script_nonce()` and :php:func:`csp_style_nonce()`:: // Original
        From aa800a99d5e74e8f6a7d718b0b7026a6d10a977a Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 22:25:55 -0500 Subject: [PATCH 3963/8282] Add tests for Directory Hasher. --- system/Exceptions/FrameworkException.php | 5 ++ system/HotReloader/DirectoryHasher.php | 7 ++- system/Language/en/Core.php | 1 + .../HotReloader/DirectoryHasherTest.php | 58 +++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 tests/system/HotReloader/DirectoryHasherTest.php diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php index 333f999df84a..cee5f903e785 100644 --- a/system/Exceptions/FrameworkException.php +++ b/system/Exceptions/FrameworkException.php @@ -33,6 +33,11 @@ public static function forInvalidFile(string $path) return new static(lang('Core.invalidFile', [$path])); } + public static function forInvalidDirectory(string $path) + { + return new static(lang('Core.invalidDirectory', [$path])); + } + public static function forCopyError(string $path) { return new static(lang('Core.copyError', [$path])); diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php index 80df77aacec0..7658ece8fdf3 100644 --- a/system/HotReloader/DirectoryHasher.php +++ b/system/HotReloader/DirectoryHasher.php @@ -2,6 +2,7 @@ namespace CodeIgniter\HotReloader; +use CodeIgniter\Exceptions\FrameworkException; use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; @@ -31,7 +32,7 @@ public function hashApp(): array foreach ($watchedDirectories as $directory) { if (is_dir(ROOTPATH . $directory)) { - $hashes[] = $this->hashDirectory(ROOTPATH . $directory); + $hashes[$directory] = $this->hashDirectory(ROOTPATH . $directory); } } @@ -44,6 +45,10 @@ public function hashApp(): array */ public function hashDirectory(string $path): string { + if (! is_dir($path)) { + throw FrameworkException::forInvalidDirectory($path); + } + $directory = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS); $filter = new IteratorFilter($directory); $iterator = new RecursiveIteratorIterator($filter); diff --git a/system/Language/en/Core.php b/system/Language/en/Core.php index 9ab549a4c8fe..1adfbe446560 100644 --- a/system/Language/en/Core.php +++ b/system/Language/en/Core.php @@ -14,6 +14,7 @@ 'copyError' => 'An error was encountered while attempting to replace the file "{0}". Please make sure your file directory is writable.', 'enabledZlibOutputCompression' => 'Your zlib.output_compression ini directive is turned on. This will not work well with output buffers.', 'invalidFile' => 'Invalid file: "{0}"', + 'invalidDirectory' => 'Directory does not exist: "{0}"', 'invalidPhpVersion' => 'Your PHP version must be {0} or higher to run CodeIgniter. Current version: {1}', 'missingExtension' => 'The framework needs the following extension(s) installed and loaded: "{0}".', 'noHandlers' => '"{0}" must provide at least one Handler.', diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php new file mode 100644 index 000000000000..48c19cf4baba --- /dev/null +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -0,0 +1,58 @@ +hasher = new DirectoryHasher(); + } + + public function testHashApp() + { + $results = $this->hasher->hashApp(); + + $this->assertIsArray($results); + $this->assertArrayHasKey('app', $results); + } + + public function testHashDirectoryInvalid() + { + $this->expectException(FrameworkException::class); + $this->expectExceptionMessage('Directory does not exist: "' . APPPATH . 'Foo"'); + + $this->hasher->hashDirectory(APPPATH . 'Foo'); + } + + public function testUniqueHashes() + { + $hash1 = $this->hasher->hashDirectory(APPPATH); + $hash2 = $this->hasher->hashDirectory(SYSTEMPATH); + + $this->assertNotEquals($hash1, $hash2); + } + + public function testRepeatableHashes() + { + $hash1 = $this->hasher->hashDirectory(APPPATH); + $hash2 = $this->hasher->hashDirectory(APPPATH); + + $this->assertEquals($hash1, $hash2); + } + + public function testHash() + { + $expected = md5(implode('', $this->hasher->hashApp())); + + $this->assertEquals($expected, $this->hasher->hash()); + } +} From 470bcb9234499a47b45c4a63b64164b06a39f9e7 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 22:30:25 -0500 Subject: [PATCH 3964/8282] Added michalsn's suggestion to rotate the image not the anchor. --- system/Debug/Toolbar/Views/toolbar.js | 2 +- system/Debug/Toolbar/Views/toolbar.tpl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js index 928dc947f768..073a76ab4312 100644 --- a/system/Debug/Toolbar/Views/toolbar.js +++ b/system/Debug/Toolbar/Views/toolbar.js @@ -613,7 +613,7 @@ var ciDebugBar = { setHotReloadState: function () { var btn = document.getElementById("debug-hot-reload").parentNode; - var btnImg = btn.firstElementChild; + var btnImg = btn.getElementsByTagName("img")[0]; var eventSource; // If the Hot Reload Collector is inactive stops here diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 3bc3df133b69..6e62340c6ded 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -35,7 +35,7 @@
        ↕ 🔅 - + From d2c8e455ee701d13f996b431850a1affbd28636e Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 22:43:48 -0500 Subject: [PATCH 3965/8282] fix: attempting to fix style, user guide, and other small errors --- user_guide_src/source/testing/debugging.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst index 84ebe8ce5950..138bf49af2bf 100644 --- a/user_guide_src/source/testing/debugging.rst +++ b/user_guide_src/source/testing/debugging.rst @@ -173,6 +173,8 @@ outer array's key is the name of the section on the Vars tab: .. literalinclude:: debugging/006.php +.. _debug-toolbar-hot-reload: + Hot Reloading ============= From c6b6341207ac038bd98bb20473bee0027d3864d7 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 22:44:12 -0500 Subject: [PATCH 3966/8282] fix: attempting to fix style, user guide, and other small errors --- app/Config/Events.php | 5 +++-- app/Config/Toolbar.php | 2 +- system/HotReloader/DirectoryHasher.php | 3 +++ system/HotReloader/HotReloader.php | 3 +++ system/HotReloader/IteratorFilter.php | 5 ++++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/Config/Events.php b/app/Config/Events.php index bb48c66efde8..e3cebdd3d2bd 100644 --- a/app/Config/Events.php +++ b/app/Config/Events.php @@ -4,6 +4,7 @@ use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; +use CodeIgniter\HotReloader\HotReloader; /* * -------------------------------------------------------------------- @@ -46,8 +47,8 @@ Services::toolbar()->respond(); // Hot Reload route - for framework use on the hot reloader. if (ENVIRONMENT === 'development') { - Services::routes()->get('__hot-reload', function() { - (new \CodeIgniter\HotReloader\HotReloader())->run(); + Services::routes()->get('__hot-reload', static function() { + (new HotReloader())->run(); }); } } diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php index 38a42b59f1cf..97fbda281287 100644 --- a/app/Config/Toolbar.php +++ b/app/Config/Toolbar.php @@ -113,6 +113,6 @@ class Toolbar extends BaseConfig * used to determine if the hot-reload feature should reload the page or not. */ public array $watchedExtensions = [ - 'php', 'css', 'js', 'html', 'svg', 'json', 'env' + 'php', 'css', 'js', 'html', 'svg', 'json', 'env', ]; } diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php index 7658ece8fdf3..b6acab63c311 100644 --- a/system/HotReloader/DirectoryHasher.php +++ b/system/HotReloader/DirectoryHasher.php @@ -7,6 +7,9 @@ use RecursiveDirectoryIterator; use RecursiveIteratorIterator; +/** + * @internal + */ class DirectoryHasher { /** diff --git a/system/HotReloader/HotReloader.php b/system/HotReloader/HotReloader.php index fd02e3f16199..3834042e4ce0 100644 --- a/system/HotReloader/HotReloader.php +++ b/system/HotReloader/HotReloader.php @@ -2,6 +2,9 @@ namespace CodeIgniter\HotReloader; +/** + * @internal + */ class HotReloader { public function run() diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index 903f7256f2af..bef1d20e4c31 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -5,7 +5,10 @@ use RecursiveFilterIterator; use RecursiveIterator; -class IteratorFilter extends RecursiveFilterIterator +/** + * @internal + */ +class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator { private array $watchedExtensions = []; From 2b52354fa98fd7a44faad8706b061741a785e4cd Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 22:46:46 -0500 Subject: [PATCH 3967/8282] fix: additional code style fix --- app/Config/Events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/Events.php b/app/Config/Events.php index e3cebdd3d2bd..993abd24ebc7 100644 --- a/app/Config/Events.php +++ b/app/Config/Events.php @@ -47,7 +47,7 @@ Services::toolbar()->respond(); // Hot Reload route - for framework use on the hot reloader. if (ENVIRONMENT === 'development') { - Services::routes()->get('__hot-reload', static function() { + Services::routes()->get('__hot-reload', static function () { (new HotReloader())->run(); }); } From 4463200e0812c23eb9d75c715ddf7bd5c624fdf7 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 22 May 2023 23:15:57 -0500 Subject: [PATCH 3968/8282] More style fixes --- system/HotReloader/DirectoryHasher.php | 15 +++++++++--- system/HotReloader/HotReloader.php | 24 +++++++++++++------ system/HotReloader/IteratorFilter.php | 14 +++++++++-- .../HotReloader/DirectoryHasherTest.php | 22 +++++++++++++---- 4 files changed, 58 insertions(+), 17 deletions(-) diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php index b6acab63c311..fac072fdb24a 100644 --- a/system/HotReloader/DirectoryHasher.php +++ b/system/HotReloader/DirectoryHasher.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace CodeIgniter\HotReloader; use CodeIgniter\Exceptions\FrameworkException; @@ -10,7 +19,7 @@ /** * @internal */ -class DirectoryHasher +final class DirectoryHasher { /** * Generates an md5 value of all directories that are watched by the @@ -53,8 +62,8 @@ public function hashDirectory(string $path): string } $directory = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS); - $filter = new IteratorFilter($directory); - $iterator = new RecursiveIteratorIterator($filter); + $filter = new IteratorFilter($directory); + $iterator = new RecursiveIteratorIterator($filter); $hashes = []; diff --git a/system/HotReloader/HotReloader.php b/system/HotReloader/HotReloader.php index 3834042e4ce0..2f10fae6a566 100644 --- a/system/HotReloader/HotReloader.php +++ b/system/HotReloader/HotReloader.php @@ -1,28 +1,37 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace CodeIgniter\HotReloader; /** * @internal */ -class HotReloader +final class HotReloader { public function run() { ini_set('zlib.output_compression', 'Off'); - header("Cache-Control: no-store"); - header("Content-Type: text/event-stream"); + header('Cache-Control: no-store'); + header('Content-Type: text/event-stream'); header('Access-Control-Allow-Methods: GET'); ob_end_clean(); set_time_limit(0); - $hasher = new DirectoryHasher(); + $hasher = new DirectoryHasher(); $appHash = $hasher->hash(); while (true) { - if( connection_status() != CONNECTION_NORMAL or connection_aborted() ) { + if (connection_status() !== CONNECTION_NORMAL || connection_aborted()) { break; } @@ -34,7 +43,8 @@ public function run() $this->sendEvent('reload', ['time' => date('Y-m-d H:i:s')]); break; - } elseif (rand(1, 10) > 8) { + } + if (mt_rand(1, 10) > 8) { $this->sendEvent('ping', ['time' => date('Y-m-d H:i:s')]); } @@ -48,7 +58,7 @@ public function run() private function sendEvent(string $event, array $data): void { echo "event: {$event}\n"; - echo "data: " . json_encode($data) ."\n\n"; + echo 'data: ' . json_encode($data) . "\n\n"; ob_flush(); flush(); diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index bef1d20e4c31..f3ce7aecf9ef 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace CodeIgniter\HotReloader; use RecursiveFilterIterator; @@ -8,7 +17,7 @@ /** * @internal */ -class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator +final class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator { private array $watchedExtensions = []; @@ -37,6 +46,7 @@ public function accept(): bool // Only consume files of interest. $ext = trim(strtolower($this->current()->getExtension()), '. '); - return in_array($ext, $this->watchedExtensions); + + return in_array($ext, $this->watchedExtensions, true); } } diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index 48c19cf4baba..a6113443ce33 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -1,16 +1,28 @@ + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + namespace Tests\System\HotReloader; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\HotReloader\DirectoryHasher; use CodeIgniter\Test\CIUnitTestCase; -class DirectoryHasherTest extends CIUnitTestCase +/** + * @internal + */ +final class DirectoryHasherTest extends CIUnitTestCase { protected DirectoryHasher $hasher; - public function setUp(): void + protected function setUp(): void { parent::setUp(); @@ -38,7 +50,7 @@ public function testUniqueHashes() $hash1 = $this->hasher->hashDirectory(APPPATH); $hash2 = $this->hasher->hashDirectory(SYSTEMPATH); - $this->assertNotEquals($hash1, $hash2); + $this->assertNotSame($hash1, $hash2); } public function testRepeatableHashes() @@ -46,13 +58,13 @@ public function testRepeatableHashes() $hash1 = $this->hasher->hashDirectory(APPPATH); $hash2 = $this->hasher->hashDirectory(APPPATH); - $this->assertEquals($hash1, $hash2); + $this->assertSame($hash1, $hash2); } public function testHash() { $expected = md5(implode('', $this->hasher->hashApp())); - $this->assertEquals($expected, $this->hasher->hash()); + $this->assertSame($expected, $this->hasher->hash()); } } From 884a91e3dabd867c74c7fc87c9490ff0d64a9ce8 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Mon, 5 Jun 2023 22:29:13 -0500 Subject: [PATCH 3969/8282] Rector updates --- tests/system/HotReloader/DirectoryHasherTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index a6113443ce33..c10bae8fa7c0 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -9,7 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace Tests\System\HotReloader; +namespace CodeIgniter\HotReloader; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\HotReloader\DirectoryHasher; @@ -20,7 +20,7 @@ */ final class DirectoryHasherTest extends CIUnitTestCase { - protected DirectoryHasher $hasher; + private DirectoryHasher $hasher; protected function setUp(): void { From 0bca6467f7149be6cc876dc9f183933fe676ea06 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Fri, 23 Jun 2023 23:34:27 -0500 Subject: [PATCH 3970/8282] Run cs-fix --- tests/system/HotReloader/DirectoryHasherTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index c10bae8fa7c0..08f2ea6eef2a 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -12,7 +12,6 @@ namespace CodeIgniter\HotReloader; use CodeIgniter\Exceptions\FrameworkException; -use CodeIgniter\HotReloader\DirectoryHasher; use CodeIgniter\Test\CIUnitTestCase; /** From 3fd7e4ba8d9fd119e327e4d098de197adf23a1f2 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Fri, 23 Jun 2023 23:47:04 -0500 Subject: [PATCH 3971/8282] CSS corrections, and other utility fixes --- admin/css/debug-toolbar/toolbar.scss | 12 +++++++++++- system/Debug/Toolbar/Views/toolbar.css | 1 + system/HotReloader/IteratorFilter.php | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index 23e0807fabfc..01dfd2207b15 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -198,7 +198,7 @@ overflow: hidden; overflow-y: auto; padding: 0 12px 0 12px; - + // Give room for OS X scrollbar white-space: nowrap; z-index: 10000; @@ -501,3 +501,13 @@ .debug-bar-noverflow { overflow: hidden; } + +/* ENDLESS ROTATE */ +.rotate { + animation: rotate 9s linear infinite; +} +@keyframes rotate { + to { + transform: rotate(360deg); + } +} diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index b8954dacfde3..60c3216bfc9c 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -807,6 +807,7 @@ .rotate { animation: rotate 9s linear infinite; } + @keyframes rotate { to { transform: rotate(360deg); diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index f3ce7aecf9ef..b98a028d2443 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -16,6 +16,9 @@ /** * @internal + * + * @template-extends RecursiveFilterIterator + * @template-implements RecursiveIterator */ final class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator { From a1bbe2dbce26e0c0b4a20bf4c8604147884563ef Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Fri, 23 Jun 2023 23:53:39 -0500 Subject: [PATCH 3972/8282] Attempting to make psalm happy --- system/HotReloader/IteratorFilter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index b98a028d2443..753cfdf8b1a9 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -17,8 +17,8 @@ /** * @internal * - * @template-extends RecursiveFilterIterator - * @template-implements RecursiveIterator + * @extends RecursiveFilterIterator + * @implements RecursiveIterator */ final class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator { From 7fd7cca6556f5cef3fa43edaa23c19c480afbb59 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sat, 24 Jun 2023 23:51:41 -0500 Subject: [PATCH 3973/8282] Run sass converter to generate toolbar.css --- system/Debug/Toolbar/Views/toolbar.css | 878 ++++++++++++------------- 1 file changed, 436 insertions(+), 442 deletions(-) diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index 60c3216bfc9c..38bab087ae81 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -7,327 +7,321 @@ * file that was distributed with this source code. */ #debug-icon { - bottom: 0; - position: fixed; - right: 0; - z-index: 10000; - height: 36px; - width: 36px; - margin: 0px; - padding: 0px; - clear: both; - text-align: center; + bottom: 0; + position: fixed; + right: 0; + z-index: 10000; + height: 36px; + width: 36px; + margin: 0px; + padding: 0px; + clear: both; + text-align: center; } #debug-icon a svg { - margin: 8px; - max-width: 20px; - max-height: 20px; + margin: 8px; + max-width: 20px; + max-height: 20px; } #debug-icon.fixed-top { - bottom: auto; - top: 0; + bottom: auto; + top: 0; } #debug-icon .debug-bar-ndisplay { - display: none; + display: none; } #debug-bar { - bottom: 0; - left: 0; - position: fixed; - right: 0; - z-index: 10000; - height: 36px; - line-height: 36px; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, - sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; - font-size: 16px; - font-weight: 400; + bottom: 0; + left: 0; + position: fixed; + right: 0; + z-index: 10000; + height: 36px; + line-height: 36px; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; + font-size: 16px; + font-weight: 400; } #debug-bar h1 { - display: flex; - font-weight: normal; - margin: 0 0 0 auto; + display: flex; + font-weight: normal; + margin: 0 0 0 auto; } #debug-bar h1 svg { - width: 16px; - margin-right: 5px; + width: 16px; + margin-right: 5px; } #debug-bar h2 { - font-size: 16px; - margin: 0; - padding: 5px 0 10px 0; + font-size: 16px; + margin: 0; + padding: 5px 0 10px 0; } #debug-bar h2 span { - font-size: 13px; + font-size: 13px; } #debug-bar h3 { - font-size: 12px; - font-weight: 200; - margin: 0 0 0 10px; - padding: 0; - text-transform: uppercase; + font-size: 12px; + font-weight: 200; + margin: 0 0 0 10px; + padding: 0; + text-transform: uppercase; } #debug-bar p { - font-size: 12px; - margin: 0 0 0 15px; - padding: 0; + font-size: 12px; + margin: 0 0 0 15px; + padding: 0; } #debug-bar a { - text-decoration: none; + text-decoration: none; } #debug-bar a:hover { - text-decoration: underline; + text-decoration: underline; } #debug-bar button { - border: 1px solid; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - cursor: pointer; - line-height: 15px; + border: 1px solid; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + cursor: pointer; + line-height: 15px; } #debug-bar button:hover { - text-decoration: underline; + text-decoration: underline; } #debug-bar table { - border-collapse: collapse; - font-size: 14px; - line-height: normal; - margin: 5px 10px 15px 10px; - width: calc(100% - 10px); + border-collapse: collapse; + font-size: 14px; + line-height: normal; + margin: 5px 10px 15px 10px; + width: calc(100% - 10px); } #debug-bar table strong { - font-weight: 500; + font-weight: 500; } #debug-bar table th { - display: table-cell; - font-weight: 600; - padding-bottom: 0.7em; - text-align: left; + display: table-cell; + font-weight: 600; + padding-bottom: 0.7em; + text-align: left; } #debug-bar table tr { - border: none; + border: none; } #debug-bar table td { - border: none; - display: table-cell; - margin: 0; - text-align: left; + border: none; + display: table-cell; + margin: 0; + text-align: left; } #debug-bar table td:first-child { - max-width: 20%; + max-width: 20%; } #debug-bar table td:first-child.narrow { - width: 7em; + width: 7em; } #debug-bar td[data-debugbar-route] form { - display: none; + display: none; } #debug-bar td[data-debugbar-route]:hover form { - display: block; + display: block; } #debug-bar td[data-debugbar-route]:hover > div { - display: none; + display: none; } -#debug-bar td[data-debugbar-route] input[type="text"] { - padding: 2px; +#debug-bar td[data-debugbar-route] input[type=text] { + padding: 2px; } #debug-bar .toolbar { - display: flex; - overflow: hidden; - overflow-y: auto; - padding: 0 12px 0 12px; - white-space: nowrap; - z-index: 10000; + display: flex; + overflow: hidden; + overflow-y: auto; + padding: 0 12px 0 12px; + white-space: nowrap; + z-index: 10000; } #debug-bar.fixed-top { - bottom: auto; - top: 0; + bottom: auto; + top: 0; } #debug-bar.fixed-top .tab { - bottom: auto; - top: 36px; + bottom: auto; + top: 36px; } #debug-bar #toolbar-position a, #debug-bar #toolbar-theme a { - padding: 0 6px; - display: inline-flex; - vertical-align: top; + padding: 0 6px; + display: inline-flex; + vertical-align: top; } #debug-bar #toolbar-position a:hover, #debug-bar #toolbar-theme a:hover { - text-decoration: none; + text-decoration: none; } #debug-bar #debug-bar-link { - display: flex; - padding: 6px; + display: flex; + padding: 6px; } #debug-bar .ci-label { - display: inline-flex; - font-size: 14px; + display: inline-flex; + font-size: 14px; } #debug-bar .ci-label:hover { - cursor: pointer; + cursor: pointer; } #debug-bar .ci-label a { - color: inherit; - display: flex; - letter-spacing: normal; - padding: 0 10px; - text-decoration: none; - align-items: center; + color: inherit; + display: flex; + letter-spacing: normal; + padding: 0 10px; + text-decoration: none; + align-items: center; } #debug-bar .ci-label img { - margin: 6px 3px 6px 0; - width: 16px !important; + margin: 6px 3px 6px 0; + width: 16px !important; } #debug-bar .ci-label .badge { - border-radius: 12px; - -moz-border-radius: 12px; - -webkit-border-radius: 12px; - display: inline-block; - font-size: 75%; - font-weight: bold; - line-height: 12px; - margin-left: 5px; - padding: 2px 5px; - text-align: center; - vertical-align: baseline; - white-space: nowrap; + border-radius: 12px; + -moz-border-radius: 12px; + -webkit-border-radius: 12px; + display: inline-block; + font-size: 75%; + font-weight: bold; + line-height: 12px; + margin-left: 5px; + padding: 2px 5px; + text-align: center; + vertical-align: baseline; + white-space: nowrap; } #debug-bar .tab { - bottom: 35px; - display: none; - left: 0; - max-height: 62%; - overflow: hidden; - overflow-y: auto; - padding: 1em 2em; - position: fixed; - right: 0; - z-index: 9999; + bottom: 35px; + display: none; + left: 0; + max-height: 62%; + overflow: hidden; + overflow-y: auto; + padding: 1em 2em; + position: fixed; + right: 0; + z-index: 9999; } #debug-bar .timeline { - margin-left: 0; - width: 100%; + margin-left: 0; + width: 100%; } #debug-bar .timeline th { - border-left: 1px solid; - font-size: 12px; - font-weight: 200; - padding: 5px 5px 10px 5px; - position: relative; - text-align: left; + border-left: 1px solid; + font-size: 12px; + font-weight: 200; + padding: 5px 5px 10px 5px; + position: relative; + text-align: left; } #debug-bar .timeline th:first-child { - border-left: 0; + border-left: 0; } #debug-bar .timeline td { - border-left: 1px solid; - padding: 5px; - position: relative; + border-left: 1px solid; + padding: 5px; + position: relative; } #debug-bar .timeline td:first-child { - border-left: 0; - max-width: none; + border-left: 0; + max-width: none; } #debug-bar .timeline td.child-container { - padding: 0px; + padding: 0px; } #debug-bar .timeline td.child-container .timeline { - margin: 0px; + margin: 0px; } -#debug-bar - .timeline - td.child-container - .timeline - td:first-child:not(.child-container) { - padding-left: calc(5px + 10px * var(--level)); +#debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) { + padding-left: calc(5px + 10px * var(--level)); } #debug-bar .timeline .timer { - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - display: inline-block; - padding: 5px; - position: absolute; - top: 30%; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + display: inline-block; + padding: 5px; + position: absolute; + top: 30%; } #debug-bar .timeline .timeline-parent { - cursor: pointer; + cursor: pointer; } #debug-bar .timeline .timeline-parent td:first-child nav { - background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") - no-repeat scroll 0 0/15px 75px transparent; - background-position: 0 25%; - display: inline-block; - height: 15px; - width: 15px; - margin-right: 3px; - vertical-align: middle; + background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent; + background-position: 0 25%; + display: inline-block; + height: 15px; + width: 15px; + margin-right: 3px; + vertical-align: middle; } #debug-bar .timeline .timeline-parent-open { - background-color: #dfdfdf; + background-color: #DFDFDF; } #debug-bar .timeline .timeline-parent-open td:first-child nav { - background-position: 0 75%; + background-position: 0 75%; } #debug-bar .timeline .child-row:hover { - background: transparent; + background: transparent; } #debug-bar .route-params, #debug-bar .route-params-item { - vertical-align: top; + vertical-align: top; } #debug-bar .route-params td:first-child, #debug-bar .route-params-item td:first-child { - font-style: italic; - padding-left: 1em; - text-align: right; + font-style: italic; + padding-left: 1em; + text-align: right; } .debug-view.show-view { - border: 1px solid; - margin: 4px; + border: 1px solid; + margin: 4px; } .debug-view-path { - font-family: monospace; - font-size: 12px; - letter-spacing: normal; - min-height: 16px; - padding: 2px; - text-align: left; + font-family: monospace; + font-size: 12px; + letter-spacing: normal; + min-height: 16px; + padding: 2px; + text-align: left; } .show-view .debug-view-path { - display: block !important; + display: block !important; } @media screen and (max-width: 1024px) { - #debug-bar .ci-label img { - margin: unset; - } - .hide-sm { - display: none !important; - } + #debug-bar .ci-label img { + margin: unset; + } + .hide-sm { + display: none !important; + } } #debug-icon { - background-color: #ffffff; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited { - color: #dd8615; + color: #DD8615; } #debug-bar { - background-color: #ffffff; - color: #434343; + background-color: #FFFFFF; + color: #434343; } #debug-bar h1, #debug-bar h2, @@ -341,217 +335,217 @@ #debug-bar td, #debug-bar button, #debug-bar .toolbar { - background-color: transparent; - color: #434343; + background-color: transparent; + color: #434343; } #debug-bar button { - background-color: #ffffff; + background-color: #FFFFFF; } #debug-bar table strong { - color: #dd8615; + color: #DD8615; } #debug-bar table tbody tr:hover { - background-color: #dfdfdf; + background-color: #DFDFDF; } #debug-bar table tbody tr.current { - background-color: #fdc894; + background-color: #FDC894; } #debug-bar table tbody tr.current:hover td { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #debug-bar .toolbar { - background-color: #ffffff; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #debug-bar .toolbar img { - filter: brightness(0) invert(0.4); + filter: brightness(0) invert(0.4); } #debug-bar.fixed-top .toolbar { - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #debug-bar.fixed-top .tab { - box-shadow: 0 1px 4px #dfdfdf; - -moz-box-shadow: 0 1px 4px #dfdfdf; - -webkit-box-shadow: 0 1px 4px #dfdfdf; + box-shadow: 0 1px 4px #DFDFDF; + -moz-box-shadow: 0 1px 4px #DFDFDF; + -webkit-box-shadow: 0 1px 4px #DFDFDF; } #debug-bar .muted { - color: #434343; + color: #434343; } #debug-bar .muted td { - color: #dfdfdf; + color: #DFDFDF; } #debug-bar .muted:hover td { - color: #434343; + color: #434343; } #debug-bar #toolbar-position, #debug-bar #toolbar-theme { - filter: brightness(0) invert(0.6); + filter: brightness(0) invert(0.6); } #debug-bar .ci-label.active { - background-color: #dfdfdf; + background-color: #DFDFDF; } #debug-bar .ci-label:hover { - background-color: #dfdfdf; + background-color: #DFDFDF; } #debug-bar .ci-label .badge { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #debug-bar .tab { - background-color: #ffffff; - box-shadow: 0 -1px 4px #dfdfdf; - -moz-box-shadow: 0 -1px 4px #dfdfdf; - -webkit-box-shadow: 0 -1px 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 -1px 4px #DFDFDF; + -moz-box-shadow: 0 -1px 4px #DFDFDF; + -webkit-box-shadow: 0 -1px 4px #DFDFDF; } #debug-bar .timeline th, #debug-bar .timeline td { - border-color: #dfdfdf; + border-color: #DFDFDF; } #debug-bar .timeline .timer { - background-color: #dd8615; + background-color: #DD8615; } .debug-view.show-view { - border-color: #dd8615; + border-color: #DD8615; } .debug-view-path { - background-color: #fdc894; - color: #434343; + background-color: #FDC894; + color: #434343; } @media (prefers-color-scheme: dark) { - #debug-icon { - background-color: #252525; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; - } - #debug-icon a:active, - #debug-icon a:link, - #debug-icon a:visited { - color: #dd8615; - } - #debug-bar { - background-color: #252525; - color: #dfdfdf; - } - #debug-bar h1, - #debug-bar h2, - #debug-bar h3, - #debug-bar p, - #debug-bar a, - #debug-bar button, - #debug-bar table, - #debug-bar thead, - #debug-bar tr, - #debug-bar td, - #debug-bar button, - #debug-bar .toolbar { - background-color: transparent; - color: #dfdfdf; - } - #debug-bar button { - background-color: #252525; - } - #debug-bar table strong { - color: #dd8615; - } - #debug-bar table tbody tr:hover { - background-color: #434343; - } - #debug-bar table tbody tr.current { - background-color: #fdc894; - } - #debug-bar table tbody tr.current td { - color: #252525; - } - #debug-bar table tbody tr.current:hover td { - background-color: #dd4814; - color: #ffffff; - } - #debug-bar .toolbar { - background-color: #434343; - box-shadow: 0 0 4px #434343; - -moz-box-shadow: 0 0 4px #434343; - -webkit-box-shadow: 0 0 4px #434343; - } - #debug-bar .toolbar img { - filter: brightness(0) invert(1); - } - #debug-bar.fixed-top .toolbar { - box-shadow: 0 0 4px #434343; - -moz-box-shadow: 0 0 4px #434343; - -webkit-box-shadow: 0 0 4px #434343; - } - #debug-bar.fixed-top .tab { - box-shadow: 0 1px 4px #434343; - -moz-box-shadow: 0 1px 4px #434343; - -webkit-box-shadow: 0 1px 4px #434343; - } - #debug-bar .muted { - color: #dfdfdf; - } - #debug-bar .muted td { - color: #434343; - } - #debug-bar .muted:hover td { - color: #dfdfdf; - } - #debug-bar #toolbar-position, - #debug-bar #toolbar-theme { - filter: brightness(0) invert(0.6); - } - #debug-bar .ci-label.active { - background-color: #252525; - } - #debug-bar .ci-label:hover { - background-color: #252525; - } - #debug-bar .ci-label .badge { - background-color: #dd4814; - color: #ffffff; - } - #debug-bar .tab { - background-color: #252525; - box-shadow: 0 -1px 4px #434343; - -moz-box-shadow: 0 -1px 4px #434343; - -webkit-box-shadow: 0 -1px 4px #434343; - } - #debug-bar .timeline th, - #debug-bar .timeline td { - border-color: #434343; - } - #debug-bar .timeline .timer { - background-color: #dd8615; - } - .debug-view.show-view { - border-color: #dd8615; - } - .debug-view-path { - background-color: #fdc894; - color: #434343; - } + #debug-icon { + background-color: #252525; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; + } + #debug-icon a:active, + #debug-icon a:link, + #debug-icon a:visited { + color: #DD8615; + } + #debug-bar { + background-color: #252525; + color: #DFDFDF; + } + #debug-bar h1, + #debug-bar h2, + #debug-bar h3, + #debug-bar p, + #debug-bar a, + #debug-bar button, + #debug-bar table, + #debug-bar thead, + #debug-bar tr, + #debug-bar td, + #debug-bar button, + #debug-bar .toolbar { + background-color: transparent; + color: #DFDFDF; + } + #debug-bar button { + background-color: #252525; + } + #debug-bar table strong { + color: #DD8615; + } + #debug-bar table tbody tr:hover { + background-color: #434343; + } + #debug-bar table tbody tr.current { + background-color: #FDC894; + } + #debug-bar table tbody tr.current td { + color: #252525; + } + #debug-bar table tbody tr.current:hover td { + background-color: #DD4814; + color: #FFFFFF; + } + #debug-bar .toolbar { + background-color: #434343; + box-shadow: 0 0 4px #434343; + -moz-box-shadow: 0 0 4px #434343; + -webkit-box-shadow: 0 0 4px #434343; + } + #debug-bar .toolbar img { + filter: brightness(0) invert(1); + } + #debug-bar.fixed-top .toolbar { + box-shadow: 0 0 4px #434343; + -moz-box-shadow: 0 0 4px #434343; + -webkit-box-shadow: 0 0 4px #434343; + } + #debug-bar.fixed-top .tab { + box-shadow: 0 1px 4px #434343; + -moz-box-shadow: 0 1px 4px #434343; + -webkit-box-shadow: 0 1px 4px #434343; + } + #debug-bar .muted { + color: #DFDFDF; + } + #debug-bar .muted td { + color: #434343; + } + #debug-bar .muted:hover td { + color: #DFDFDF; + } + #debug-bar #toolbar-position, + #debug-bar #toolbar-theme { + filter: brightness(0) invert(0.6); + } + #debug-bar .ci-label.active { + background-color: #252525; + } + #debug-bar .ci-label:hover { + background-color: #252525; + } + #debug-bar .ci-label .badge { + background-color: #DD4814; + color: #FFFFFF; + } + #debug-bar .tab { + background-color: #252525; + box-shadow: 0 -1px 4px #434343; + -moz-box-shadow: 0 -1px 4px #434343; + -webkit-box-shadow: 0 -1px 4px #434343; + } + #debug-bar .timeline th, + #debug-bar .timeline td { + border-color: #434343; + } + #debug-bar .timeline .timer { + background-color: #DD8615; + } + .debug-view.show-view { + border-color: #DD8615; + } + .debug-view-path { + background-color: #FDC894; + color: #434343; + } } #toolbarContainer.dark #debug-icon { - background-color: #252525; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + background-color: #252525; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited { - color: #dd8615; + color: #DD8615; } #toolbarContainer.dark #debug-bar { - background-color: #252525; - color: #dfdfdf; + background-color: #252525; + color: #DFDFDF; } #toolbarContainer.dark #debug-bar h1, #toolbarContainer.dark #debug-bar h2, @@ -565,109 +559,109 @@ #toolbarContainer.dark #debug-bar td, #toolbarContainer.dark #debug-bar button, #toolbarContainer.dark #debug-bar .toolbar { - background-color: transparent; - color: #dfdfdf; + background-color: transparent; + color: #DFDFDF; } #toolbarContainer.dark #debug-bar button { - background-color: #252525; + background-color: #252525; } #toolbarContainer.dark #debug-bar table strong { - color: #dd8615; + color: #DD8615; } #toolbarContainer.dark #debug-bar table tbody tr:hover { - background-color: #434343; + background-color: #434343; } #toolbarContainer.dark #debug-bar table tbody tr.current { - background-color: #fdc894; + background-color: #FDC894; } #toolbarContainer.dark #debug-bar table tbody tr.current td { - color: #252525; + color: #252525; } #toolbarContainer.dark #debug-bar table tbody tr.current:hover td { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #toolbarContainer.dark #debug-bar .toolbar { - background-color: #434343; - box-shadow: 0 0 4px #434343; - -moz-box-shadow: 0 0 4px #434343; - -webkit-box-shadow: 0 0 4px #434343; + background-color: #434343; + box-shadow: 0 0 4px #434343; + -moz-box-shadow: 0 0 4px #434343; + -webkit-box-shadow: 0 0 4px #434343; } #toolbarContainer.dark #debug-bar .toolbar img { - filter: brightness(0) invert(1); + filter: brightness(0) invert(1); } #toolbarContainer.dark #debug-bar.fixed-top .toolbar { - box-shadow: 0 0 4px #434343; - -moz-box-shadow: 0 0 4px #434343; - -webkit-box-shadow: 0 0 4px #434343; + box-shadow: 0 0 4px #434343; + -moz-box-shadow: 0 0 4px #434343; + -webkit-box-shadow: 0 0 4px #434343; } #toolbarContainer.dark #debug-bar.fixed-top .tab { - box-shadow: 0 1px 4px #434343; - -moz-box-shadow: 0 1px 4px #434343; - -webkit-box-shadow: 0 1px 4px #434343; + box-shadow: 0 1px 4px #434343; + -moz-box-shadow: 0 1px 4px #434343; + -webkit-box-shadow: 0 1px 4px #434343; } #toolbarContainer.dark #debug-bar .muted { - color: #dfdfdf; + color: #DFDFDF; } #toolbarContainer.dark #debug-bar .muted td { - color: #434343; + color: #434343; } #toolbarContainer.dark #debug-bar .muted:hover td { - color: #dfdfdf; + color: #DFDFDF; } #toolbarContainer.dark #debug-bar #toolbar-position, #toolbarContainer.dark #debug-bar #toolbar-theme { - filter: brightness(0) invert(0.6); + filter: brightness(0) invert(0.6); } #toolbarContainer.dark #debug-bar .ci-label.active { - background-color: #252525; + background-color: #252525; } #toolbarContainer.dark #debug-bar .ci-label:hover { - background-color: #252525; + background-color: #252525; } #toolbarContainer.dark #debug-bar .ci-label .badge { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #toolbarContainer.dark #debug-bar .tab { - background-color: #252525; - box-shadow: 0 -1px 4px #434343; - -moz-box-shadow: 0 -1px 4px #434343; - -webkit-box-shadow: 0 -1px 4px #434343; + background-color: #252525; + box-shadow: 0 -1px 4px #434343; + -moz-box-shadow: 0 -1px 4px #434343; + -webkit-box-shadow: 0 -1px 4px #434343; } #toolbarContainer.dark #debug-bar .timeline th, #toolbarContainer.dark #debug-bar .timeline td { - border-color: #434343; + border-color: #434343; } #toolbarContainer.dark #debug-bar .timeline .timer { - background-color: #dd8615; + background-color: #DD8615; } #toolbarContainer.dark .debug-view.show-view { - border-color: #dd8615; + border-color: #DD8615; } #toolbarContainer.dark .debug-view-path { - background-color: #fdc894; - color: #434343; + background-color: #FDC894; + color: #434343; } -#toolbarContainer.dark td[data-debugbar-route] input[type="text"] { - background: #000; - color: #fff; +#toolbarContainer.dark td[data-debugbar-route] input[type=text] { + background: #000; + color: #fff; } #toolbarContainer.light #debug-icon { - background-color: #ffffff; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited { - color: #dd8615; + color: #DD8615; } #toolbarContainer.light #debug-bar { - background-color: #ffffff; - color: #434343; + background-color: #FFFFFF; + color: #434343; } #toolbarContainer.light #debug-bar h1, #toolbarContainer.light #debug-bar h2, @@ -681,135 +675,135 @@ #toolbarContainer.light #debug-bar td, #toolbarContainer.light #debug-bar button, #toolbarContainer.light #debug-bar .toolbar { - background-color: transparent; - color: #434343; + background-color: transparent; + color: #434343; } #toolbarContainer.light #debug-bar button { - background-color: #ffffff; + background-color: #FFFFFF; } #toolbarContainer.light #debug-bar table strong { - color: #dd8615; + color: #DD8615; } #toolbarContainer.light #debug-bar table tbody tr:hover { - background-color: #dfdfdf; + background-color: #DFDFDF; } #toolbarContainer.light #debug-bar table tbody tr.current { - background-color: #fdc894; + background-color: #FDC894; } #toolbarContainer.light #debug-bar table tbody tr.current:hover td { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #toolbarContainer.light #debug-bar .toolbar { - background-color: #ffffff; - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #toolbarContainer.light #debug-bar .toolbar img { - filter: brightness(0) invert(0.4); + filter: brightness(0) invert(0.4); } #toolbarContainer.light #debug-bar.fixed-top .toolbar { - box-shadow: 0 0 4px #dfdfdf; - -moz-box-shadow: 0 0 4px #dfdfdf; - -webkit-box-shadow: 0 0 4px #dfdfdf; + box-shadow: 0 0 4px #DFDFDF; + -moz-box-shadow: 0 0 4px #DFDFDF; + -webkit-box-shadow: 0 0 4px #DFDFDF; } #toolbarContainer.light #debug-bar.fixed-top .tab { - box-shadow: 0 1px 4px #dfdfdf; - -moz-box-shadow: 0 1px 4px #dfdfdf; - -webkit-box-shadow: 0 1px 4px #dfdfdf; + box-shadow: 0 1px 4px #DFDFDF; + -moz-box-shadow: 0 1px 4px #DFDFDF; + -webkit-box-shadow: 0 1px 4px #DFDFDF; } #toolbarContainer.light #debug-bar .muted { - color: #434343; + color: #434343; } #toolbarContainer.light #debug-bar .muted td { - color: #dfdfdf; + color: #DFDFDF; } #toolbarContainer.light #debug-bar .muted:hover td { - color: #434343; + color: #434343; } #toolbarContainer.light #debug-bar #toolbar-position, #toolbarContainer.light #debug-bar #toolbar-theme { - filter: brightness(0) invert(0.6); + filter: brightness(0) invert(0.6); } #toolbarContainer.light #debug-bar .ci-label.active { - background-color: #dfdfdf; + background-color: #DFDFDF; } #toolbarContainer.light #debug-bar .ci-label:hover { - background-color: #dfdfdf; + background-color: #DFDFDF; } #toolbarContainer.light #debug-bar .ci-label .badge { - background-color: #dd4814; - color: #ffffff; + background-color: #DD4814; + color: #FFFFFF; } #toolbarContainer.light #debug-bar .tab { - background-color: #ffffff; - box-shadow: 0 -1px 4px #dfdfdf; - -moz-box-shadow: 0 -1px 4px #dfdfdf; - -webkit-box-shadow: 0 -1px 4px #dfdfdf; + background-color: #FFFFFF; + box-shadow: 0 -1px 4px #DFDFDF; + -moz-box-shadow: 0 -1px 4px #DFDFDF; + -webkit-box-shadow: 0 -1px 4px #DFDFDF; } #toolbarContainer.light #debug-bar .timeline th, #toolbarContainer.light #debug-bar .timeline td { - border-color: #dfdfdf; + border-color: #DFDFDF; } #toolbarContainer.light #debug-bar .timeline .timer { - background-color: #dd8615; + background-color: #DD8615; } #toolbarContainer.light .debug-view.show-view { - border-color: #dd8615; + border-color: #DD8615; } #toolbarContainer.light .debug-view-path { - background-color: #fdc894; - color: #434343; + background-color: #FDC894; + color: #434343; } .debug-bar-width30 { - width: 30%; + width: 30%; } .debug-bar-width10 { - width: 10%; + width: 10%; } .debug-bar-width70p { - width: 70px; + width: 70px; } .debug-bar-width190p { - width: 190px; + width: 190px; } .debug-bar-width20e { - width: 20em; + width: 20em; } .debug-bar-width6r { - width: 6rem; + width: 6rem; } .debug-bar-ndisplay { - display: none; + display: none; } .debug-bar-alignRight { - text-align: right; + text-align: right; } .debug-bar-alignLeft { - text-align: left; + text-align: left; } .debug-bar-noverflow { - overflow: hidden; + overflow: hidden; } /* ENDLESS ROTATE */ .rotate { - animation: rotate 9s linear infinite; + animation: rotate 9s linear infinite; } @keyframes rotate { - to { - transform: rotate(360deg); - } + to { + transform: rotate(360deg); + } } From b1a2e1db503d8808486b0528b31967968d06376b Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sat, 24 Jun 2023 23:53:20 -0500 Subject: [PATCH 3974/8282] Suppress Psalm errors on IteratorFilter --- system/HotReloader/IteratorFilter.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index 753cfdf8b1a9..7f40a464d0ac 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -17,8 +17,7 @@ /** * @internal * - * @extends RecursiveFilterIterator - * @implements RecursiveIterator + * @psalm-suppress MissingTemplateParam */ final class IteratorFilter extends RecursiveFilterIterator implements RecursiveIterator { From fc5bd0290b90ef916365b954dda152280b0f4843 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sun, 25 Jun 2023 00:01:58 -0500 Subject: [PATCH 3975/8282] Add missing group to test --- tests/system/HotReloader/DirectoryHasherTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index 08f2ea6eef2a..f5de5da523d5 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -16,6 +16,8 @@ /** * @internal + * + * @group Others */ final class DirectoryHasherTest extends CIUnitTestCase { From ac761f0a12df8ae88675b530bb2cb429eecc3393 Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sun, 25 Jun 2023 23:34:19 -0500 Subject: [PATCH 3976/8282] Apply suggestions from code review Co-authored-by: kenjis --- user_guide_src/source/testing/debugging.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst index 138bf49af2bf..6c589ead52aa 100644 --- a/user_guide_src/source/testing/debugging.rst +++ b/user_guide_src/source/testing/debugging.rst @@ -178,10 +178,12 @@ outer array's key is the name of the section on the Vars tab: Hot Reloading ============= +.. versionadded:: 4.4.0 + The Debug Toolbar includes a feature called Hot Reloading that allows you to make changes to your application's code and have them automatically reloaded in the browser without having to refresh the page. This is a great time-saver during development. To enable Hot Reloading while you are developing, you can click the button on the left side of the toolbar that looks like a refresh icon. This will enable Hot Reloading for all pages until you disable it. -Hot Reloading works by scanning the files within the ``app`` directory every second and looking for changes. If it finds any, it will send a message to the browser to reload the page. It does not scan any other directories, so if you are making changes to files outside of the ``app`` directory, you will need to manually refresh the page. +Hot Reloading works by scanning the files within the **app** directory every second and looking for changes. If it finds any, it will send a message to the browser to reload the page. It does not scan any other directories, so if you are making changes to files outside of the **app** directory, you will need to manually refresh the page. -If you need to watch files outside of the ``app`` directory, or are finding it slow due to the size of your project, you can specify the directories to scan and the file extensions to scan for in the ``$toolbarRefreshDirs`` and ``$toolbarRefreshExtensions`` properties of the **app/Config/Toolbar.php** configuration file. +If you need to watch files outside of the **app** directory, or are finding it slow due to the size of your project, you can specify the directories to scan and the file extensions to scan for in the ``$watchedDirectories`` and ``$watchedExtensions`` properties of the **app/Config/Toolbar.php** configuration file. From 3b67f49045d2f708942e73da0de557dc61c6e55f Mon Sep 17 00:00:00 2001 From: Lonnie Ezell Date: Sun, 25 Jun 2023 23:35:42 -0500 Subject: [PATCH 3977/8282] Categorize the changelog entry for hot reloading --- user_guide_src/source/changelogs/v4.4.0.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 432e5e12ae20..a082ba483447 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -56,8 +56,6 @@ Method Signature Changes Enhancements ************ -- The Debug Toolbar now has a new "Hot Reload" feature that can be used to automatically reload the page when a file is changed. See :ref:`debug-toolbar-hot-reload`. - Commands ======== @@ -67,6 +65,8 @@ Commands Testing ======= +- The Debug Toolbar now has a new "Hot Reload" feature that can be used to automatically reload the page when a file is changed. See :ref:`debug-toolbar-hot-reload`. + Database ======== From e8be829abdd4bb01841983d54aac9aaed29a89c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 14:52:17 +0900 Subject: [PATCH 3978/8282] refactor: use ::class to config() param --- system/Config/Services.php | 3 ++- system/HotReloader/DirectoryHasher.php | 3 ++- system/HotReloader/IteratorFilter.php | 3 ++- system/Security/Security.php | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index e337a63b8bb5..89a49b4bf468 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -76,6 +76,7 @@ use Config\Modules; use Config\Pager as PagerConfig; use Config\Paths; +use Config\Routing; use Config\Services as AppServices; use Config\Session as SessionConfig; use Config\Toolbar as ToolbarConfig; @@ -599,7 +600,7 @@ public static function routes(bool $getShared = true) return static::getSharedInstance('routes'); } - return new RouteCollection(AppServices::locator(), config(Modules::class), config('Routing')); + return new RouteCollection(AppServices::locator(), config(Modules::class), config(Routing::class)); } /** diff --git a/system/HotReloader/DirectoryHasher.php b/system/HotReloader/DirectoryHasher.php index fac072fdb24a..3d9914d8c8f8 100644 --- a/system/HotReloader/DirectoryHasher.php +++ b/system/HotReloader/DirectoryHasher.php @@ -12,6 +12,7 @@ namespace CodeIgniter\HotReloader; use CodeIgniter\Exceptions\FrameworkException; +use Config\Toolbar; use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; @@ -40,7 +41,7 @@ public function hashApp(): array { $hashes = []; - $watchedDirectories = config('Toolbar')->watchedDirectories; + $watchedDirectories = config(Toolbar::class)->watchedDirectories; foreach ($watchedDirectories as $directory) { if (is_dir(ROOTPATH . $directory)) { diff --git a/system/HotReloader/IteratorFilter.php b/system/HotReloader/IteratorFilter.php index 7f40a464d0ac..db775f90061e 100644 --- a/system/HotReloader/IteratorFilter.php +++ b/system/HotReloader/IteratorFilter.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HotReloader; +use Config\Toolbar; use RecursiveFilterIterator; use RecursiveIterator; @@ -27,7 +28,7 @@ public function __construct(RecursiveIterator $iterator) { parent::__construct($iterator); - $this->watchedExtensions = config('Toolbar')->watchedExtensions; + $this->watchedExtensions = config(Toolbar::class)->watchedExtensions; } /** diff --git a/system/Security/Security.php b/system/Security/Security.php index 29a9314a2e5d..d7a5d49c6f09 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -194,8 +194,7 @@ public function __construct(App $config) } if ($this->isCSRFCookie()) { - /** @var CookieConfig $cookie */ - $cookie = config('Cookie'); + $cookie = config(CookieConfig::class); $this->configureCookie($cookie); } else { From ec5cb2fcb9d2790ec7000c2dc4967db7b2925175 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 15:05:54 +0900 Subject: [PATCH 3979/8282] refactor: add workaround for old Config\App file --- system/HTTP/RequestTrait.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 7c703c3a9c47..3bbcf936a91f 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -66,6 +66,11 @@ public function getIPAddress(): string // @phpstan-ignore-next-line $proxyIPs = $this->proxyIPs ?? config(App::class)->proxyIPs; // @phpstan-ignore-next-line + + // Workaround for old Config\App file. App::$proxyIPs may be empty string. + if ($proxyIPs === '') { + $proxyIPs = []; + } if (! empty($proxyIPs) && (! is_array($proxyIPs) || is_int(array_key_first($proxyIPs)))) { throw new ConfigException( 'You must set an array with Proxy IP address key and HTTP header name value in Config\App::$proxyIPs.' From b819f9d4e76643ea5e08a96376b1c36e14eb166e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 15:10:00 +0900 Subject: [PATCH 3980/8282] refactor: by RemoveUnusedNonEmptyArrayBeforeForeachRector --- system/HTTP/RequestTrait.php | 106 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 54 deletions(-) diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 3bbcf936a91f..57f97982dea4 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -84,76 +84,74 @@ public function getIPAddress(): string return $this->ipAddress = '0.0.0.0'; } - if ($proxyIPs) { - // @TODO Extract all this IP address logic to another class. - foreach ($proxyIPs as $proxyIP => $header) { - // Check if we have an IP address or a subnet - if (strpos($proxyIP, '/') === false) { - // An IP address (and not a subnet) is specified. - // We can compare right away. - if ($proxyIP === $this->ipAddress) { - $spoof = $this->getClientIP($header); - - if ($spoof !== null) { - $this->ipAddress = $spoof; - break; - } - } + // @TODO Extract all this IP address logic to another class. + foreach ($proxyIPs as $proxyIP => $header) { + // Check if we have an IP address or a subnet + if (strpos($proxyIP, '/') === false) { + // An IP address (and not a subnet) is specified. + // We can compare right away. + if ($proxyIP === $this->ipAddress) { + $spoof = $this->getClientIP($header); - continue; + if ($spoof !== null) { + $this->ipAddress = $spoof; + break; + } } - // We have a subnet ... now the heavy lifting begins - if (! isset($separator)) { - $separator = $ipValidator($this->ipAddress, 'ipv6') ? ':' : '.'; - } + continue; + } - // If the proxy entry doesn't match the IP protocol - skip it - if (strpos($proxyIP, $separator) === false) { - continue; - } + // We have a subnet ... now the heavy lifting begins + if (! isset($separator)) { + $separator = $ipValidator($this->ipAddress, 'ipv6') ? ':' : '.'; + } - // Convert the REMOTE_ADDR IP address to binary, if needed - if (! isset($ip, $sprintf)) { - if ($separator === ':') { - // Make sure we're having the "full" IPv6 format - $ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress)); + // If the proxy entry doesn't match the IP protocol - skip it + if (strpos($proxyIP, $separator) === false) { + continue; + } - for ($j = 0; $j < 8; $j++) { - $ip[$j] = intval($ip[$j], 16); - } + // Convert the REMOTE_ADDR IP address to binary, if needed + if (! isset($ip, $sprintf)) { + if ($separator === ':') { + // Make sure we're having the "full" IPv6 format + $ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress)); - $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b'; - } else { - $ip = explode('.', $this->ipAddress); - $sprintf = '%08b%08b%08b%08b'; + for ($j = 0; $j < 8; $j++) { + $ip[$j] = intval($ip[$j], 16); } - $ip = vsprintf($sprintf, $ip); + $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b'; + } else { + $ip = explode('.', $this->ipAddress); + $sprintf = '%08b%08b%08b%08b'; } - // Split the netmask length off the network address - sscanf($proxyIP, '%[^/]/%d', $netaddr, $masklen); + $ip = vsprintf($sprintf, $ip); + } - // Again, an IPv6 address is most likely in a compressed form - if ($separator === ':') { - $netaddr = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($netaddr, ':')), $netaddr)); + // Split the netmask length off the network address + sscanf($proxyIP, '%[^/]/%d', $netaddr, $masklen); - for ($i = 0; $i < 8; $i++) { - $netaddr[$i] = intval($netaddr[$i], 16); - } - } else { - $netaddr = explode('.', $netaddr); + // Again, an IPv6 address is most likely in a compressed form + if ($separator === ':') { + $netaddr = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($netaddr, ':')), $netaddr)); + + for ($i = 0; $i < 8; $i++) { + $netaddr[$i] = intval($netaddr[$i], 16); } + } else { + $netaddr = explode('.', $netaddr); + } - // Convert to binary and finally compare - if (strncmp($ip, vsprintf($sprintf, $netaddr), $masklen) === 0) { - $spoof = $this->getClientIP($header); + // Convert to binary and finally compare + if (strncmp($ip, vsprintf($sprintf, $netaddr), $masklen) === 0) { + $spoof = $this->getClientIP($header); - if ($spoof !== null) { - $this->ipAddress = $spoof; - break; - } + if ($spoof !== null) { + $this->ipAddress = $spoof; + break; } } } From 1db90c402bded14b1ff5f269cde7275e9eb1e5d0 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 26 Jun 2023 13:07:39 +0200 Subject: [PATCH 3981/8282] fix: skip http proxy added header --- system/HTTP/CURLRequest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 377f51e46006..616ef143fde8 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -387,6 +387,10 @@ public function send(string $method, string $url) $output = substr($output, strpos($output, $breakString) + 4); } + if (strpos($output, 'HTTP/1.1 200 Connection established') === 0) { + $output = substr($output, strpos($output, $breakString) + 4); + } + // If request and response have Digest if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && strpos($output, 'WWW-Authenticate: Digest') !== false) { $output = substr($output, strpos($output, $breakString) + 4); From 9a41f6b18c6e6e6ff8cdb34f4e82e11481d5ec9b Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 26 Jun 2023 13:52:36 +0200 Subject: [PATCH 3982/8282] test: add testSendProxied --- tests/system/HTTP/CURLRequestTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 92c43cc58461..41ebee307374 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -718,6 +718,18 @@ public function testSendContinued() $this->assertSame('Hi there', $response->getBody()); } + public function testSendProxied() + { + $request = $this->getRequest([ + 'base_uri' => 'http://www.foo.com/api/v1/', + 'delay' => 100, + ]); + + $request->setOutput("HTTP/1.1 200 Connection established:\x0d\x0a\x0d\x0aHi there"); + $response = $request->get('answer'); + $this->assertSame('Hi there', $response->getBody()); + } + /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261 */ From 8d023d9255822e05c2b4622125518eec7348ce59 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 26 Jun 2023 13:55:32 +0200 Subject: [PATCH 3983/8282] fix: testSendProxied typo --- tests/system/HTTP/CURLRequestTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 41ebee307374..d1ae4ea5db06 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -725,7 +725,7 @@ public function testSendProxied() 'delay' => 100, ]); - $request->setOutput("HTTP/1.1 200 Connection established:\x0d\x0a\x0d\x0aHi there"); + $request->setOutput("HTTP/1.1 200 Connection established\x0d\x0a\x0d\x0aHi there"); $response = $request->get('answer'); $this->assertSame('Hi there', $response->getBody()); } From a20365b9c9877a4f6cc050403889439a69099371 Mon Sep 17 00:00:00 2001 From: Jozef Rebjak Date: Mon, 26 Jun 2023 14:02:04 +0200 Subject: [PATCH 3984/8282] test: improve testSendProxied --- tests/system/HTTP/CURLRequestTest.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index d1ae4ea5db06..d90b8847cbb6 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -718,18 +718,6 @@ public function testSendContinued() $this->assertSame('Hi there', $response->getBody()); } - public function testSendProxied() - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput("HTTP/1.1 200 Connection established\x0d\x0a\x0d\x0aHi there"); - $response = $request->get('answer'); - $this->assertSame('Hi there', $response->getBody()); - } - /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261 */ @@ -777,6 +765,21 @@ public function testSendContinuedWithManyHeaders() $this->assertSame(200, $response->getStatusCode()); } + public function testSendProxied() + { + $request = $this->getRequest([ + 'base_uri' => 'http://www.foo.com/api/v1/', + 'delay' => 100, + ]); + + $output = "HTTP/1.1 200 Connection established +Proxy-Agent: Fortinet-Proxy/1.0\x0d\x0a\x0d\x0aHTTP/1.1 200 OK\x0d\x0a\x0d\x0aHi there"; + $request->setOutput($output); + + $response = $request->get('answer'); + $this->assertSame('Hi there', $response->getBody()); + } + /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/7394 */ From e17ebddf11b7867bdf47529828404cc9d961c485 Mon Sep 17 00:00:00 2001 From: Christoph Potas Date: Mon, 26 Jun 2023 18:57:59 +0200 Subject: [PATCH 3985/8282] Fix sqlsrv default port connection refuse ~ ignore default port when constructr hostname for sqlsrv driver --- system/Database/SQLSRV/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php index 4e0ca987df9a..445c6bf5426b 100755 --- a/system/Database/SQLSRV/Connection.php +++ b/system/Database/SQLSRV/Connection.php @@ -121,7 +121,7 @@ public function connect(bool $persistent = false) unset($connection['UID'], $connection['PWD']); } - if (strpos($this->hostname, ',') === false && $this->port !== '') { + if (strpos($this->hostname, ',') === false && $this->port !== '' && (int)$this->port !== 1433) { $this->hostname .= ', ' . $this->port; } From c8aec65e79d9426f2e4e106b4eabf924a3b688bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 15:37:04 +0900 Subject: [PATCH 3986/8282] refactor: remove deprecated Request::$proxyIPs --- system/HTTP/Request.php | 16 +--------------- system/HTTP/RequestTrait.php | 13 ++----------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php index ebe602b18e38..d6eedf89c2ac 100644 --- a/system/HTTP/Request.php +++ b/system/HTTP/Request.php @@ -21,15 +21,6 @@ class Request extends OutgoingRequest implements RequestInterface { use RequestTrait; - /** - * Proxy IPs - * - * @var array - * - * @deprecated Check the App config directly - */ - protected $proxyIPs; - /** * Constructor. * @@ -37,13 +28,8 @@ class Request extends OutgoingRequest implements RequestInterface * * @deprecated The $config is no longer needed and will be removed in a future version */ - public function __construct($config = null) + public function __construct($config = null) // @phpstan-ignore-line { - /** - * @deprecated $this->proxyIps property will be removed in the future - */ - $this->proxyIPs = $config->proxyIPs; - if (empty($this->method)) { $this->method = $this->getServer('REQUEST_METHOD') ?? 'GET'; } diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index 57f97982dea4..32b0401bbbe9 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -60,17 +60,8 @@ public function getIPAddress(): string 'valid_ip', ]; - /** - * @deprecated $this->proxyIPs property will be removed in the future - */ - // @phpstan-ignore-next-line - $proxyIPs = $this->proxyIPs ?? config(App::class)->proxyIPs; - // @phpstan-ignore-next-line - - // Workaround for old Config\App file. App::$proxyIPs may be empty string. - if ($proxyIPs === '') { - $proxyIPs = []; - } + $proxyIPs = config(App::class)->proxyIPs; + if (! empty($proxyIPs) && (! is_array($proxyIPs) || is_int(array_key_first($proxyIPs)))) { throw new ConfigException( 'You must set an array with Proxy IP address key and HTTP header name value in Config\App::$proxyIPs.' From fe0b5f5c0cf1e53b4a142718f73b38973fbe9060 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 15:38:00 +0900 Subject: [PATCH 3987/8282] docs: add changelog and upgrade guide --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + user_guide_src/source/installation/upgrade_440.rst | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 2d8cbf5c73e1..ee2d31728b8d 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -137,6 +137,7 @@ Changes - **Config:** The deprecated Session items in **app/Config/App.php** has been removed. - **Config:** Routing settings have been moved to **app/Config/Routing.php** config file. See :ref:`Upgrading Guide `. +- **Request:** The deprecated property ``$proxyIPs`` has been removed. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. - **Autoloader:** Before v4.4.0, CodeIgniter autoloader did not allow special characters that are illegal in filenames on certain operating systems. diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index 9c765f24434b..586097a9cc30 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -72,6 +72,12 @@ Mandatory File Changes Config Files ============ +app/Config/App.php +------------------ + +- The property ``$proxyIPs`` must be an array. If you don't use proxy servers, + it must be ``public array $proxyIPs = [];``. + .. _upgrade-440-config-routing: app/Config/Routing.php From 38a2e4d23ac5a5ed58a27e750b9bfeb38bab0c8a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 15:48:26 +0900 Subject: [PATCH 3988/8282] test: update test code --- tests/system/HTTP/IncomingRequestTest.php | 16 +++++++++++----- tests/system/HTTP/RequestTest.php | 7 +++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index 2b61850ec579..2c1f7017a610 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Config\Factories; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\Files\UploadedFile; @@ -973,7 +974,8 @@ public function testGetIPAddressThruProxy() '10.0.1.200' => 'X-Forwarded-For', '192.168.5.0/24' => 'X-Forwarded-For', ]; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address @@ -990,7 +992,8 @@ public function testGetIPAddressThruProxyIPv6() $config->proxyIPs = [ '2001:db8::2:1' => 'X-Forwarded-For', ]; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address @@ -1075,7 +1078,8 @@ public function testGetIPAddressThruProxySubnet() $config = new App(); $config->proxyIPs = ['192.168.5.0/24' => 'X-Forwarded-For']; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address @@ -1090,7 +1094,8 @@ public function testGetIPAddressThruProxySubnetIPv6() $config = new App(); $config->proxyIPs = ['2001:db8:1234::/48' => 'X-Forwarded-For']; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address @@ -1166,7 +1171,8 @@ public function testGetIPAddressThruProxyInvalidConfigArray() $config = new App(); $config->proxyIPs = ['192.168.5.0/28']; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); $this->request->getIPAddress(); diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index 17cf45078fe0..4b54577d18ec 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -616,7 +617,8 @@ public function testGetIPAddressThruProxy() '10.0.1.200' => 'X-Forwarded-For', '192.168.5.0/24' => 'X-Forwarded-For', ]; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address @@ -667,7 +669,8 @@ public function testGetIPAddressThruProxySubnet() $config = new App(); $config->proxyIPs = ['192.168.5.0/24' => 'X-Forwarded-For']; - $this->request = new Request($config); + Factories::injectMock('config', App::class, $config); + $this->request = new Request(); $this->request->populateHeaders(); // we should see the original forwarded address From 55b57df25f0848a5968962611f133e93a6a9815b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 26 Jun 2023 20:37:41 +0900 Subject: [PATCH 3989/8282] chore: add system/HTTP/Request.php to skip --- rector.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rector.php b/rector.php index 238f94307649..1532d33471a3 100644 --- a/rector.php +++ b/rector.php @@ -92,6 +92,8 @@ __DIR__ . '/system/Debug/Exceptions.php', // @TODO remove if deprecated $httpVerb is removed __DIR__ . '/system/Router/AutoRouterImproved.php', + // @TODO remove if deprecated $config is removed + __DIR__ . '/system/HTTP/Request.php', ], // check on constant compare From 970899674cc65d4ed41e7ea5dceda708bae9cde7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 07:12:50 +0900 Subject: [PATCH 3990/8282] refactor: restore deprecated $proxyIPs --- system/HTTP/Request.php | 9 +++++++++ user_guide_src/source/changelogs/v4.4.0.rst | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php index d6eedf89c2ac..be15fc774835 100644 --- a/system/HTTP/Request.php +++ b/system/HTTP/Request.php @@ -21,6 +21,15 @@ class Request extends OutgoingRequest implements RequestInterface { use RequestTrait; + /** + * Proxy IPs + * + * @var array + * + * @deprecated 4.0.5 No longer used. Check the App config directly + */ + protected $proxyIPs; + /** * Constructor. * diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index ee2d31728b8d..2d8cbf5c73e1 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -137,7 +137,6 @@ Changes - **Config:** The deprecated Session items in **app/Config/App.php** has been removed. - **Config:** Routing settings have been moved to **app/Config/Routing.php** config file. See :ref:`Upgrading Guide `. -- **Request:** The deprecated property ``$proxyIPs`` has been removed. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. - **Autoloader:** Before v4.4.0, CodeIgniter autoloader did not allow special characters that are illegal in filenames on certain operating systems. From e9d9026a6f046c595a87511cd7eb2116d957bbdb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 07:13:26 +0900 Subject: [PATCH 3991/8282] docs: add versions for @deprecated --- system/HTTP/Request.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php index be15fc774835..26b7b8f460c8 100644 --- a/system/HTTP/Request.php +++ b/system/HTTP/Request.php @@ -35,7 +35,7 @@ class Request extends OutgoingRequest implements RequestInterface * * @param App $config * - * @deprecated The $config is no longer needed and will be removed in a future version + * @deprecated 4.0.5 The $config is no longer needed and will be removed in a future version */ public function __construct($config = null) // @phpstan-ignore-line { @@ -54,7 +54,7 @@ public function __construct($config = null) // @phpstan-ignore-line * @param string $ip IP Address * @param string $which IP protocol: 'ipv4' or 'ipv6' * - * @deprecated Use Validation instead + * @deprecated 4.0.5 Use Validation instead * * @codeCoverageIgnore */ @@ -68,7 +68,7 @@ public function isValidIP(?string $ip = null, ?string $which = null): bool * * @param bool $upper Whether to return in upper or lower case. * - * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent + * @deprecated 4.0.5 The $upper functionality will be removed and this will revert to its PSR-7 equivalent * * @codeCoverageIgnore */ @@ -82,7 +82,7 @@ public function getMethod(bool $upper = false): string * * @return $this * - * @deprecated Use withMethod() instead for immutability + * @deprecated 4.0.5 Use withMethod() instead for immutability * * @codeCoverageIgnore */ From a95676570dcf747f2fa82c9da56da0a1893b64dd Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 09:56:29 +0900 Subject: [PATCH 3992/8282] docs: fix PHPDoc I found another type data in the $route array. --- system/Router/RouteCollection.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index f535d392817c..fe3f2e99fa82 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -119,6 +119,7 @@ class RouteCollection implements RouteCollectionInterface * routeName => [ * 'route' => [ * routeKey(regex) => handler, + * or routeKey(regex)(from) => [routeKey(regex)(to) => handler], // redirect * ], * 'redirect' => statusCode, * ] From e0864515fdb8930c92f4909c97c2022f5d4e7346 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 10:42:38 +0900 Subject: [PATCH 3993/8282] refactor: stop reassignment --- system/Router/RouteCollection.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index fe3f2e99fa82..c111804e0ea4 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -640,12 +640,14 @@ public function addRedirect(string $from, string $to, int $status = 302) { // Use the named route's pattern if this is a named route. if (array_key_exists($to, $this->routes['*'])) { - $to = $this->routes['*'][$to]['route']; + $redirectTo = $this->routes['*'][$to]['route']; } elseif (array_key_exists($to, $this->routes['get'])) { - $to = $this->routes['get'][$to]['route']; + $redirectTo = $this->routes['get'][$to]['route']; + } else { + $redirectTo = $to; } - $this->create('*', $from, $to, ['redirect' => $status]); + $this->create('*', $from, $redirectTo, ['redirect' => $status]); return $this; } From aa569317d786b6fc9f173121a6b674c54362aaf7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 11:07:00 +0900 Subject: [PATCH 3994/8282] refactor: add variable To distinguish between from and routeKey. --- system/Router/RouteCollection.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index c111804e0ea4..08997a7bd6e6 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1388,10 +1388,11 @@ protected function create(string $verb, string $from, $to, ?array $options = nul } } + $routeKey = $from; // Replace our regex pattern placeholders with the actual thing // so that the Router doesn't need to know about any of this. foreach ($this->placeholders as $tag => $pattern) { - $from = str_ireplace(':' . $tag, $pattern, $from); + $routeKey = str_ireplace(':' . $tag, $pattern, $routeKey); } // If is redirect, No processing @@ -1406,7 +1407,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul $to = '\\' . ltrim($to, '\\'); } - $name = $options['as'] ?? $from; + $name = $options['as'] ?? $routeKey; helper('array'); @@ -1415,16 +1416,16 @@ protected function create(string $verb, string $from, $to, ?array $options = nul // routes should always be the "source of truth". // this works only because discovered routes are added just prior // to attempting to route the request. - $fromExists = dot_array_search('*.route.' . $from, $this->routes[$verb] ?? []) !== null; + $fromExists = dot_array_search('*.route.' . $routeKey, $this->routes[$verb] ?? []) !== null; if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) { return; } $this->routes[$verb][$name] = [ - 'route' => [$from => $to], + 'route' => [$routeKey => $to], ]; - $this->routesOptions[$verb][$from] = $options; + $this->routesOptions[$verb][$routeKey] = $options; // Is this a redirect? if (isset($options['redirect']) && is_numeric($options['redirect'])) { From 2af286417e271576ea6d192aa73735d2e12a045e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 11:28:12 +0900 Subject: [PATCH 3995/8282] refactor: rename parameter name --- system/Router/RouteCollection.php | 12 ++++++++---- system/Router/RouteCollectionInterface.php | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 08997a7bd6e6..6c3a7bc776e3 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -654,12 +654,14 @@ public function addRedirect(string $from, string $to, int $status = 302) /** * Determines if the route is a redirecting route. + * + * @param string $routeKey routeKey or route name */ - public function isRedirect(string $from): bool + public function isRedirect(string $routeKey): bool { foreach ($this->routes['*'] as $name => $route) { // Named route? - if ($name === $from || key($route['route']) === $from) { + if ($name === $routeKey || key($route['route']) === $routeKey) { return isset($route['redirect']) && is_numeric($route['redirect']); } } @@ -669,12 +671,14 @@ public function isRedirect(string $from): bool /** * Grabs the HTTP status code from a redirecting Route. + * + * @param string $routeKey routeKey or route name */ - public function getRedirectCode(string $from): int + public function getRedirectCode(string $routeKey): int { foreach ($this->routes['*'] as $name => $route) { // Named route? - if ($name === $from || key($route['route']) === $from) { + if ($name === $routeKey || key($route['route']) === $routeKey) { return $route['redirect'] ?? 0; } } diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php index 701e893dcd16..0ca43523a89b 100644 --- a/system/Router/RouteCollectionInterface.php +++ b/system/Router/RouteCollectionInterface.php @@ -179,12 +179,12 @@ public function reverseRoute(string $search, ...$params); /** * Determines if the route is a redirecting route. */ - public function isRedirect(string $from): bool; + public function isRedirect(string $routeKey): bool; /** * Grabs the HTTP status code from a redirecting Route. */ - public function getRedirectCode(string $from): int; + public function getRedirectCode(string $routeKey): int; /** * Get the flag that limit or not the routes with {locale} placeholder to App::$supportedLocales From 26be1f2c138eb1ee38cf0f1c8c2557f31a61488e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 12:09:45 +0900 Subject: [PATCH 3996/8282] refactor: rename parameter and variable name --- system/Router/RouteCollection.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 6c3a7bc776e3..5ed06fb0eb26 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1114,8 +1114,8 @@ public function reverseRoute(string $search, ...$params) // all routes to find a match. foreach ($this->routes as $collection) { foreach ($collection as $route) { - $from = key($route['route']); - $to = $route['route'][$from]; + $routeKey = key($route['route']); + $to = $route['route'][$routeKey]; // ignore closures if (! is_string($to)) { @@ -1139,7 +1139,7 @@ public function reverseRoute(string $search, ...$params) continue; } - return $this->buildReverseRoute($from, $params); + return $this->buildReverseRoute($routeKey, $params); } } @@ -1254,21 +1254,21 @@ protected function fillRouteParams(string $from, ?array $params = null): string * @param array $params One or more parameters to be passed to the route. * The last parameter allows you to set the locale. */ - protected function buildReverseRoute(string $from, array $params): string + protected function buildReverseRoute(string $routeKey, array $params): string { $locale = null; // Find all of our back-references in the original route - preg_match_all('/\(([^)]+)\)/', $from, $matches); + preg_match_all('/\(([^)]+)\)/', $routeKey, $matches); if (empty($matches[0])) { - if (strpos($from, '{locale}') !== false) { + if (strpos($routeKey, '{locale}') !== false) { $locale = $params[0] ?? null; } - $from = $this->replaceLocale($from, $locale); + $routeKey = $this->replaceLocale($routeKey, $locale); - return '/' . ltrim($from, '/'); + return '/' . ltrim($routeKey, '/'); } // Locale is passed? @@ -1286,13 +1286,13 @@ protected function buildReverseRoute(string $from, array $params): string // Ensure that the param we're inserting matches // the expected param type. - $pos = strpos($from, $pattern); - $from = substr_replace($from, $params[$index], $pos, strlen($pattern)); + $pos = strpos($routeKey, $pattern); + $routeKey = substr_replace($routeKey, $params[$index], $pos, strlen($pattern)); } - $from = $this->replaceLocale($from, $locale); + $routeKey = $this->replaceLocale($routeKey, $locale); - return '/' . ltrim($from, '/'); + return '/' . ltrim($routeKey, '/'); } /** From 7c125b90cf2b2614ae24d1c93b2686c398dcb9fc Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 14:59:58 +0900 Subject: [PATCH 3997/8282] perf: change RouteCollection::$routes structure --- system/Router/RouteCollection.php | 125 ++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 40 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 5ed06fb0eb26..b38844bbcdd8 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -116,13 +116,16 @@ class RouteCollection implements RouteCollectionInterface * * [ * verb => [ - * routeName => [ - * 'route' => [ - * routeKey(regex) => handler, - * or routeKey(regex)(from) => [routeKey(regex)(to) => handler], // redirect - * ], + * routeKey(regex) => [ + * 'name' => routeName + * 'handler' => handler, + * ], + * // redirect route + * or routeKey(regex)(from) => [ + * 'name' => routeName + * 'handler' => [routeKey(regex)(to) => handler], * 'redirect' => statusCode, - * ] + * ], * ], * ] */ @@ -139,6 +142,30 @@ class RouteCollection implements RouteCollectionInterface 'cli' => [], ]; + /** + * Array of routes names + * + * @var array + * + * [ + * verb => [ + * routeName => routeKey(regex) + * ], + * ] + */ + protected $routesNames = [ + '*' => [], + 'options' => [], + 'get' => [], + 'head' => [], + 'post' => [], + 'put' => [], + 'delete' => [], + 'trace' => [], + 'connect' => [], + 'cli' => [], + ]; + /** * Array of routes options * @@ -538,9 +565,8 @@ public function getRoutes(?string $verb = null): array // before any of the generic, "add" routes. $collection = $this->routes[$verb] + ($this->routes['*'] ?? []); - foreach ($collection as $r) { - $key = key($r['route']); - $routes[$key] = $r['route'][$key]; + foreach ($collection as $routeKey => $r) { + $routes[$routeKey] = $r['handler']; } } @@ -639,11 +665,16 @@ public function add(string $from, $to, ?array $options = null): RouteCollectionI public function addRedirect(string $from, string $to, int $status = 302) { // Use the named route's pattern if this is a named route. - if (array_key_exists($to, $this->routes['*'])) { - $redirectTo = $this->routes['*'][$to]['route']; - } elseif (array_key_exists($to, $this->routes['get'])) { - $redirectTo = $this->routes['get'][$to]['route']; + if (array_key_exists($to, $this->routesNames['*'])) { + $routeName = $to; + $routeKey = $this->routesNames['*'][$routeName]; + $redirectTo = [$routeKey => $this->routes['*'][$routeKey]['handler']]; + } elseif (array_key_exists($to, $this->routesNames['get'])) { + $routeName = $to; + $routeKey = $this->routesNames['get'][$routeName]; + $redirectTo = [$routeKey => $this->routes['get'][$routeKey]['handler']]; } else { + // The named route is not found. $redirectTo = $to; } @@ -659,11 +690,16 @@ public function addRedirect(string $from, string $to, int $status = 302) */ public function isRedirect(string $routeKey): bool { - foreach ($this->routes['*'] as $name => $route) { - // Named route? - if ($name === $routeKey || key($route['route']) === $routeKey) { - return isset($route['redirect']) && is_numeric($route['redirect']); - } + if (isset($this->routes['*'][$routeKey]['redirect'])) { + return true; + } + + // This logic is not used. Should be deprecated? + $routeName = $this->routes['*'][$routeKey]['name'] ?? null; + if ($routeName === $routeKey) { + $routeKey = $this->routesNames['*'][$routeName]; + + return isset($this->routes['*'][$routeKey]['redirect']); } return false; @@ -676,11 +712,16 @@ public function isRedirect(string $routeKey): bool */ public function getRedirectCode(string $routeKey): int { - foreach ($this->routes['*'] as $name => $route) { - // Named route? - if ($name === $routeKey || key($route['route']) === $routeKey) { - return $route['redirect'] ?? 0; - } + if (isset($this->routes['*'][$routeKey]['redirect'])) { + return $this->routes['*'][$routeKey]['redirect']; + } + + // This logic is not used. Should be deprecated? + $routeName = $this->routes['*'][$routeKey]['name'] ?? null; + if ($routeName === $routeKey) { + $routeKey = $this->routesNames['*'][$routeName]; + + return $this->routes['*'][$routeKey]['redirect']; } return 0; @@ -1095,9 +1136,11 @@ public function environment(string $env, Closure $callback): RouteCollectionInte public function reverseRoute(string $search, ...$params) { // Named routes get higher priority. - foreach ($this->routes as $collection) { + foreach ($this->routesNames as $collection) { if (array_key_exists($search, $collection)) { - return $this->buildReverseRoute(key($collection[$search]['route']), $params); + $routeKey = $collection[$search]; + + return $this->buildReverseRoute($routeKey, $params); } } @@ -1113,9 +1156,8 @@ public function reverseRoute(string $search, ...$params) // If it's not a named route, then loop over // all routes to find a match. foreach ($this->routes as $collection) { - foreach ($collection as $route) { - $routeKey = key($route['route']); - $to = $route['route'][$routeKey]; + foreach ($collection as $routeKey => $route) { + $to = $route['handler']; // ignore closures if (! is_string($to)) { @@ -1340,7 +1382,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul } // When redirecting to named route, $to is an array like `['zombies' => '\Zombies::index']`. - if (is_array($to) && count($to) === 2) { + if (is_array($to) && isset($to[0])) { $to = $this->processArrayCallableSyntax($from, $to); } @@ -1420,20 +1462,21 @@ protected function create(string $verb, string $from, $to, ?array $options = nul // routes should always be the "source of truth". // this works only because discovered routes are added just prior // to attempting to route the request. - $fromExists = dot_array_search('*.route.' . $routeKey, $this->routes[$verb] ?? []) !== null; - if ((isset($this->routes[$verb][$name]) || $fromExists) && ! $overwrite) { + $fromExists = isset($this->routes[$verb][$routeKey]); + if ((isset($this->routesNames[$verb][$name]) || $fromExists) && ! $overwrite) { return; } - $this->routes[$verb][$name] = [ - 'route' => [$routeKey => $to], + $this->routes[$verb][$routeKey] = [ + 'name' => $name, + 'handler' => $to, ]; - $this->routesOptions[$verb][$routeKey] = $options; + $this->routesNames[$verb][$name] = $routeKey; // Is this a redirect? if (isset($options['redirect']) && is_numeric($options['redirect'])) { - $this->routes['*'][$name]['redirect'] = $options['redirect']; + $this->routes['*'][$routeKey]['redirect'] = $options['redirect']; } } @@ -1574,12 +1617,15 @@ private function determineCurrentSubdomain() */ public function resetRoutes() { - $this->routes = ['*' => []]; + $this->routes = $this->routesNames = ['*' => []]; foreach ($this->defaultHTTPMethods as $verb) { - $this->routes[$verb] = []; + $this->routes[$verb] = []; + $this->routesNames[$verb] = []; } + $this->routesOptions = []; + $this->prioritizeDetected = false; $this->didDiscover = false; } @@ -1645,9 +1691,8 @@ public function getRegisteredControllers(?string $verb = '*'): array if ($verb === '*') { foreach ($this->defaultHTTPMethods as $tmpVerb) { - foreach ($this->routes[$tmpVerb] as $route) { - $routeKey = key($route['route']); - $controller = $this->getControllerName($route['route'][$routeKey]); + foreach ($this->routes[$tmpVerb] as $routeKey => $route) { + $controller = $this->getControllerName($route['handler']); if ($controller !== null) { $controllers[] = $controller; } From 579de5477c53987141c324fc36bc00e99c99b5ab Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 25 Jan 2023 17:37:20 +0900 Subject: [PATCH 3998/8282] refactor: remove unused variable --- system/Router/RouteCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index b38844bbcdd8..03078395b4d2 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1691,7 +1691,7 @@ public function getRegisteredControllers(?string $verb = '*'): array if ($verb === '*') { foreach ($this->defaultHTTPMethods as $tmpVerb) { - foreach ($this->routes[$tmpVerb] as $routeKey => $route) { + foreach ($this->routes[$tmpVerb] as $route) { $controller = $this->getControllerName($route['handler']); if ($controller !== null) { $controllers[] = $controller; From fea7e9a1ee0d690dae81536de69aafd616867ca1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 26 Jan 2023 08:04:09 +0900 Subject: [PATCH 3999/8282] refactor: rename variable name --- system/Router/RouteCollection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 03078395b4d2..d194d474a599 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1462,8 +1462,8 @@ protected function create(string $verb, string $from, $to, ?array $options = nul // routes should always be the "source of truth". // this works only because discovered routes are added just prior // to attempting to route the request. - $fromExists = isset($this->routes[$verb][$routeKey]); - if ((isset($this->routesNames[$verb][$name]) || $fromExists) && ! $overwrite) { + $routeKeyExists = isset($this->routes[$verb][$routeKey]); + if ((isset($this->routesNames[$verb][$name]) || $routeKeyExists) && ! $overwrite) { return; } From 3851f414918ef282742cefd54c4256b5048a02ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 30 Apr 2023 12:08:43 +0900 Subject: [PATCH 4000/8282] feat: add $from for future use --- system/Router/RouteCollection.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index d194d474a599..865c8aa696f7 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -119,12 +119,14 @@ class RouteCollection implements RouteCollectionInterface * routeKey(regex) => [ * 'name' => routeName * 'handler' => handler, + * 'from' => from, * ], * // redirect route * or routeKey(regex)(from) => [ * 'name' => routeName * 'handler' => [routeKey(regex)(to) => handler], * 'redirect' => statusCode, + * 'from' => from, * ], * ], * ] @@ -1470,6 +1472,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul $this->routes[$verb][$routeKey] = [ 'name' => $name, 'handler' => $to, + 'from' => $from, ]; $this->routesOptions[$verb][$routeKey] = $options; $this->routesNames[$verb][$name] = $routeKey; From 0c7a2bf48a01f16bdc8da8c9b350093f4eda9d14 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 30 Apr 2023 12:09:07 +0900 Subject: [PATCH 4001/8282] docs: update doc comment --- system/Router/RouteCollection.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 865c8aa696f7..030edf8f9ca1 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -117,16 +117,18 @@ class RouteCollection implements RouteCollectionInterface * [ * verb => [ * routeKey(regex) => [ - * 'name' => routeName - * 'handler' => handler, - * 'from' => from, + * 'name' => routeName + * 'handler' => handler, + * 'from' => from, * ], - * // redirect route - * or routeKey(regex)(from) => [ + * ], + * // redirect route + * '*' => [ + * routeKey(regex)(from) => [ * 'name' => routeName * 'handler' => [routeKey(regex)(to) => handler], + * 'from' => from, * 'redirect' => statusCode, - * 'from' => from, * ], * ], * ] From df8556ee1bc8d980e0cbdcf121c12c213cd2f6ca Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 09:40:25 +0900 Subject: [PATCH 4002/8282] docs: add changelog and upgrade note --- user_guide_src/source/changelogs/v4.4.0.rst | 2 ++ user_guide_src/source/installation/upgrade_440.rst | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 2d8cbf5c73e1..0e5db5e1fc23 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -144,6 +144,8 @@ Changes So if you installed CodeIgniter under the folder that contains the special characters like ``(``, ``)``, etc., CodeIgniter didn't work. Since v4.4.0, this restriction has been removed. +- **RouteCollection:** The array structure of the protected property ``$routes`` + has been modified for performance. Deprecations ************ diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index 9c765f24434b..a0c34f67e77b 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -66,6 +66,15 @@ Interface Changes Some interface changes have been made. Classes that implement them should update their APIs to reflect the changes. See :ref:`v440-interface-changes` for details. +RouteCollection::$routes +======================== + +The array structure of the protected property ``$routes`` has been modified for +performance. + +If you extend ``RouteCollection`` and use the ``$routes``, update your code to +match the new array structure. + Mandatory File Changes ********************** From d3b217cf25ba69abf834a3d4aaa687826a5bc12e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 09:50:12 +0900 Subject: [PATCH 4003/8282] chore: update Kint to 5.0.7 --- system/ThirdParty/Kint/Parser/Parser.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php index 5c7a40a3ac1a..50642b90a123 100644 --- a/system/ThirdParty/Kint/Parser/Parser.php +++ b/system/ThirdParty/Kint/Parser/Parser.php @@ -374,7 +374,11 @@ private function parseArray(array &$var, Value $o): Value } $stash = $val; - $copy[$i] = $refmarker; + try { + $copy[$i] = $refmarker; + } catch (TypeError $e) { + $child->reference = true; + } if ($val === $refmarker) { $child->reference = true; $val = $stash; From 818b1030c805c4d65621850e9168bde2aa9eae82 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 09:54:26 +0900 Subject: [PATCH 4004/8282] docs: fix RST format --- user_guide_src/source/changelogs/v4.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 2d8cbf5c73e1..e340d33cc667 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -154,7 +154,7 @@ Deprecations ``ExceptionHandler``. - **Autoloader:** ``Autoloader::sanitizeFilename()`` is deprecated. - **CodeIgniter:** ``CodeIgniter::$returnResponse`` property is deprecated. No longer used. -- **RedirectException:** ``\CodeIgniter\Router\Exceptions\RedirectException`` is deprecated. Use \CodeIgniter\HTTP\Exceptions\RedirectException instead. +- **RedirectException:** ``\CodeIgniter\Router\Exceptions\RedirectException`` is deprecated. Use ``\CodeIgniter\HTTP\Exceptions\RedirectException`` instead. - **Session:** The property ``$sessionDriverName``, ``$sessionCookieName``, ``$sessionExpiration``, ``$sessionSavePath``, ``$sessionMatchIP``, ``$sessionTimeToUpdate``, and ``$sessionRegenerateDestroy`` in ``Session`` are From 19f88fbdc53d97e7f1770bbb067ab401a5bc2ece Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 11:24:32 +0900 Subject: [PATCH 4005/8282] docs: fix incorrect description A named route cannot be used with RedirectException. --- user_guide_src/source/general/errors.rst | 2 +- user_guide_src/source/general/errors/010.php | 2 +- user_guide_src/source/general/errors/011.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index c46aed6572ce..163a7540084f 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -109,7 +109,7 @@ forcing a redirect to a specific route or URL: .. literalinclude:: errors/010.php -``$route`` may be a named route, relative URI, or a complete URL. You can also supply a +``$uri`` may be a URI path relative to baseURL, or a complete URL. You can also supply a redirect code to use instead of the default (``302``, "temporary redirect"): .. literalinclude:: errors/011.php diff --git a/user_guide_src/source/general/errors/010.php b/user_guide_src/source/general/errors/010.php index ff9cfee974ef..47ecb3c7853f 100644 --- a/user_guide_src/source/general/errors/010.php +++ b/user_guide_src/source/general/errors/010.php @@ -1,3 +1,3 @@ Date: Sun, 25 Jun 2023 23:47:42 -0500 Subject: [PATCH 4006/8282] chore: remove php-stan from the precommit hook --- admin/pre-commit | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/admin/pre-commit b/admin/pre-commit index ef13c4c7a43a..f64268277e72 100644 --- a/admin/pre-commit +++ b/admin/pre-commit @@ -20,22 +20,6 @@ if [ "$STAGED_PHP_FILES" != "" ]; then done fi -if [ "$FILES" != "" ]; then - echo "Running PHPStan..." - - # Run on whole codebase - if [ -d /proc/cygdrive ]; then - XDEBUG_MODE=off ./vendor/bin/phpstan analyse - else - XDEBUG_MODE=off php ./vendor/bin/phpstan analyse - fi - - if [ $? != 0 ]; then - echo "Fix the phpstan error(s) before commit." - exit 1 - fi -fi - if [ "$FILES" != "" ]; then echo "Running PHP CS Fixer..." From 29d6ddd2c26cd516800430ae880ae585eceba2bb Mon Sep 17 00:00:00 2001 From: Christoph Potas Date: Tue, 27 Jun 2023 12:14:58 +0200 Subject: [PATCH 4007/8282] Confirm Style Guide ~ add missing space (style guide) --- system/Database/SQLSRV/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php index 445c6bf5426b..555b0a21c3f1 100755 --- a/system/Database/SQLSRV/Connection.php +++ b/system/Database/SQLSRV/Connection.php @@ -121,7 +121,7 @@ public function connect(bool $persistent = false) unset($connection['UID'], $connection['PWD']); } - if (strpos($this->hostname, ',') === false && $this->port !== '' && (int)$this->port !== 1433) { + if (strpos($this->hostname, ',') === false && $this->port !== '' && (int) $this->port !== 1433) { $this->hostname .= ', ' . $this->port; } From 8b36556cfc0022f0452b4e7b2819e0680bbae573 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 07:15:35 +0900 Subject: [PATCH 4008/8282] docs: add note for RedirectException namespace --- user_guide_src/source/general/errors.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index d5de5ca1acbd..c2531586311d 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -104,6 +104,10 @@ This provides an exit code of 8. RedirectException ----------------- +.. note:: Since v4.4.0, the namespace of ``RedirectException`` has been changed. + Previously it was ``CodeIgniter\Router\Exceptions\RedirectException``. The + previous class is deprecated. + This exception is a special case allowing for overriding of all other response routing and forcing a redirect to a specific route or URL: From 8c6e8833834195c9856d8a34837aea30eee94c2d Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 09:29:26 +0900 Subject: [PATCH 4009/8282] feat: add request option `proxy` --- system/HTTP/CURLRequest.php | 6 ++++++ .../HTTP/CURLRequestDoNotShareOptionsTest.php | 14 ++++++++++++++ tests/system/HTTP/CURLRequestTest.php | 14 ++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 377f51e46006..0c8e8c455ffd 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -550,6 +550,12 @@ protected function setCURLOptions(array $curlOptions = [], array $config = []) } } + // Proxy + if (isset($config['proxy'])) { + $curlOptions[CURLOPT_HTTPPROXYTUNNEL] = true; + $curlOptions[CURLOPT_PROXY] = $config['proxy']; + } + // Debug if ($config['debug']) { $curlOptions[CURLOPT_VERBOSE] = 1; diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php index 7dcc47f40082..20e5435d7cad 100644 --- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php +++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php @@ -559,6 +559,20 @@ public function testSSLWithBadKey() ]); } + public function testProxyuOption() + { + $this->request->request('get', 'http://example.com', [ + 'proxy' => 'http://localhost:3128', + ]); + + $options = $this->request->curl_options; + + $this->assertArrayHasKey(CURLOPT_PROXY, $options); + $this->assertSame('http://localhost:3128', $options[CURLOPT_PROXY]); + $this->assertArrayHasKey(CURLOPT_HTTPPROXYTUNNEL, $options); + $this->assertTrue($options[CURLOPT_HTTPPROXYTUNNEL]); + } + public function testDebugOptionTrue() { $this->request->request('get', 'http://example.com', [ diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 92c43cc58461..6f99779e7c71 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -542,6 +542,20 @@ public function testSSLWithBadKey() ]); } + public function testProxyuOption() + { + $this->request->request('get', 'http://example.com', [ + 'proxy' => 'http://localhost:3128', + ]); + + $options = $this->request->curl_options; + + $this->assertArrayHasKey(CURLOPT_PROXY, $options); + $this->assertSame('http://localhost:3128', $options[CURLOPT_PROXY]); + $this->assertArrayHasKey(CURLOPT_HTTPPROXYTUNNEL, $options); + $this->assertTrue($options[CURLOPT_HTTPPROXYTUNNEL]); + } + public function testDebugOptionTrue() { $this->request->request('get', 'http://example.com', [ From 35d7d2941eaa9b1db1f23c6fd8191f39fc5f0dee Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 09:30:05 +0900 Subject: [PATCH 4010/8282] docs: update docs --- user_guide_src/source/changelogs/v4.4.0.rst | 3 ++- user_guide_src/source/libraries/curlrequest.rst | 11 +++++++++++ user_guide_src/source/libraries/curlrequest/035.php | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 user_guide_src/source/libraries/curlrequest/035.php diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index e340d33cc667..1668a181cef8 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -95,9 +95,10 @@ Libraries - **Validation:** Added ``Validation::getValidated()`` method that gets the actual validated data. See :ref:`validation-getting-validated-data` for details. - **Images:** The option ``$quality`` can now be used to compress WebP images. - - **Uploaded Files:** Added ``UploadedFiles::getClientPath()`` method that returns the value of the `full_path` index of the file if it was uploaded via directory upload. +- **CURLRequest:** Added a request option ``proxy``. See + :ref:`CURLRequest Class `. Helpers and Functions ===================== diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst index 18afd51f771c..b2ecbcdf5f0c 100644 --- a/user_guide_src/source/libraries/curlrequest.rst +++ b/user_guide_src/source/libraries/curlrequest.rst @@ -296,6 +296,17 @@ has been disabled. Any files that you want to send must be passed as instances o ``form_params`` for ``application/x-www-form-urlencoded`` requests, and ``multipart`` for ``multipart/form-data`` requests. +.. _curlrequest-request-options-proxy: + +proxy +===== + +.. versionadded:: 4.4.0 + +You can set a proxy by passing an associative array as the ``proxy`` option: + +.. literalinclude:: curlrequest/035.php + query ===== diff --git a/user_guide_src/source/libraries/curlrequest/035.php b/user_guide_src/source/libraries/curlrequest/035.php new file mode 100644 index 000000000000..a729f9f3be22 --- /dev/null +++ b/user_guide_src/source/libraries/curlrequest/035.php @@ -0,0 +1,7 @@ +request( + 'GET', + 'http://example.com', + ['proxy' => 'http://localhost:3128'] +); From 8f245905488603f27ee3120c82c76496ebd85489 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 10:27:11 +0900 Subject: [PATCH 4011/8282] docs: remove incorrect description A complete URL will be converted with base_url(). --- user_guide_src/source/general/errors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 163a7540084f..f5c4e1bd3d55 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -109,7 +109,7 @@ forcing a redirect to a specific route or URL: .. literalinclude:: errors/010.php -``$uri`` may be a URI path relative to baseURL, or a complete URL. You can also supply a +``$uri`` is a URI path relative to baseURL. You can also supply a redirect code to use instead of the default (``302``, "temporary redirect"): .. literalinclude:: errors/011.php From c72573a27a5154b6ffc129d9fe16155f71f51a22 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 10:28:44 +0900 Subject: [PATCH 4012/8282] docs: remove `route` It may imply a named route. --- user_guide_src/source/general/errors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index f5c4e1bd3d55..6d6ddeb51e77 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -105,7 +105,7 @@ RedirectException ----------------- This exception is a special case allowing for overriding of all other response routing and -forcing a redirect to a specific route or URL: +forcing a redirect to a specific URI: .. literalinclude:: errors/010.php From 2d5fcb2a9d5440e3dfa5b5c7471905232e0f3e4a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 11:11:20 +0900 Subject: [PATCH 4013/8282] docs: improve force_https() description --- user_guide_src/source/general/common_functions.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index a68d500ad315..5d41dde21fab 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -266,8 +266,11 @@ Miscellaneous Functions Checks to see if the page is currently being accessed via HTTPS. If it is, then nothing happens. If it is not, then the user is redirected back to the current URI - but through HTTPS. Will set the HTTP Strict Transport Security header, which instructs - modern browsers to automatically modify any HTTP requests to HTTPS requests for the $duration. + but through HTTPS. Will set the HTTP Strict Transport Security (HTST) header, which instructs + modern browsers to automatically modify any HTTP requests to HTTPS requests for the ``$duration``. + + .. note:: This function is also used when you set + ``Config\App:$forceGlobalSecureRequests`` to true. .. php:function:: function_usable($function_name) From 5fc525d94f52b31422e3606d44a3827ba324076f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 11:14:24 +0900 Subject: [PATCH 4014/8282] docs: fix comment header --- app/Config/App.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/App.php b/app/Config/App.php index 67eaf7da4bf5..f04703ba228c 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -126,7 +126,7 @@ class App extends BaseConfig /** * -------------------------------------------------------------------------- - * URI PROTOCOL + * Force Global Secure Requests * -------------------------------------------------------------------------- * * If true, this will force every request made to this application to be From 31a1351ee55390a76dad4363250dfa7fbece93eb Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 17:50:54 +0900 Subject: [PATCH 4015/8282] docs: add link to php.net --- user_guide_src/source/libraries/time.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst index c9baf8a8f597..d471ad8466f7 100644 --- a/user_guide_src/source/libraries/time.rst +++ b/user_guide_src/source/libraries/time.rst @@ -22,8 +22,12 @@ Instantiating ************* There are several ways that a new Time instance can be created. The first is simply to create a new instance -like any other class. When you do it this way, you can pass in a string representing the desired time. This can -be any string that PHP's strtotime function can parse: +like any other class. + +When you do it this way, you can pass in a string representing the desired time. This can +be any string that PHP's `strtotime()`_ function can parse: + +.. _strtotime(): https://www.php.net/manual/en/function.strtotime.php .. literalinclude:: time/001.php From dd94346a3abdaaac3ef8d14e63c101d318bf1c0b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 17:51:13 +0900 Subject: [PATCH 4016/8282] docs: text decration --- user_guide_src/source/libraries/time.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst index d471ad8466f7..2175a8c681a3 100644 --- a/user_guide_src/source/libraries/time.rst +++ b/user_guide_src/source/libraries/time.rst @@ -163,7 +163,7 @@ toDateTimeString() ================== This is the first of three helper methods to work with the `IntlDateFormatter `_ without having to remember their values. -This will return a localized version of string formatted as (Y-m-d H:i:s): +This will return a localized version of string formatted as (``Y-m-d H:i:s``): .. literalinclude:: time/016.php From 6fd54273fbff3f11acace09b13f90b532be00b22 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 28 Jun 2023 17:56:13 +0900 Subject: [PATCH 4017/8282] docs: change "with" in section titles to lowercase For consistency. --- user_guide_src/source/general/configuration.rst | 2 +- user_guide_src/source/general/logging.rst | 2 +- user_guide_src/source/libraries/uploaded_files.rst | 2 +- user_guide_src/source/models/entities.rst | 2 +- user_guide_src/source/outgoing/localization.rst | 2 +- user_guide_src/source/testing/response.rst | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 0ae9c2dab1c8..e9a1a7df2cad 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -15,7 +15,7 @@ the application configuration files in the **app/Config** folder. :local: :depth: 2 -Working With Configuration Files +Working with Configuration Files ******************************** You can access configuration files for your classes in several different ways. diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst index da9ebd1344cd..6e159827b1e9 100644 --- a/user_guide_src/source/general/logging.rst +++ b/user_guide_src/source/general/logging.rst @@ -81,7 +81,7 @@ Each handler's section will have one property in common: ``handles``, which is a .. literalinclude:: logging/004.php -Modifying the Message With Context +Modifying the Message with Context ================================== You will often want to modify the details of your message based on the context of the event being logged. diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index b91b34ecd718..b202d1b2d0c3 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -231,7 +231,7 @@ In controller: .. note:: Using ``getFiles()`` is more appropriate. ********************* -Working With the File +Working with the File ********************* Once you've retrieved the UploadedFile instance, you can retrieve information about the file in safe ways, as well as diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst index df625dd73833..8e1d99a3a973 100644 --- a/user_guide_src/source/models/entities.rst +++ b/user_guide_src/source/models/entities.rst @@ -57,7 +57,7 @@ are handled automatically by the class or the database, so we don't want to chan class as the ``$returnType``. This ensures that all methods on the model that return rows from the database will return instances of our User Entity class instead of an object or array like normal. -Working With the Entity Class +Working with the Entity Class ----------------------------- Now that all of the pieces are in place, you would work with the Entity class as you would any other class: diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index efae7ae5dc8b..103207c35961 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -7,7 +7,7 @@ Localization :depth: 3 ******************** -Working With Locales +Working with Locales ******************** CodeIgniter provides several tools to help you localize your application for different languages. While full diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst index c28fd46bbb81..bf82bb402403 100644 --- a/user_guide_src/source/testing/response.rst +++ b/user_guide_src/source/testing/response.rst @@ -249,7 +249,7 @@ Asserts that an input tag exists with the name and value: .. literalinclude:: response/029.php -Working With JSON +Working with JSON ================= Responses will frequently contain JSON responses, especially when working with API methods. The following methods @@ -280,7 +280,7 @@ assertJSONExact($test) Similar to ``assertJSONFragment()``, but checks the entire JSON response to ensure exact matches. -Working With XML +Working with XML ================ getXML() From a7b97ad34e2198229708ddc440399174ebf237df Mon Sep 17 00:00:00 2001 From: Christoph Potas Date: Wed, 28 Jun 2023 15:11:34 +0200 Subject: [PATCH 4018/8282] Provide default port configuration information to the documentation ~ remove old port changes + add port config information to the documentation --- system/Database/SQLSRV/Connection.php | 2 +- user_guide_src/source/database/configuration.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php index 555b0a21c3f1..4e0ca987df9a 100755 --- a/system/Database/SQLSRV/Connection.php +++ b/system/Database/SQLSRV/Connection.php @@ -121,7 +121,7 @@ public function connect(bool $persistent = false) unset($connection['UID'], $connection['PWD']); } - if (strpos($this->hostname, ',') === false && $this->port !== '' && (int) $this->port !== 1433) { + if (strpos($this->hostname, ',') === false && $this->port !== '') { $this->hostname .= ', ' . $this->port; } diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index bdb6320d0bb3..d2b6b893abe6 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -174,7 +174,7 @@ Explanation of Values: **compress** Whether or not to use client compression (``MySQLi`` only). **strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application (``MySQLi`` only). -**port** The database port number. +**port** The database port number - Empty for default port (or dynamic port with ``SQLSRV``) **foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only). .. important:: SQLite3 Foreign Key constraint is disabled by default. From afeb419d0670aab135fec15d70a892b86174cc14 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 14:45:44 +0900 Subject: [PATCH 4019/8282] refactor: remove CSRF config items in Config\App --- app/Config/App.php | 85 ------------------------------------ system/Security/Security.php | 26 ++++------- 2 files changed, 8 insertions(+), 103 deletions(-) diff --git a/app/Config/App.php b/app/Config/App.php index 69b596bcad59..186bfa86bb02 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -158,91 +158,6 @@ class App extends BaseConfig */ public array $proxyIPs = []; - /** - * -------------------------------------------------------------------------- - * CSRF Token Name - * -------------------------------------------------------------------------- - * - * The token name. - * - * @deprecated Use `Config\Security` $tokenName property instead of using this property. - */ - public string $CSRFTokenName = 'csrf_test_name'; - - /** - * -------------------------------------------------------------------------- - * CSRF Header Name - * -------------------------------------------------------------------------- - * - * The header name. - * - * @deprecated Use `Config\Security` $headerName property instead of using this property. - */ - public string $CSRFHeaderName = 'X-CSRF-TOKEN'; - - /** - * -------------------------------------------------------------------------- - * CSRF Cookie Name - * -------------------------------------------------------------------------- - * - * The cookie name. - * - * @deprecated Use `Config\Security` $cookieName property instead of using this property. - */ - public string $CSRFCookieName = 'csrf_cookie_name'; - - /** - * -------------------------------------------------------------------------- - * CSRF Expire - * -------------------------------------------------------------------------- - * - * The number in seconds the token should expire. - * - * @deprecated Use `Config\Security` $expire property instead of using this property. - */ - public int $CSRFExpire = 7200; - - /** - * -------------------------------------------------------------------------- - * CSRF Regenerate - * -------------------------------------------------------------------------- - * - * Regenerate token on every submission? - * - * @deprecated Use `Config\Security` $regenerate property instead of using this property. - */ - public bool $CSRFRegenerate = true; - - /** - * -------------------------------------------------------------------------- - * CSRF Redirect - * -------------------------------------------------------------------------- - * - * Redirect to previous page with error on failure? - * - * @deprecated Use `Config\Security` $redirect property instead of using this property. - */ - public bool $CSRFRedirect = false; - - /** - * -------------------------------------------------------------------------- - * CSRF SameSite - * -------------------------------------------------------------------------- - * - * Setting for CSRF SameSite cookie token. Allowed values are: - * - None - * - Lax - * - Strict - * - '' - * - * Defaults to `Lax` as recommended in this link: - * - * @see https://portswigger.net/web-security/csrf/samesite-cookies - * - * @deprecated `Config\Cookie` $samesite property is used. - */ - public string $CSRFSameSite = 'Lax'; - /** * -------------------------------------------------------------------------- * Content Security Policy diff --git a/system/Security/Security.php b/system/Security/Security.php index d7a5d49c6f09..e54e28a4d7d5 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -174,24 +174,14 @@ public function __construct(App $config) $security = config(SecurityConfig::class); // Store CSRF-related configurations - if ($security instanceof SecurityConfig) { - $this->csrfProtection = $security->csrfProtection ?? $this->csrfProtection; - $this->tokenName = $security->tokenName ?? $this->tokenName; - $this->headerName = $security->headerName ?? $this->headerName; - $this->regenerate = $security->regenerate ?? $this->regenerate; - $this->redirect = $security->redirect ?? $this->redirect; - $this->rawCookieName = $security->cookieName ?? $this->rawCookieName; - $this->expires = $security->expires ?? $this->expires; - $this->tokenRandomize = $security->tokenRandomize ?? $this->tokenRandomize; - } else { - // `Config/Security.php` is absence - $this->tokenName = $config->CSRFTokenName ?? $this->tokenName; - $this->headerName = $config->CSRFHeaderName ?? $this->headerName; - $this->regenerate = $config->CSRFRegenerate ?? $this->regenerate; - $this->rawCookieName = $config->CSRFCookieName ?? $this->rawCookieName; - $this->expires = $config->CSRFExpire ?? $this->expires; - $this->redirect = $config->CSRFRedirect ?? $this->redirect; - } + $this->csrfProtection = $security->csrfProtection ?? $this->csrfProtection; + $this->tokenName = $security->tokenName ?? $this->tokenName; + $this->headerName = $security->headerName ?? $this->headerName; + $this->regenerate = $security->regenerate ?? $this->regenerate; + $this->redirect = $security->redirect ?? $this->redirect; + $this->rawCookieName = $security->cookieName ?? $this->rawCookieName; + $this->expires = $security->expires ?? $this->expires; + $this->tokenRandomize = $security->tokenRandomize ?? $this->tokenRandomize; if ($this->isCSRFCookie()) { $cookie = config(CookieConfig::class); From a0665df04285b8492acc22df024b03faaa1f7e9a Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:05:28 +0900 Subject: [PATCH 4020/8282] refactor: add property for SecurityConfig and use it --- system/Security/Security.php | 74 +++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/system/Security/Security.php b/system/Security/Security.php index e54e28a4d7d5..593dc5142b6b 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -44,6 +44,8 @@ class Security implements SecurityInterface * Protection Method for Cross Site Request Forgery protection. * * @var string 'cookie' or 'session' + * + * @deprecated 4.4.0 Use $this->config->csrfProtection. */ protected $csrfProtection = self::CSRF_PROTECTION_COOKIE; @@ -51,6 +53,8 @@ class Security implements SecurityInterface * CSRF Token Randomization * * @var bool + * + * @deprecated 4.4.0 Use $this->config->tokenRandomize. */ protected $tokenRandomize = false; @@ -69,6 +73,8 @@ class Security implements SecurityInterface * Token name for Cross Site Request Forgery protection. * * @var string + * + * @deprecated 4.4.0 Use $this->config->tokenName. */ protected $tokenName = 'csrf_token_name'; @@ -78,6 +84,8 @@ class Security implements SecurityInterface * Header name for Cross Site Request Forgery protection. * * @var string + * + * @deprecated 4.4.0 Use $this->config->headerName. */ protected $headerName = 'X-CSRF-TOKEN'; @@ -105,6 +113,8 @@ class Security implements SecurityInterface * Defaults to two hours (in seconds). * * @var int + * + * @deprecated 4.4.0 Use $this->config->expires. */ protected $expires = 7200; @@ -114,6 +124,8 @@ class Security implements SecurityInterface * Regenerate CSRF Token on every request. * * @var bool + * + * @deprecated 4.4.0 Use $this->config->regenerate. */ protected $regenerate = true; @@ -123,6 +135,8 @@ class Security implements SecurityInterface * Redirect to previous page with error on failure. * * @var bool + * + * @deprecated 4.4.0 Use $this->config->redirect. */ protected $redirect = false; @@ -163,6 +177,11 @@ class Security implements SecurityInterface */ private ?string $hashInCookie = null; + /** + * Security Config + */ + protected SecurityConfig $config; + /** * Constructor. * @@ -171,17 +190,10 @@ class Security implements SecurityInterface */ public function __construct(App $config) { - $security = config(SecurityConfig::class); - - // Store CSRF-related configurations - $this->csrfProtection = $security->csrfProtection ?? $this->csrfProtection; - $this->tokenName = $security->tokenName ?? $this->tokenName; - $this->headerName = $security->headerName ?? $this->headerName; - $this->regenerate = $security->regenerate ?? $this->regenerate; - $this->redirect = $security->redirect ?? $this->redirect; - $this->rawCookieName = $security->cookieName ?? $this->rawCookieName; - $this->expires = $security->expires ?? $this->expires; - $this->tokenRandomize = $security->tokenRandomize ?? $this->tokenRandomize; + $security = config(SecurityConfig::class); + $this->config = $security; + + $this->rawCookieName = $security->cookieName; if ($this->isCSRFCookie()) { $cookie = config(CookieConfig::class); @@ -203,7 +215,7 @@ public function __construct(App $config) private function isCSRFCookie(): bool { - return $this->csrfProtection === self::CSRF_PROTECTION_COOKIE; + return $this->config->csrfProtection === self::CSRF_PROTECTION_COOKIE; } private function configureSession(): void @@ -277,7 +289,7 @@ public function verify(RequestInterface $request) $postedToken = $this->getPostedToken($request); try { - $token = ($postedToken !== null && $this->tokenRandomize) + $token = ($postedToken !== null && $this->config->tokenRandomize) ? $this->derandomize($postedToken) : $postedToken; } catch (InvalidArgumentException $e) { $token = null; @@ -290,7 +302,7 @@ public function verify(RequestInterface $request) $this->removeTokenInRequest($request); - if ($this->regenerate) { + if ($this->config->regenerate) { $this->generateHash(); } @@ -308,13 +320,13 @@ private function removeTokenInRequest(RequestInterface $request): void $json = json_decode($request->getBody() ?? ''); - if (isset($_POST[$this->tokenName])) { + if (isset($_POST[$this->config->tokenName])) { // We kill this since we're done and we don't want to pollute the POST array. - unset($_POST[$this->tokenName]); + unset($_POST[$this->config->tokenName]); $request->setGlobal('post', $_POST); - } elseif (isset($json->{$this->tokenName})) { + } elseif (isset($json->{$this->config->tokenName})) { // We kill this since we're done and we don't want to pollute the JSON data. - unset($json->{$this->tokenName}); + unset($json->{$this->config->tokenName}); $request->setBody(json_encode($json)); } } @@ -325,19 +337,19 @@ private function getPostedToken(RequestInterface $request): ?string // Does the token exist in POST, HEADER or optionally php:://input - json data. - if ($tokenValue = $request->getPost($this->tokenName)) { + if ($tokenValue = $request->getPost($this->config->tokenName)) { return $tokenValue; } - if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) { - return $request->header($this->headerName)->getValue(); + if ($request->hasHeader($this->config->headerName) && ! empty($request->header($this->config->headerName)->getValue())) { + return $request->header($this->config->headerName)->getValue(); } $body = (string) $request->getBody(); $json = json_decode($body); if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) { - return $json->{$this->tokenName} ?? null; + return $json->{$this->config->tokenName} ?? null; } return null; @@ -348,7 +360,7 @@ private function getPostedToken(RequestInterface $request): ?string */ public function getHash(): ?string { - return $this->tokenRandomize ? $this->randomize($this->hash) : $this->hash; + return $this->config->tokenRandomize ? $this->randomize($this->hash) : $this->hash; } /** @@ -397,7 +409,7 @@ protected function derandomize(string $token): string */ public function getTokenName(): string { - return $this->tokenName; + return $this->config->tokenName; } /** @@ -405,7 +417,7 @@ public function getTokenName(): string */ public function getHeaderName(): string { - return $this->headerName; + return $this->config->headerName; } /** @@ -413,7 +425,7 @@ public function getHeaderName(): string */ public function getCookieName(): string { - return $this->cookieName; + return $this->config->cookieName; } /** @@ -433,7 +445,7 @@ public function isExpired(): bool */ public function shouldRedirect(): bool { - return $this->redirect; + return $this->config->redirect; } /** @@ -511,9 +523,9 @@ private function restoreHash(): void if ($this->isHashInCookie()) { $this->hash = $this->hashInCookie; } - } elseif ($this->session->has($this->tokenName)) { + } elseif ($this->session->has($this->config->tokenName)) { // Session based CSRF protection - $this->hash = $this->session->get($this->tokenName); + $this->hash = $this->session->get($this->config->tokenName); } } @@ -552,7 +564,7 @@ private function saveHashInCookie(): void $this->rawCookieName, $this->hash, [ - 'expires' => $this->expires === 0 ? 0 : Time::now()->getTimestamp() + $this->expires, + 'expires' => $this->config->expires === 0 ? 0 : Time::now()->getTimestamp() + $this->config->expires, ] ); @@ -596,6 +608,6 @@ protected function doSendCookie(): void private function saveHashInSession(): void { - $this->session->set($this->tokenName, $this->hash); + $this->session->set($this->config->tokenName, $this->hash); } } From a9554b350215042cfa856c43c6468c0ad41d01ae Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:27:57 +0900 Subject: [PATCH 4021/8282] refactor: [BC] change Security constructor param from Config\App to Config\Security --- system/Config/Services.php | 5 ++- system/Security/Security.php | 8 ++--- tests/system/Config/ServicesTest.php | 5 +-- tests/system/Helpers/SecurityHelperTest.php | 4 +-- .../SecurityCSRFCookieRandomizeTokenTest.php | 16 +++++---- .../SecurityCSRFSessionRandomizeTokenTest.php | 36 ++++++++++--------- .../Security/SecurityCSRFSessionTest.php | 30 ++++++++-------- tests/system/Security/SecurityTest.php | 30 ++++++++-------- 8 files changed, 71 insertions(+), 63 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index 89a49b4bf468..779afa3ccaf1 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -77,6 +77,7 @@ use Config\Pager as PagerConfig; use Config\Paths; use Config\Routing; +use Config\Security as SecurityConfig; use Config\Services as AppServices; use Config\Session as SessionConfig; use Config\Toolbar as ToolbarConfig; @@ -626,6 +627,8 @@ public static function router(?RouteCollectionInterface $routes = null, ?Request * secure, most notably the CSRF protection tools. * * @return Security + * + * @TODO replace the first parameter type `?App` with `?SecurityConfig` */ public static function security(?App $config = null, bool $getShared = true) { @@ -633,7 +636,7 @@ public static function security(?App $config = null, bool $getShared = true) return static::getSharedInstance('security', $config); } - $config ??= config(App::class); + $config = config(SecurityConfig::class); return new Security($config); } diff --git a/system/Security/Security.php b/system/Security/Security.php index 593dc5142b6b..c67c13ce0c1c 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -18,7 +18,6 @@ use CodeIgniter\I18n\Time; use CodeIgniter\Security\Exceptions\SecurityException; use CodeIgniter\Session\Session; -use Config\App; use Config\Cookie as CookieConfig; use Config\Security as SecurityConfig; use Config\Services; @@ -188,12 +187,11 @@ class Security implements SecurityInterface * Stores our configuration and fires off the init() method to setup * initial state. */ - public function __construct(App $config) + public function __construct(SecurityConfig $config) { - $security = config(SecurityConfig::class); - $this->config = $security; + $this->config = $config; - $this->rawCookieName = $security->cookieName; + $this->rawCookieName = $config->cookieName; if ($this->isCSRFCookie()) { $cookie = config(CookieConfig::class); diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 143591aac10c..b6ea85e6971f 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -43,6 +43,7 @@ use CodeIgniter\View\Parser; use Config\App; use Config\Exceptions; +use Config\Security as SecurityConfig; use RuntimeException; use Tests\Support\Config\Services; @@ -329,7 +330,7 @@ public function testReset() public function testResetSingle() { Services::injectMock('response', new MockResponse(new App())); - Services::injectMock('security', new MockSecurity(new App())); + Services::injectMock('security', new MockSecurity(new SecurityConfig())); $response = service('response'); $security = service('security'); $this->assertInstanceOf(MockResponse::class, $response); @@ -411,7 +412,7 @@ public function testRouter() public function testSecurity() { - Services::injectMock('security', new MockSecurity(new App())); + Services::injectMock('security', new MockSecurity(new SecurityConfig())); $result = Services::security(); $this->assertInstanceOf(Security::class, $result); diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php index c7523e3b0081..8c2c0d6efd55 100644 --- a/tests/system/Helpers/SecurityHelperTest.php +++ b/tests/system/Helpers/SecurityHelperTest.php @@ -13,7 +13,7 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockSecurity; -use Config\App; +use Config\Security as SecurityConfig; use Tests\Support\Config\Services; /** @@ -32,7 +32,7 @@ protected function setUp(): void public function testSanitizeFilenameSimpleSuccess() { - Services::injectMock('security', new MockSecurity(new App())); + Services::injectMock('security', new MockSecurity(new SecurityConfig())); $this->assertSame('hello.doc', sanitize_filename('hello.doc')); } diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php index 93f749ffc604..95ad54d58b04 100644 --- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php @@ -38,19 +38,21 @@ final class SecurityCSRFCookieRandomizeTokenTest extends CIUnitTestCase */ private string $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1'; + private SecurityConfig $config; + protected function setUp(): void { parent::setUp(); $_COOKIE = []; - $config = new SecurityConfig(); - $config->csrfProtection = Security::CSRF_PROTECTION_COOKIE; - $config->tokenRandomize = true; - Factories::injectMock('config', 'Security', $config); + $this->config = new SecurityConfig(); + $this->config->csrfProtection = Security::CSRF_PROTECTION_COOKIE; + $this->config->tokenRandomize = true; + Factories::injectMock('config', 'Security', $this->config); // Set Cookie value - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity($this->config); $_COOKIE[$security->getCookieName()] = $this->hash; $this->resetServices(); @@ -58,7 +60,7 @@ protected function setUp(): void public function testTokenIsReadFromCookie() { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity($this->config); $this->assertSame( $this->randomizedToken, @@ -74,7 +76,7 @@ public function testCSRFVerifySetNewCookie() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index 36bd5ea97f1c..6afc1aeefd22 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -51,6 +51,8 @@ final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase */ private string $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1'; + private SecurityConfig $config; + protected function setUp(): void { parent::setUp(); @@ -58,10 +60,10 @@ protected function setUp(): void $_SESSION = []; Factories::reset(); - $config = new SecurityConfig(); - $config->csrfProtection = Security::CSRF_PROTECTION_SESSION; - $config->tokenRandomize = true; - Factories::injectMock('config', 'Security', $config); + $this->config = new SecurityConfig(); + $this->config->csrfProtection = Security::CSRF_PROTECTION_SESSION; + $this->config->tokenRandomize = true; + Factories::injectMock('config', 'Security', $this->config); $this->injectSession($this->hash); } @@ -113,7 +115,7 @@ private function injectSession(string $hash): void public function testHashIsReadFromSession() { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity($this->config); $this->assertSame( $this->randomizedToken, @@ -131,7 +133,7 @@ public function testCSRFVerifyPostNoToken() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $security->verify($request); } @@ -146,7 +148,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $security->verify($request); } @@ -161,7 +163,7 @@ public function testCSRFVerifyPostInvalidToken() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $security->verify($request); } @@ -174,7 +176,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -188,7 +190,7 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->expectException(SecurityException::class); $this->expectExceptionMessage('The action you requested is not allowed.'); @@ -204,7 +206,7 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -218,7 +220,7 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->expectException(SecurityException::class); $this->expectExceptionMessage('The action you requested is not allowed.'); @@ -233,7 +235,7 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -249,7 +251,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $security->verify($request); } @@ -261,7 +263,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"' . $this->randomizedToken . '","foo":"bar"}'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -280,7 +282,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity($this->config); $oldHash = $security->getHash(); $security->verify($request); @@ -301,7 +303,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $oldHash = $security->getHash(); $security->verify($request); diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index d6f2216e29f6..41ccc638331b 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -45,6 +45,8 @@ final class SecurityCSRFSessionTest extends CIUnitTestCase */ private string $hash = '8b9218a55906f9dcc1dc263dce7f005a'; + private SecurityConfig $config; + protected function setUp(): void { parent::setUp(); @@ -52,9 +54,9 @@ protected function setUp(): void $_SESSION = []; Factories::reset(); - $config = new SecurityConfig(); - $config->csrfProtection = Security::CSRF_PROTECTION_SESSION; - Factories::injectMock('config', 'Security', $config); + $this->config = new SecurityConfig(); + $this->config->csrfProtection = Security::CSRF_PROTECTION_SESSION; + Factories::injectMock('config', 'Security', $this->config); $this->injectSession($this->hash); } @@ -106,7 +108,7 @@ private function injectSession(string $hash): void public function testHashIsReadFromSession() { - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertSame($this->hash, $security->getHash()); } @@ -120,7 +122,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security(new SecurityConfig()); $security->verify($request); } @@ -133,7 +135,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -147,7 +149,7 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->expectException(SecurityException::class); $security->verify($request); @@ -161,7 +163,7 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -175,7 +177,7 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security(new MockAppConfig()); + $security = new Security(new SecurityConfig()); $this->expectException(SecurityException::class); $security->verify($request); @@ -188,7 +190,7 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -203,7 +205,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}'); - $security = new Security(new MockAppConfig()); + $security = new Security(new SecurityConfig()); $security->verify($request); } @@ -215,7 +217,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}'); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -233,7 +235,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $oldHash = $security->getHash(); $security->verify($request); @@ -253,7 +255,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new MockAppConfig()); + $security = new Security($this->config); $oldHash = $security->getHash(); $security->verify($request); diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index f610add149f0..82bc6b6c27db 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -43,7 +43,7 @@ protected function setUp(): void public function testBasicConfigIsSaved() { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $hash = $security->getHash(); @@ -55,7 +55,7 @@ public function testHashIsReadFromCookie() { $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $this->assertSame( '8b9218a55906f9dcc1dc263dce7f005a', @@ -65,7 +65,7 @@ public function testHashIsReadFromCookie() public function testGetHashSetsCookieWhenGETWithoutCSRFCookie() { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -80,7 +80,7 @@ public function testGetHashReturnsCSRFCookieWhenGETWithCSRFCookie() $_SERVER['REQUEST_METHOD'] = 'GET'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $security->verify(new Request(new MockAppConfig())); @@ -93,7 +93,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $_POST['csrf_test_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -112,7 +112,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $_POST['csrf_test_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -131,7 +131,7 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -151,7 +151,7 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch() $_POST['foo'] = 'bar'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -172,7 +172,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -193,7 +193,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -213,7 +213,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() public function testSanitizeFilename() { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $filename = './'; @@ -230,7 +230,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty() $config->regenerate = false; Factories::injectMock('config', 'Security', $config); - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity($config); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -255,7 +255,7 @@ public function testRegenerateWithFalseSecurityRegeneratePropertyManually() $config->regenerate = false; Factories::injectMock('config', 'Security', $config); - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -281,7 +281,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $config->regenerate = true; Factories::injectMock('config', 'Security', $config); - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -298,7 +298,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() public function testGetters(): void { - $security = new MockSecurity(new MockAppConfig()); + $security = new MockSecurity(new SecurityConfig()); $this->assertIsString($security->getHash()); $this->assertIsString($security->getTokenName()); From 5e7a1e6e5b54b7964d5d846f18eccb240c05a112 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:29:46 +0900 Subject: [PATCH 4022/8282] docs: add changelog and upgrade note --- user_guide_src/source/changelogs/v4.4.0.rst | 1 + user_guide_src/source/installation/upgrade_440.rst | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index b4e705557979..d8efc4622037 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -135,6 +135,7 @@ Changes - **Images:** The default quality for WebP in ``GDHandler`` has been changed from 80 to 90. - **Config:** The deprecated Cookie items in **app/Config/App.php** has been removed. - **Config:** The deprecated Session items in **app/Config/App.php** has been removed. +- **Config:** The deprecated CSRF items in **app/Config/App.php** has been removed. - **Config:** Routing settings have been moved to **app/Config/Routing.php** config file. See :ref:`Upgrading Guide `. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index c82723aa129d..3eb8a9728555 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -115,6 +115,16 @@ The Cookie config items in **app/Config/App.php** are no longer used. 2. Remove the properties (from ``$cookiePrefix`` to ``$cookieSameSite``) in **app/Config/App.php**. +app/Config/Security.php +----------------------- + +The CSRF config items in **app/Config/App.php** are no longer used. + +1. Copy **app/Config/Security.php** from the new framework to your **app/Config** + directory, and configure it. +2. Remove the properties (from ``$CSRFTokenName`` to ``$CSRFSameSite``) in + **app/Config/App.php**. + app/Config/Session.php ---------------------- From 7a7e98089a63f42dfb227d3b17e66cecc2077763 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:38:16 +0900 Subject: [PATCH 4023/8282] refactor: remove CSRF properties in MockAppConfig --- system/Test/Mock/MockAppConfig.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php index 0d3a22cc3ff6..0f1d5bf59975 100644 --- a/system/Test/Mock/MockAppConfig.php +++ b/system/Test/Mock/MockAppConfig.php @@ -18,14 +18,6 @@ class MockAppConfig extends App public string $baseURL = 'http://example.com/'; public string $uriProtocol = 'REQUEST_URI'; public array $proxyIPs = []; - public string $CSRFTokenName = 'csrf_test_name'; - public string $CSRFHeaderName = 'X-CSRF-TOKEN'; - public string $CSRFCookieName = 'csrf_cookie_name'; - public int $CSRFExpire = 7200; - public bool $CSRFRegenerate = true; - public array $CSRFExcludeURIs = ['http://example.com']; - public bool $CSRFRedirect = false; - public string $CSRFSameSite = 'Lax'; public bool $CSPEnabled = false; public string $defaultLocale = 'en'; public bool $negotiateLocale = false; From 848436f861ae472d717b4b4a14109801d94087b5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:49:56 +0900 Subject: [PATCH 4024/8282] test: extract method to create instance --- .../SecurityCSRFSessionRandomizeTokenTest.php | 27 ++++++++------ .../Security/SecurityCSRFSessionTest.php | 27 ++++++++------ tests/system/Security/SecurityTest.php | 35 +++++++++++-------- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index 6afc1aeefd22..087f3a7a74df 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -113,6 +113,11 @@ private function injectSession(string $hash): void Services::injectMock('session', $session); } + private function createSecurity(): Security + { + return new Security($this->config); + } + public function testHashIsReadFromSession() { $security = new MockSecurity($this->config); @@ -133,7 +138,7 @@ public function testCSRFVerifyPostNoToken() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $security->verify($request); } @@ -148,7 +153,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $security->verify($request); } @@ -163,7 +168,7 @@ public function testCSRFVerifyPostInvalidToken() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $security->verify($request); } @@ -176,7 +181,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -190,7 +195,7 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->expectException(SecurityException::class); $this->expectExceptionMessage('The action you requested is not allowed.'); @@ -206,7 +211,7 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -220,7 +225,7 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->expectException(SecurityException::class); $this->expectExceptionMessage('The action you requested is not allowed.'); @@ -235,7 +240,7 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -251,7 +256,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}'); - $security = new Security($this->config); + $security = $this->createSecurity(); $security->verify($request); } @@ -263,7 +268,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"' . $this->randomizedToken . '","foo":"bar"}'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -303,7 +308,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $oldHash = $security->getHash(); $security->verify($request); diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index 41ccc638331b..e683e6327485 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -106,9 +106,14 @@ private function injectSession(string $hash): void Services::injectMock('session', $session); } + private function createSecurity(): Security + { + return new Security($this->config); + } + public function testHashIsReadFromSession() { - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertSame($this->hash, $security->getHash()); } @@ -122,7 +127,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security(new SecurityConfig()); + $security = $this->createSecurity(); $security->verify($request); } @@ -135,7 +140,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -149,7 +154,7 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->expectException(SecurityException::class); $security->verify($request); @@ -163,7 +168,7 @@ public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -177,7 +182,7 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b'); - $security = new Security(new SecurityConfig()); + $security = $this->createSecurity(); $this->expectException(SecurityException::class); $security->verify($request); @@ -190,7 +195,7 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -205,7 +210,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}'); - $security = new Security(new SecurityConfig()); + $security = $this->createSecurity(); $security->verify($request); } @@ -217,7 +222,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}'); - $security = new Security($this->config); + $security = $this->createSecurity(); $this->assertInstanceOf(Security::class, $security->verify($request)); $this->assertLogged('info', 'CSRF token verified.'); @@ -235,7 +240,7 @@ public function testRegenerateWithFalseSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $oldHash = $security->getHash(); $security->verify($request); @@ -255,7 +260,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent()); - $security = new Security($this->config); + $security = $this->createSecurity(); $oldHash = $security->getHash(); $security->verify($request); diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index 82bc6b6c27db..e47e112b72bc 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -41,9 +41,16 @@ protected function setUp(): void $this->resetServices(); } + private function createMockSecurity(?SecurityConfig $config = null): MockSecurity + { + $config ??= new SecurityConfig(); + + return new MockSecurity($config); + } + public function testBasicConfigIsSaved() { - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $hash = $security->getHash(); @@ -55,7 +62,7 @@ public function testHashIsReadFromCookie() { $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $this->assertSame( '8b9218a55906f9dcc1dc263dce7f005a', @@ -65,7 +72,7 @@ public function testHashIsReadFromCookie() public function testGetHashSetsCookieWhenGETWithoutCSRFCookie() { - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -80,7 +87,7 @@ public function testGetHashReturnsCSRFCookieWhenGETWithCSRFCookie() $_SERVER['REQUEST_METHOD'] = 'GET'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $security->verify(new Request(new MockAppConfig())); @@ -93,7 +100,7 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch() $_POST['csrf_test_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -112,7 +119,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch() $_POST['csrf_test_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -131,7 +138,7 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -151,7 +158,7 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch() $_POST['foo'] = 'bar'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -172,7 +179,7 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -193,7 +200,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() $_SERVER['REQUEST_METHOD'] = 'POST'; $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a'; - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -213,7 +220,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch() public function testSanitizeFilename() { - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $filename = './'; @@ -255,7 +262,7 @@ public function testRegenerateWithFalseSecurityRegeneratePropertyManually() $config->regenerate = false; Factories::injectMock('config', 'Security', $config); - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity($config); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -281,7 +288,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() $config->regenerate = true; Factories::injectMock('config', 'Security', $config); - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity($config); $request = new IncomingRequest( new MockAppConfig(), new URI('http://badurl.com'), @@ -298,7 +305,7 @@ public function testRegenerateWithTrueSecurityRegenerateProperty() public function testGetters(): void { - $security = new MockSecurity(new SecurityConfig()); + $security = $this->createMockSecurity(); $this->assertIsString($security->getHash()); $this->assertIsString($security->getTokenName()); From 241ac4c6ff6251a94d9c91ec538402a88218d6fd Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 15:53:17 +0900 Subject: [PATCH 4025/8282] test: update MockSecurity constructor param --- tests/system/CommonFunctionsTest.php | 3 ++- tests/system/CommonSingleServiceTest.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 884b2819f912..6246286abc23 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -33,6 +33,7 @@ use Config\Logger; use Config\Modules; use Config\Routing; +use Config\Security as SecurityConfig; use Config\Services; use Config\Session as SessionConfig; use Kint; @@ -336,7 +337,7 @@ public function testAppTimezone() public function testCSRFToken() { - Services::injectMock('security', new MockSecurity(new App())); + Services::injectMock('security', new MockSecurity(new SecurityConfig())); $this->assertSame('csrf_test_name', csrf_token()); } diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php index 58854f27df68..676aa529bb48 100644 --- a/tests/system/CommonSingleServiceTest.php +++ b/tests/system/CommonSingleServiceTest.php @@ -15,7 +15,7 @@ use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockSecurity; -use Config\App; +use Config\Security as SecurityConfig; use ReflectionClass; use ReflectionMethod; @@ -31,7 +31,7 @@ final class CommonSingleServiceTest extends CIUnitTestCase */ public function testSingleServiceWithNoParamsSupplied(string $service): void { - Services::injectMock('security', new MockSecurity(new App())); + Services::injectMock('security', new MockSecurity(new SecurityConfig())); $service1 = single_service($service); $service2 = single_service($service); From 812b172e371fa5f71df27fda89e765d86ff8dc11 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 16:27:40 +0900 Subject: [PATCH 4026/8282] test: remove out-of-dated test case $CSRFExpire was removed. --- tests/system/CommonFunctionsTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 6246286abc23..5792cdc59efa 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -497,7 +497,6 @@ public function testReallyWritable() public function testSlashItem() { $this->assertSame('en/', slash_item('defaultLocale')); // en - $this->assertSame('7200/', slash_item('CSRFExpire')); // int 7200 $this->assertSame('', slash_item('negotiateLocale')); // false } From eccbae455c5c9bef00bf91adddeb93075926f118 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 16:06:46 +0900 Subject: [PATCH 4027/8282] docs: add Deprecations in changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index d8efc4622037..fe4d428998ff 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -162,6 +162,10 @@ Deprecations ``$sessionExpiration``, ``$sessionSavePath``, ``$sessionMatchIP``, ``$sessionTimeToUpdate``, and ``$sessionRegenerateDestroy`` in ``Session`` are deprecated, and no longer used. Use ``$config`` instead. +- **Security:** The property ``$csrfProtection``, ``$tokenRandomize``, + ``$tokenName``, ``$headerName``, ``$expires``, ``$regenerate``, and + ``$redirect`` in ``Security`` are deprecated, and no longer used. Use + ``$config`` instead. Bugs Fixed ********** From 2868f5cb1dabc00976abb552ca656c52927b9996 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 27 Jun 2023 17:29:52 +0900 Subject: [PATCH 4028/8282] docs: add method signature change --- user_guide_src/source/changelogs/v4.4.0.rst | 4 ++++ user_guide_src/source/installation/upgrade_440.rst | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index fe4d428998ff..638cf2efc266 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -40,6 +40,8 @@ Interface Changes - **Validation:** Added the ``getValidated()`` method in ``ValidationInterface``. +.. _v440-method-signature-changes: + Method Signature Changes ======================== @@ -52,6 +54,8 @@ Method Signature Changes - **Session:** The first parameter of ``__construct()`` in ``BaseHandler``, ``DatabaseHandler``, ``FileHandler``, ``MemcachedHandler``, and ``RedisHandler`` has been changed from ``Config\App`` to ``Config\Session``. +- **Security:** The first parameter of ``Security::__construct()`` has been + changed from ``Config\App`` to ``Config\Security``. Enhancements ************ diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index 3eb8a9728555..0080a767bdc0 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -75,6 +75,13 @@ performance. If you extend ``RouteCollection`` and use the ``$routes``, update your code to match the new array structure. +Method Signature Changes +======================== + +Some method signature changes have been made. Classes that extend them should +update their APIs to reflect the changes. See :ref:`v440-method-signature-changes` +for details. + Mandatory File Changes ********************** From 2fb429d1c525a701266f0376643917977fa08032 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Sat, 24 Jun 2023 05:19:55 +0800 Subject: [PATCH 4029/8282] rework: RedirectException implements ResponsableInterface --- system/CodeIgniter.php | 12 ++++++------ system/HTTP/Exceptions/RedirectException.php | 15 ++++++++++++++- .../HTTP/Exceptions/ResponsableInterface.php | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 system/HTTP/Exceptions/ResponsableInterface.php diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 66a05aa99df7..c85082ad67fa 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -19,6 +19,7 @@ use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\DownloadResponse; use CodeIgniter\HTTP\Exceptions\RedirectException; +use CodeIgniter\HTTP\Exceptions\ResponsableInterface; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Request; @@ -343,14 +344,13 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon try { $this->response = $this->handleRequest($routes, config(Cache::class), $returnResponse); - } catch (RedirectException|DeprecatedRedirectException $e) { + } catch (ResponsableInterface|DeprecatedRedirectException $e) { $this->outputBufferingEnd(); - $logger = Services::logger(); - $logger->info('REDIRECTED ROUTE at ' . $e->getMessage()); + if ($e instanceof DeprecatedRedirectException) { + $e = new RedirectException($e->getMessage(), $e->getCode(), $e); + } - // If the route is a 'redirect' route, it throws - // the exception with the $to as the message - $this->response->redirect(base_url($e->getMessage()), 'auto', $e->getCode()); + $this->response = $e->getResponse(); } catch (PageNotFoundException $e) { $this->response = $this->display404errors($e); } catch (Throwable $e) { diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 5cda9fb00cd0..37b7e3fbcf14 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -12,12 +12,14 @@ namespace CodeIgniter\HTTP\Exceptions; use CodeIgniter\Exceptions\HTTPExceptionInterface; +use CodeIgniter\HTTP\ResponseInterface; +use Config\Services; use Exception; /** * RedirectException */ -class RedirectException extends Exception implements HTTPExceptionInterface +class RedirectException extends Exception implements ResponsableInterface, HTTPExceptionInterface { /** * HTTP status code for redirects @@ -25,4 +27,15 @@ class RedirectException extends Exception implements HTTPExceptionInterface * @var int */ protected $code = 302; + + public function getResponse(): ResponseInterface + { + $logger = Services::logger(); + $response = Services::response(); + $logger->info('REDIRECTED ROUTE at ' . $this->getMessage()); + + // If the route is a 'redirect' route, it throws + // the exception with the $to as the message + return $response->redirect(base_url($this->getMessage()), 'auto', $this->getCode()); + } } diff --git a/system/HTTP/Exceptions/ResponsableInterface.php b/system/HTTP/Exceptions/ResponsableInterface.php new file mode 100644 index 000000000000..e765f96784ac --- /dev/null +++ b/system/HTTP/Exceptions/ResponsableInterface.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP\Exceptions; + +use CodeIgniter\HTTP\ResponseInterface; + +interface ResponsableInterface +{ + public function getResponse(): ResponseInterface; +} From 33b7963dfe7776f1169924e74ef7697234d47309 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Sat, 24 Jun 2023 06:54:14 +0800 Subject: [PATCH 4030/8282] rework: RedirectException constructor. force_https --- system/CodeIgniter.php | 4 +-- system/Common.php | 36 +++++++++++--------- system/HTTP/Exceptions/RedirectException.php | 29 ++++++++++++++++ tests/system/CodeIgniterTest.php | 4 +-- tests/system/CommonFunctionsTest.php | 19 +++++++++-- tests/system/ControllerTest.php | 12 ++++--- 6 files changed, 77 insertions(+), 27 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index c85082ad67fa..f40f3393eeae 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -338,8 +338,6 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon $this->getRequestObject(); $this->getResponseObject(); - $this->forceSecureAccess(); - $this->spoofRequestMethod(); try { @@ -419,6 +417,8 @@ public function disableFilters(): void */ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false) { + $this->forceSecureAccess(); + if ($this->request instanceof IncomingRequest && strtolower($this->request->getMethod()) === 'cli') { return $this->response->setStatusCode(405)->setBody('Method Not Allowed'); } diff --git a/system/Common.php b/system/Common.php index 8d366973f14d..1eb561445ce6 100644 --- a/system/Common.php +++ b/system/Common.php @@ -21,6 +21,7 @@ use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\HTTPException; +use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; @@ -476,22 +477,24 @@ function esc($data, string $context = 'html', ?string $encoding = null) * @param ResponseInterface $response * * @throws HTTPException + * @throws RedirectException */ - function force_https(int $duration = 31_536_000, ?RequestInterface $request = null, ?ResponseInterface $response = null) - { - if ($request === null) { - $request = Services::request(null, true); - } + function force_https( + int $duration = 31_536_000, + ?RequestInterface $request = null, + ?ResponseInterface $response = null + ) { + $request ??= Services::request(); if (! $request instanceof IncomingRequest) { return; } - if ($response === null) { - $response = Services::response(null, true); - } + $response ??= Services::response(); - if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'test')) { + if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) + || $request->getServer('HTTPS') === 'test' + ) { return; // @codeCoverageIgnore } @@ -520,13 +523,14 @@ function force_https(int $duration = 31_536_000, ?RequestInterface $request = nu ); // Set an HSTS header - $response->setHeader('Strict-Transport-Security', 'max-age=' . $duration); - $response->redirect($uri); - $response->sendHeaders(); - - if (ENVIRONMENT !== 'testing') { - exit(); // @codeCoverageIgnore - } + $response->setHeader('Strict-Transport-Security', 'max-age=' . $duration) + ->redirect($uri) + ->setStatusCode(307) + ->setBody('') + ->getCookieStore() + ->clear(); + + throw new RedirectException($response); } } diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 37b7e3fbcf14..16ebc11ccd14 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -15,6 +15,8 @@ use CodeIgniter\HTTP\ResponseInterface; use Config\Services; use Exception; +use InvalidArgumentException; +use Throwable; /** * RedirectException @@ -28,8 +30,35 @@ class RedirectException extends Exception implements ResponsableInterface, HTTPE */ protected $code = 302; + protected ?ResponseInterface $response = null; + + /** + * @param ResponseInterface|string $message + */ + public function __construct($message = '', int $code = 0, ?Throwable $previous = null) + { + if (! is_string($message) && ! $message instanceof ResponseInterface) { + throw new InvalidArgumentException( + 'RedirectException::__construct() first argument must be a string or ResponseInterface', + 0, + $this + ); + } + + if ($message instanceof ResponseInterface) { + $this->response = $message; + $message = ''; + } + + parent::__construct($message, $code, $previous); + } + public function getResponse(): ResponseInterface { + if (null !== $this->response) { + return $this->response; + } + $logger = Services::logger(); $response = Services::response(); $logger->info('REDIRECTED ROUTE at ' . $this->getMessage()); diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 8f45881ba944..b2430a26a7c8 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -441,9 +441,7 @@ public function testRunForceSecure() $response = $this->getPrivateProperty($codeigniter, 'response'); $this->assertNull($response->header('Location')); - ob_start(); - $codeigniter->run(); - ob_get_clean(); + $response = $codeigniter->run(null, true); $this->assertSame('https://example.com/', $response->header('Location')->getValue()); } diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 884b2819f912..5a1add9ab2fd 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -14,6 +14,7 @@ use CodeIgniter\Config\BaseService; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\CLIRequest; +use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Response; @@ -35,6 +36,7 @@ use Config\Routing; use Config\Services; use Config\Session as SessionConfig; +use Exception; use Kint; use RuntimeException; use stdClass; @@ -599,10 +601,23 @@ public function testViewNotSaveData() public function testForceHttpsNullRequestAndResponse() { $this->assertNull(Services::response()->header('Location')); + Services::response()->setCookie('force', 'cookie'); + Services::response()->setHeader('Force', 'header'); + Services::response()->setBody('default body'); + + try { + force_https(); + } catch (Exception $e) { + $this->assertInstanceOf(RedirectException::class, $e); + $this->assertSame('https://example.com/', $e->getResponse()->header('Location')->getValue()); + $this->assertFalse($e->getResponse()->hasCookie('force')); + $this->assertSame('header', $e->getResponse()->getHeaderLine('Force')); + $this->assertSame('', $e->getResponse()->getBody()); + $this->assertSame(307, $e->getResponse()->getStatusCode()); + } + $this->expectException(RedirectException::class); force_https(); - - $this->assertSame('https://example.com/', Services::response()->header('Location')->getValue()); } /** diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php index 00c03a5abc0e..ed42410db4b9 100644 --- a/tests/system/ControllerTest.php +++ b/tests/system/ControllerTest.php @@ -12,6 +12,7 @@ namespace CodeIgniter; use CodeIgniter\Config\Factories; +use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Request; use CodeIgniter\HTTP\Response; @@ -75,10 +76,13 @@ public function testConstructorHTTPS() $original = $_SERVER; $_SERVER = ['HTTPS' => 'on']; // make sure we can instantiate one - $this->controller = new class () extends Controller { - protected $forceHTTPS = 1; - }; - $this->controller->initController($this->request, $this->response, $this->logger); + try { + $this->controller = new class () extends Controller { + protected $forceHTTPS = 1; + }; + $this->controller->initController($this->request, $this->response, $this->logger); + } catch (RedirectException $e) { + } $this->assertInstanceOf(Controller::class, $this->controller); $_SERVER = $original; // restore so code coverage doesn't break From 7d5b9f8cfa847c4575bef6bdcaa5791d18f4af2f Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Sun, 25 Jun 2023 08:26:10 +0800 Subject: [PATCH 4031/8282] rework: RedirectException. UG and new tests --- system/CodeIgniter.php | 2 +- system/HTTP/Exceptions/RedirectException.php | 12 ++++ .../{Exceptions => }/ResponsableInterface.php | 4 +- tests/system/HTTP/RedirectExceptionTest.php | 61 +++++++++++++++++++ user_guide_src/source/changelogs/v4.4.0.rst | 3 + user_guide_src/source/general/errors.rst | 5 ++ user_guide_src/source/general/errors/018.php | 8 +++ 7 files changed, 91 insertions(+), 4 deletions(-) rename system/HTTP/{Exceptions => }/ResponsableInterface.php (81%) create mode 100644 tests/system/HTTP/RedirectExceptionTest.php create mode 100644 user_guide_src/source/general/errors/018.php diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index f40f3393eeae..06b0c1f5c500 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -19,10 +19,10 @@ use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\DownloadResponse; use CodeIgniter\HTTP\Exceptions\RedirectException; -use CodeIgniter\HTTP\Exceptions\ResponsableInterface; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Request; +use CodeIgniter\HTTP\ResponsableInterface; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use CodeIgniter\Router\Exceptions\RedirectException as DeprecatedRedirectException; diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 16ebc11ccd14..25c2e3d8df47 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -12,10 +12,12 @@ namespace CodeIgniter\HTTP\Exceptions; use CodeIgniter\Exceptions\HTTPExceptionInterface; +use CodeIgniter\HTTP\ResponsableInterface; use CodeIgniter\HTTP\ResponseInterface; use Config\Services; use Exception; use InvalidArgumentException; +use LogicException; use Throwable; /** @@ -48,6 +50,16 @@ public function __construct($message = '', int $code = 0, ?Throwable $previous = if ($message instanceof ResponseInterface) { $this->response = $message; $message = ''; + + if ($this->response->getHeaderLine('Location') === '' && $this->response->getHeaderLine('Refresh') === '') { + throw new LogicException( + 'The Response object passed to RedirectException does not contain a redirect address.' + ); + } + + if ($this->response->getStatusCode() < 301 || $this->response->getStatusCode() > 308) { + $this->response->setStatusCode($this->code); + } } parent::__construct($message, $code, $previous); diff --git a/system/HTTP/Exceptions/ResponsableInterface.php b/system/HTTP/ResponsableInterface.php similarity index 81% rename from system/HTTP/Exceptions/ResponsableInterface.php rename to system/HTTP/ResponsableInterface.php index e765f96784ac..0cca5356f1f7 100644 --- a/system/HTTP/Exceptions/ResponsableInterface.php +++ b/system/HTTP/ResponsableInterface.php @@ -9,9 +9,7 @@ * the LICENSE file that was distributed with this source code. */ -namespace CodeIgniter\HTTP\Exceptions; - -use CodeIgniter\HTTP\ResponseInterface; +namespace CodeIgniter\HTTP; interface ResponsableInterface { diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php new file mode 100644 index 000000000000..b33570d4332c --- /dev/null +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -0,0 +1,61 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use CodeIgniter\HTTP\Exceptions\RedirectException; +use Config\Services; +use LogicException; +use PHPUnit\Framework\TestCase; + +/** + * @internal + */ +final class RedirectExceptionTest extends TestCase +{ + protected function setUp(): void + { + Services::reset(); + } + + public function testResponse(): void + { + $response = Services::response() + ->redirect('redirect') + ->setCookie('cookie', 'value') + ->setHeader('Redirect-Header', 'value'); + $exception = new RedirectException($response); + + $this->assertSame('redirect', $exception->getResponse()->getHeaderLine('location')); + $this->assertSame(302, $exception->getResponse()->getStatusCode()); + $this->assertSame('value', $exception->getResponse()->getHeaderLine('Redirect-Header')); + $this->assertSame('value', $exception->getResponse()->getCookie('cookie')->getValue()); + } + + public function testResponseWithoutLocation(): void + { + $this->expectException(LogicException::class); + $this->expectExceptionMessage( + 'The Response object passed to RedirectException does not contain a redirect address.' + ); + + new RedirectException(Services::response()); + } + + public function testResponseWithoutStatusCode(): void + { + $response = Services::response()->setHeader('Location', 'location'); + $exception = new RedirectException($response); + + $this->assertSame('location', $exception->getResponse()->getHeaderLine('location')); + $this->assertSame(302, $exception->getResponse()->getStatusCode()); + } +} diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index b4e705557979..9e2be53da2bb 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -123,6 +123,9 @@ Others - **Request:** Added ``IncomingRequest::setValidLocales()`` method to set valid locales. - **Table:** Added ``Table::setSyncRowsWithHeading()`` method to synchronize row columns with headings. See :ref:`table-sync-rows-with-headings` for details. - **Error Handling:** Now you can use :ref:`custom-exception-handlers`. +- **RedirectException:** can also take an object that implements ResponseInterface as its first argument. +- **RedirectException:** implements ResponsableInterface +- **force_https:** no longer terminates the application, but throws a RedirectException. Message Changes *************** diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 8ba2ccd82d34..bdc9c939258e 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -118,6 +118,11 @@ redirect code to use instead of the default (``302``, "temporary redirect"): .. literalinclude:: errors/011.php +Also, an object of a class that implements ResponseInterface can be used as the first argument. +This solution is suitable for cases where you need to add additional headers or cookies in the response. + +.. literalinclude:: errors/018.php + .. _error-specify-http-status-code: Specify HTTP Status Code in Your Exception diff --git a/user_guide_src/source/general/errors/018.php b/user_guide_src/source/general/errors/018.php new file mode 100644 index 000000000000..3cba09951d8b --- /dev/null +++ b/user_guide_src/source/general/errors/018.php @@ -0,0 +1,8 @@ +redirect('https://example.com/path') + ->setHeader('Some', 'header') + ->setCookie('and', 'cookie'); + +throw new \CodeIgniter\HTTP\Exceptions\RedirectException($response); From 8a770a55b637d9e124fbc9e8838bf4cb2c008b96 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Sun, 25 Jun 2023 08:32:47 +0800 Subject: [PATCH 4032/8282] rework: RedirectException. test group --- tests/system/HTTP/RedirectExceptionTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index b33570d4332c..79a530aba08c 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -18,6 +18,8 @@ /** * @internal + * + * @group Others */ final class RedirectExceptionTest extends TestCase { From 3e1fa646fdf49e57d0addda3d0c1216dfa88b1e5 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Tue, 27 Jun 2023 23:26:22 +0800 Subject: [PATCH 4033/8282] rework: RedirectException. tests, docs and changes --- system/HTTP/Exceptions/RedirectException.php | 19 ++++--- tests/system/HTTP/RedirectExceptionTest.php | 58 +++++++++++++++----- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 25c2e3d8df47..605f40eaba33 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -35,7 +35,8 @@ class RedirectException extends Exception implements ResponsableInterface, HTTPE protected ?ResponseInterface $response = null; /** - * @param ResponseInterface|string $message + * @param ResponseInterface|string $message Response object or a string containing a relative URI. + * @param int $code HTTP status code to redirect if $message is a string. */ public function __construct($message = '', int $code = 0, ?Throwable $previous = null) { @@ -67,16 +68,16 @@ public function __construct($message = '', int $code = 0, ?Throwable $previous = public function getResponse(): ResponseInterface { - if (null !== $this->response) { - return $this->response; + if (null === $this->response) { + $this->response = Services::response() + ->redirect(base_url($this->getMessage()), 'auto', $this->getCode()); } - $logger = Services::logger(); - $response = Services::response(); - $logger->info('REDIRECTED ROUTE at ' . $this->getMessage()); + Services::logger()->info( + 'REDIRECTED ROUTE at ' + . ($this->response->getHeaderLine('Location') ?: substr($this->response->getHeaderLine('Refresh'), 6)) + ); - // If the route is a 'redirect' route, it throws - // the exception with the $to as the message - return $response->redirect(base_url($this->getMessage()), 'auto', $this->getCode()); + return $this->response; } } diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index 79a530aba08c..acf91a392582 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -12,9 +12,12 @@ namespace CodeIgniter\HTTP; use CodeIgniter\HTTP\Exceptions\RedirectException; +use CodeIgniter\Log\Logger; +use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use Config\Services; use LogicException; use PHPUnit\Framework\TestCase; +use Tests\Support\Log\Handlers\TestHandler; /** * @internal @@ -26,20 +29,22 @@ final class RedirectExceptionTest extends TestCase protected function setUp(): void { Services::reset(); + Services::injectMock('logger', new Logger(new LoggerConfig())); } public function testResponse(): void { - $response = Services::response() - ->redirect('redirect') - ->setCookie('cookie', 'value') - ->setHeader('Redirect-Header', 'value'); - $exception = new RedirectException($response); - - $this->assertSame('redirect', $exception->getResponse()->getHeaderLine('location')); - $this->assertSame(302, $exception->getResponse()->getStatusCode()); - $this->assertSame('value', $exception->getResponse()->getHeaderLine('Redirect-Header')); - $this->assertSame('value', $exception->getResponse()->getCookie('cookie')->getValue()); + $response = (new RedirectException( + Services::response() + ->redirect('redirect') + ->setCookie('cookie', 'value') + ->setHeader('Redirect-Header', 'value') + ))->getResponse(); + + $this->assertSame('redirect', $response->getHeaderLine('location')); + $this->assertSame(302, $response->getStatusCode()); + $this->assertSame('value', $response->getHeaderLine('Redirect-Header')); + $this->assertSame('value', $response->getCookie('cookie')->getValue()); } public function testResponseWithoutLocation(): void @@ -54,10 +59,35 @@ public function testResponseWithoutLocation(): void public function testResponseWithoutStatusCode(): void { - $response = Services::response()->setHeader('Location', 'location'); - $exception = new RedirectException($response); + $response = (new RedirectException(Services::response()->setHeader('Location', 'location')))->getResponse(); + + $this->assertSame('location', $response->getHeaderLine('location')); + $this->assertSame(302, $response->getStatusCode()); + } + + public function testLoggingLocationHeader(): void + { + $uri = 'http://location'; + $expected = 'INFO - ' . date('Y-m-d') . ' --> REDIRECTED ROUTE at ' . $uri; + $response = (new RedirectException(Services::response()->redirect($uri)))->getResponse(); + + $logs = TestHandler::getLogs(); + + $this->assertSame($uri, $response->getHeaderLine('Location')); + $this->assertSame('', $response->getHeaderLine('Refresh')); + $this->assertSame($expected, $logs[0]); + } + + public function testLoggingRefreshHeader(): void + { + $uri = 'http://location'; + $expected = 'INFO - ' . date('Y-m-d') . ' --> REDIRECTED ROUTE at ' . $uri; + $response = (new RedirectException(Services::response()->redirect($uri, 'refresh')))->getResponse(); + + $logs = TestHandler::getLogs(); - $this->assertSame('location', $exception->getResponse()->getHeaderLine('location')); - $this->assertSame(302, $exception->getResponse()->getStatusCode()); + $this->assertSame($uri, substr($response->getHeaderLine('Refresh'), 6)); + $this->assertSame('', $response->getHeaderLine('Location')); + $this->assertSame($expected, $logs[0]); } } From 17583a126540537ca91baab021877aaa036230ff Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Wed, 28 Jun 2023 07:42:56 +0800 Subject: [PATCH 4034/8282] rework: RedirectException. changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 9e2be53da2bb..2a405e665138 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -104,6 +104,7 @@ Helpers and Functions - **Array:** Added :php:func:`array_group_by()` helper function to group data values together. Supports dot-notation syntax. +- **Common:** :php:func:`force_https()` no longer terminates the application, but throws a ``RedirectException``. Others ====== @@ -124,8 +125,7 @@ Others - **Table:** Added ``Table::setSyncRowsWithHeading()`` method to synchronize row columns with headings. See :ref:`table-sync-rows-with-headings` for details. - **Error Handling:** Now you can use :ref:`custom-exception-handlers`. - **RedirectException:** can also take an object that implements ResponseInterface as its first argument. -- **RedirectException:** implements ResponsableInterface -- **force_https:** no longer terminates the application, but throws a RedirectException. +- **RedirectException:** implements ResponsableInterface. Message Changes *************** From 9de07170c38ffc559c0abf14259a829d5c36e265 Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Wed, 28 Jun 2023 10:21:29 +0800 Subject: [PATCH 4035/8282] Update user_guide_src/source/general/errors.rst Version of the new functionality. Co-authored-by: kenjis --- user_guide_src/source/general/errors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index bdc9c939258e..d2b48716cf9e 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -118,7 +118,7 @@ redirect code to use instead of the default (``302``, "temporary redirect"): .. literalinclude:: errors/011.php -Also, an object of a class that implements ResponseInterface can be used as the first argument. +Also, since v4.4.0 an object of a class that implements ResponseInterface can be used as the first argument. This solution is suitable for cases where you need to add additional headers or cookies in the response. .. literalinclude:: errors/018.php From abb921a7b7a2c171bbfef2703b7985334bbf4a8b Mon Sep 17 00:00:00 2001 From: Andrey Pyzhikov <5071@mail.ru> Date: Thu, 29 Jun 2023 08:46:38 +0800 Subject: [PATCH 4036/8282] rebase --- user_guide_src/source/changelogs/v4.4.0.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 2a405e665138..20495ad2874e 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -149,6 +149,10 @@ Changes this restriction has been removed. - **RouteCollection:** The array structure of the protected property ``$routes`` has been modified for performance. +- **HSTS:** Now :php:func:`force_https()` or + ``Config\App::$forceGlobalSecureRequests = true`` sets the HTTP status code 307, + which allows the HTTP request method to be preserved after the redirect. + In previous versions, it was 302. Deprecations ************ From 6c3b6c4f1851854155dee228505c532c810f5e8f Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 12:02:46 +0900 Subject: [PATCH 4037/8282] config: change the default value of $shareOptions to false --- app/Config/CURLRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Config/CURLRequest.php b/app/Config/CURLRequest.php index 6c3ed74aa987..5a3d4e9311b2 100644 --- a/app/Config/CURLRequest.php +++ b/app/Config/CURLRequest.php @@ -16,5 +16,5 @@ class CURLRequest extends BaseConfig * If true, all the options won't be reset between requests. * It may cause an error request with unnecessary headers. */ - public bool $shareOptions = true; + public bool $shareOptions = false; } From 15677c30c6ad898a13342d4b106f3abe40296211 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 12:05:16 +0900 Subject: [PATCH 4038/8282] docs: update user guide --- user_guide_src/source/installation/upgrade_440.rst | 2 ++ user_guide_src/source/libraries/curlrequest.rst | 14 ++++++++++---- .../source/libraries/curlrequest/001.php | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index c82723aa129d..39aa16e07716 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -153,6 +153,8 @@ and it is recommended that you merge the updated versions with your application: Config ------ +- app/Config/CURLRequest.php + - The default value of :ref:`$shareOptions ` has been change to ``false``. - app/Config/Exceptions.php - Added the new method ``handler()`` that define custom Exception Handlers. See :ref:`custom-exception-handlers`. diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst index 18afd51f771c..d0741ee366b8 100644 --- a/user_guide_src/source/libraries/curlrequest.rst +++ b/user_guide_src/source/libraries/curlrequest.rst @@ -23,17 +23,23 @@ to change very little to move over to use Guzzle. Config for CURLRequest ********************** +.. _curlrequest-sharing-options: + Sharing Options =============== -Due to historical reasons, by default, the CURLRequest shares all the options between requests. -If you send more than one request with an instance of the class, -this behavior may cause an error request with unnecessary headers and body. +.. note:: Since v4.4.0, the default value has been changed to ``false``. This + setting exists only for backward compatibility. New users do not need to + change the setting. -You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``: +If you want to share all the options between requests, set ``$shareOptions`` to +``true`` in **app/Config/CURLRequest.php**: .. literalinclude:: curlrequest/001.php +If you send more than one request with an instance of the class, this behavior +may cause an error request with unnecessary headers and body. + .. note:: Before v4.2.0, the request body is not reset even if ``$shareOptions`` is false due to a bug. ******************* diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php index e89e0692462f..303366336dbb 100644 --- a/user_guide_src/source/libraries/curlrequest/001.php +++ b/user_guide_src/source/libraries/curlrequest/001.php @@ -6,7 +6,6 @@ class CURLRequest extends BaseConfig { - public $shareOptions = false; - // ... + public bool $shareOptions = true; } From 2753ad7d89b70896f199a51798f89a417134ce0d Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 16:57:14 +0900 Subject: [PATCH 4039/8282] docs: fix @param --- system/CodeIgniter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 2a777474c56e..5f51a2e175a5 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -732,7 +732,7 @@ public static function cache(int $time) * Caches the full response from the current request. Used for * full-page caching for very high performance. * - * @return mixed + * @return bool */ public function cachePage(Cache $config) { @@ -918,7 +918,7 @@ protected function createController() * 2. PHP CLI: accessed by CLI via php public/index.php, arguments become URI segments, * sent to Controllers via Routes, output varies * - * @param mixed $class + * @param Controller $class * * @return false|ResponseInterface|string|void */ From 757de43da5813a62633e1ce183dd0527d8f39c7f Mon Sep 17 00:00:00 2001 From: puschie286 Date: Thu, 29 Jun 2023 10:39:51 +0200 Subject: [PATCH 4040/8282] Update user_guide_src/source/database/configuration.rst Co-authored-by: kenjis --- user_guide_src/source/database/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index d2b6b893abe6..077231fa3dca 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -174,7 +174,7 @@ Explanation of Values: **compress** Whether or not to use client compression (``MySQLi`` only). **strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application (``MySQLi`` only). -**port** The database port number - Empty for default port (or dynamic port with ``SQLSRV``) +**port** The database port number - Empty string ``''`` for default port (or dynamic port with ``SQLSRV``). **foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only). .. important:: SQLite3 Foreign Key constraint is disabled by default. From 70f566f5224af1b5ef35844f44ef91b22e8b1c4a Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Thu, 29 Jun 2023 18:24:08 +0800 Subject: [PATCH 4041/8282] docs: Add the type. --- system/BaseModel.php | 2 +- system/Model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/BaseModel.php b/system/BaseModel.php index 8d5b4276eb43..06b8190f037f 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -1711,7 +1711,7 @@ protected function transformDataToArray($data, string $type): array * * @param string $name Name * - * @return array|bool|int|object|string|null + * @return array|bool|float|int|object|string|null */ public function __get(string $name) { diff --git a/system/Model.php b/system/Model.php index c28bf2b9da1c..b60bb966dd85 100644 --- a/system/Model.php +++ b/system/Model.php @@ -792,7 +792,7 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur * * @param string $name Name * - * @return array|BaseBuilder|bool|int|object|string|null + * @return array|BaseBuilder|bool|float|int|object|string|null */ public function __get(string $name) { @@ -821,7 +821,7 @@ public function __isset(string $name): bool * Provides direct access to method in the builder (if available) * and the database connection. * - * @return array|BaseBuilder|bool|float|int|object|string|null + * @return $this|array|BaseBuilder|bool|float|int|object|string|null */ public function __call(string $name, array $params) { From 713db9e2c98e4ec87fb54f093d287bc894722805 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 18:30:44 +0900 Subject: [PATCH 4042/8282] fix: change Services::security() param type --- system/Config/Services.php | 6 ++---- user_guide_src/source/changelogs/v4.4.0.rst | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index 779afa3ccaf1..5e0c4e70b96e 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -627,16 +627,14 @@ public static function router(?RouteCollectionInterface $routes = null, ?Request * secure, most notably the CSRF protection tools. * * @return Security - * - * @TODO replace the first parameter type `?App` with `?SecurityConfig` */ - public static function security(?App $config = null, bool $getShared = true) + public static function security(?SecurityConfig $config = null, bool $getShared = true) { if ($getShared) { return static::getSharedInstance('security', $config); } - $config = config(SecurityConfig::class); + $config ??= config(SecurityConfig::class); return new Security($config); } diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 638cf2efc266..403e2ecb2829 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -45,6 +45,8 @@ Interface Changes Method Signature Changes ======================== +- **Services:** The first parameter of ``Services::security()`` has been + changed from ``Config\App`` to ``Config\Security``. - **Routing:** The third parameter ``Routing $routing`` has been added to ``RouteCollection::__construct()``. - **Validation:** The method signature of ``Validation::check()`` has been changed. From 24e9cad7b7956dd7e2a3e5570eb6c65131d8bfa7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 19:37:15 +0900 Subject: [PATCH 4043/8282] docs: add instruction in upgrade note --- user_guide_src/source/changelogs/v4.4.0.rst | 17 +++++++++++++---- .../source/installation/upgrade_440.rst | 18 +++++++++++------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 403e2ecb2829..fd9fd2740a1c 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -45,12 +45,13 @@ Interface Changes Method Signature Changes ======================== +.. _v440-parameter-type-changes: + +Parameter Type Changes +---------------------- + - **Services:** The first parameter of ``Services::security()`` has been changed from ``Config\App`` to ``Config\Security``. -- **Routing:** The third parameter ``Routing $routing`` has been added to - ``RouteCollection::__construct()``. -- **Validation:** The method signature of ``Validation::check()`` has been changed. - The ``string`` typehint on the ``$rule`` parameter was removed. - **Session:** The second parameter of ``Session::__construct()`` has been changed from ``Config\App`` to ``Config\Session``. - **Session:** The first parameter of ``__construct()`` in ``BaseHandler``, @@ -58,6 +59,14 @@ Method Signature Changes has been changed from ``Config\App`` to ``Config\Session``. - **Security:** The first parameter of ``Security::__construct()`` has been changed from ``Config\App`` to ``Config\Security``. +- **Validation:** The method signature of ``Validation::check()`` has been changed. + The ``string`` typehint on the ``$rule`` parameter was removed. + +Added Parameters +---------------- + +- **Routing:** The third parameter ``Routing $routing`` has been added to + ``RouteCollection::__construct()``. Enhancements ************ diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index 0080a767bdc0..f2018c9684dd 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -66,6 +66,17 @@ Interface Changes Some interface changes have been made. Classes that implement them should update their APIs to reflect the changes. See :ref:`v440-interface-changes` for details. +Method Signature Changes +======================== + +Some method signature changes have been made. Classes that extend them should +update their APIs to reflect the changes. See :ref:`v440-method-signature-changes` +for details. + +Also, the parameter types of some constructors and ``Services::security()`` have changed. +If you call them with the parameters, change the parameter values. +See :ref:`v440-parameter-type-changes` for details. + RouteCollection::$routes ======================== @@ -75,13 +86,6 @@ performance. If you extend ``RouteCollection`` and use the ``$routes``, update your code to match the new array structure. -Method Signature Changes -======================== - -Some method signature changes have been made. Classes that extend them should -update their APIs to reflect the changes. See :ref:`v440-method-signature-changes` -for details. - Mandatory File Changes ********************** From fccea01ba9185dd6592a1177b41a2fdea4a0a2fc Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 21:20:00 +0900 Subject: [PATCH 4044/8282] fix: remove incorrect param type in number_to_roman() --- system/Helpers/number_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index c61229dad345..32dd4e09d68c 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -173,9 +173,9 @@ function format_number(float $num, int $precision = 1, ?string $locale = null, a /** * Convert a number to a roman numeral. * - * @param string $num it will convert to int + * @param int|string $num it will convert to int */ - function number_to_roman(string $num): ?string + function number_to_roman($num): ?string { static $map = [ 'M' => 1000, From 41dbea0c02e9dbda3fa2feaeab54084ac8604205 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 29 Jun 2023 21:23:02 +0900 Subject: [PATCH 4045/8282] docs: align comments --- user_guide_src/source/helpers/number_helper/009.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/helpers/number_helper/009.php b/user_guide_src/source/helpers/number_helper/009.php index 0a520a198943..a55daa265677 100644 --- a/user_guide_src/source/helpers/number_helper/009.php +++ b/user_guide_src/source/helpers/number_helper/009.php @@ -1,5 +1,5 @@ Date: Thu, 29 Jun 2023 21:23:23 +0900 Subject: [PATCH 4046/8282] docs: update reference --- user_guide_src/source/helpers/number_helper.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst index d43967c502f7..0528aa07eee1 100644 --- a/user_guide_src/source/helpers/number_helper.rst +++ b/user_guide_src/source/helpers/number_helper.rst @@ -92,7 +92,7 @@ The following functions are available: .. php:function:: number_to_roman($num) - :param string $num: The number want to convert + :param int|string $num: The number want to convert :returns: The roman number converted from given parameter :rtype: string|null @@ -101,4 +101,4 @@ The following functions are available: .. literalinclude:: number_helper/009.php This function only handles numbers in the range 1 through 3999. - It will return null for any value outside that range. + It will return ``null`` for any value outside that range. From 8f6c2dba26146473d009a8b75a762c174c703028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:21:50 +0000 Subject: [PATCH 4047/8282] chore(deps-dev): update rector/rector requirement from 0.17.1 to 0.17.2 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.17.1...0.17.2) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 674e51659808..c7da41b6b216 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.1", + "rector/rector": "0.17.2", "vimeo/psalm": "^5.0" }, "suggest": { From 4823409a4b26210aae463aa1eafaa04791c17782 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 09:57:58 +0900 Subject: [PATCH 4048/8282] docs: update comment --- app/Config/Cache.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Config/Cache.php b/app/Config/Cache.php index 659d9ed6ae38..c19358ce8449 100644 --- a/app/Config/Cache.php +++ b/app/Config/Cache.php @@ -53,12 +53,12 @@ class Cache extends BaseConfig * Whether to take the URL query string into consideration when generating * output cache files. Valid options are: * - * false = Disabled - * true = Enabled, take all query parameters into account. - * Please be aware that this may result in numerous cache - * files generated for the same page over and over again. - * array('q') = Enabled, but only take into account the specified list - * of query parameters. + * false = Disabled + * true = Enabled, take all query parameters into account. + * Please be aware that this may result in numerous cache + * files generated for the same page over and over again. + * ['q'] = Enabled, but only take into account the specified list + * of query parameters. * * @var bool|string[] */ From a98b6f0e0524f2ff388a98a725b8148ddf326def Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 10:20:26 +0900 Subject: [PATCH 4049/8282] docs: add "Configuring Caching" --- user_guide_src/source/general/caching.rst | 30 ++++++++++++++++++--- user_guide_src/source/libraries/caching.rst | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/caching.rst b/user_guide_src/source/general/caching.rst index 04a144141ff2..64af64405026 100644 --- a/user_guide_src/source/general/caching.rst +++ b/user_guide_src/source/general/caching.rst @@ -30,6 +30,33 @@ browser. .. note:: The Benchmark tag is not cached so you can still view your page load speed when caching is enabled. +Configuring Caching +=================== + +Setting Cache Engine +-------------------- + +Before using Web Page Caching, you must set the cache engine up by editing +**app/Config/Cache.php**. See :ref:`libraries-caching-configuring-the-cache` +for details. + +Setting $cacheQueryString +------------------------- + +You can set whether or not to include the query string when generating the cache +with ``Config\Cache::$cacheQueryString``. + +Valid options are: + +- ``false``: (default) Disabled. The query string is not taken into account; the + same cache is returned for requests with the same URI path but different query + strings. +- ``true``: Enabled, take all query parameters into account. Be aware that this + may result in numerous cache generated for the same page over and over + again. +- **array**: Enabled, but only take into account the specified list of query + parameters. E.g., ``['q', 'page']``. + Enabling Caching ================ @@ -48,9 +75,6 @@ you. Once the tag is in place, your pages will begin being cached. .. important:: If you change configuration options that might affect your output, you have to manually delete your cache files. -.. note:: Before the cache files can be written you must set the cache - engine up by editing **app/Config/Cache.php**. - Deleting Caches =============== diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 39834b0121bb..671c92cdb488 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -23,6 +23,8 @@ You can grab an instance of the cache engine directly through the Services class .. literalinclude:: caching/002.php +.. _libraries-caching-configuring-the-cache: + ********************* Configuring the Cache ********************* From 5f5a5be3337889637f5298bc500ad67e38b23c24 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 10:22:46 +0900 Subject: [PATCH 4050/8282] docs: fix descriptions --- user_guide_src/source/general/caching.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/caching.rst b/user_guide_src/source/general/caching.rst index 64af64405026..4d2426e30c26 100644 --- a/user_guide_src/source/general/caching.rst +++ b/user_guide_src/source/general/caching.rst @@ -21,8 +21,8 @@ How Does Caching Work? Caching can be enabled on a per-page basis, and you can set the length of time that a page should remain cached before being refreshed. When a -page is loaded for the first time, the file will be cached using the -currently configured cache engine. On subsequent page loads, the cache file +page is loaded for the first time, the page will be cached using the +currently configured cache engine. On subsequent page loads, the cache will be retrieved and sent to the requesting user's browser. If it has expired, it will be deleted and refreshed before being sent to the browser. @@ -73,12 +73,12 @@ the order that it appears, so place it wherever it seems most logical to you. Once the tag is in place, your pages will begin being cached. .. important:: If you change configuration options that might affect - your output, you have to manually delete your cache files. + your output, you have to manually delete your cache. Deleting Caches =============== -If you no longer wish to cache a file you can remove the caching tag and +If you no longer wish to cache a page you can remove the caching tag and it will no longer be refreshed when it expires. .. note:: Removing the tag will not delete the cache immediately. It will From 0ea35d6aff3f11be301ac0b568898329c37a4af6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 17 May 2023 11:55:13 +0900 Subject: [PATCH 4051/8282] docs: do not recomment to use PHP function It is a bad practice. --- user_guide_src/source/libraries/sessions.rst | 7 ++++--- user_guide_src/source/libraries/sessions/037.php | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 86b5212ad6a0..98c62d4e8c15 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -353,12 +353,13 @@ destroy() --------- To clear the current session (for example, during a logout), you may -simply use either PHP's `session_destroy() `_ -function, or the library's ``destroy()`` method. Both will work in exactly the -same way: +simply use the library's ``destroy()`` method: .. literalinclude:: sessions/037.php +This method will work in exactly the same way as PHP's +`session_destroy() `_ function. + .. note:: This must be the last session-related operation that you do during the same request. All session data (including flashdata and tempdata) will be destroyed permanently and functions will be diff --git a/user_guide_src/source/libraries/sessions/037.php b/user_guide_src/source/libraries/sessions/037.php index 1e7931f34f33..9f474a3c7d31 100644 --- a/user_guide_src/source/libraries/sessions/037.php +++ b/user_guide_src/source/libraries/sessions/037.php @@ -1,5 +1,3 @@ destroy(); From 12c7bb9ad9138bb43e0f1ec76ca107ab7ca63836 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:03:52 +0900 Subject: [PATCH 4052/8282] docs: remove inaccurate description --- user_guide_src/source/libraries/sessions.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 98c62d4e8c15..3bda972a380f 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -360,10 +360,8 @@ simply use the library's ``destroy()`` method: This method will work in exactly the same way as PHP's `session_destroy() `_ function. -.. note:: This must be the last session-related operation that you do - during the same request. All session data (including flashdata and - tempdata) will be destroyed permanently and functions will be - unusable during the same request after you destroy the session. +This must be the last session-related operation that you do during the same request. +All session data (including flashdata and tempdata) will be destroyed permanently. .. _session-stop: From cba77132b8ff00f2a2a434301d80686ed5ee45f6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:04:17 +0900 Subject: [PATCH 4053/8282] docs: add note --- user_guide_src/source/libraries/sessions.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 3bda972a380f..3c0e13d77552 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -363,6 +363,9 @@ This method will work in exactly the same way as PHP's This must be the last session-related operation that you do during the same request. All session data (including flashdata and tempdata) will be destroyed permanently. +.. note:: You do not have to call this method from usual code. Cleanup session + data rather than destroying the session. + .. _session-stop: stop() From 5cfefc011a3c2c4f4cfa132d6b041f84ca4e6e8b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 13:16:29 +0900 Subject: [PATCH 4054/8282] docs: add @phpstan-ignore-next-line in number_to_size() --- system/Helpers/number_helper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 32dd4e09d68c..af0d6fb83cc8 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -24,8 +24,10 @@ function number_to_size($num, int $precision = 1, ?string $locale = null) { // Strip any formatting & ensure numeric input try { + // @phpstan-ignore-next-line $num = 0 + str_replace(',', '', $num); } catch (ErrorException $ee) { + // Catch "Warning: A non-numeric value encountered" return false; } From f6435c3e8d1c8ad413d253b6125519e3761170d2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 17:20:29 +0900 Subject: [PATCH 4055/8282] refactor: extract PageCache class --- system/Cache/PageCache.php | 130 ++++++++++++++ system/CodeIgniter.php | 36 ++-- system/Config/BaseService.php | 2 + system/Config/Services.php | 18 ++ tests/system/Cache/PageCacheTest.php | 249 +++++++++++++++++++++++++++ 5 files changed, 415 insertions(+), 20 deletions(-) create mode 100644 system/Cache/PageCache.php create mode 100644 tests/system/Cache/PageCacheTest.php diff --git a/system/Cache/PageCache.php b/system/Cache/PageCache.php new file mode 100644 index 000000000000..ad52f02433bc --- /dev/null +++ b/system/Cache/PageCache.php @@ -0,0 +1,130 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Cache; + +use CodeIgniter\HTTP\CLIRequest; +use CodeIgniter\HTTP\IncomingRequest; +use CodeIgniter\HTTP\ResponseInterface; +use Config\Cache as CacheConfig; +use Exception; + +/** + * Web Page Caching + */ +class PageCache +{ + /** + * Whether to take the URL query string into consideration when generating + * output cache files. Valid options are: + * + * false = Disabled + * true = Enabled, take all query parameters into account. + * Please be aware that this may result in numerous cache + * files generated for the same page over and over again. + * array('q') = Enabled, but only take into account the specified list + * of query parameters. + * + * @var bool|string[] + */ + protected $cacheQueryString = false; + + protected CacheInterface $cache; + + public function __construct(CacheConfig $config, CacheInterface $cache) + { + $this->cacheQueryString = $config->cacheQueryString; + $this->cache = $cache; + } + + /** + * Generates the cache key to use from the current request. + * + * @param CLIRequest|IncomingRequest $request + * + * @internal for testing purposes only + */ + public function generateCacheKey($request): string + { + if ($request instanceof CLIRequest) { + return md5($request->getPath()); + } + + $uri = clone $request->getUri(); + + $query = $this->cacheQueryString + ? $uri->getQuery(is_array($this->cacheQueryString) ? ['only' => $this->cacheQueryString] : []) + : ''; + + return md5($uri->setFragment('')->setQuery($query)); + } + + /** + * Caches the full response from the current request. + * + * @param CLIRequest|IncomingRequest $request + * + * @params int $ttl time to live in seconds. + */ + public function cachePage($request, ResponseInterface $response, int $ttl): bool + { + $headers = []; + + foreach ($response->headers() as $header) { + $headers[$header->getName()] = $header->getValueLine(); + } + + return $this->cache->save( + $this->generateCacheKey($request), + serialize(['headers' => $headers, 'output' => $response->getBody()]), + $ttl + ); + } + + /** + * Gets the cached response for the request. + * + * @param CLIRequest|IncomingRequest $request + */ + public function getCachedResponse($request, ResponseInterface $response): ?ResponseInterface + { + if ($cachedResponse = $this->cache->get($this->generateCacheKey($request))) { + $cachedResponse = unserialize($cachedResponse); + + if ( + ! is_array($cachedResponse) + || ! isset($cachedResponse['output']) + || ! isset($cachedResponse['headers']) + ) { + throw new Exception('Error unserializing page cache'); + } + + $headers = $cachedResponse['headers']; + $output = $cachedResponse['output']; + + // Clear all default headers + foreach (array_keys($response->headers()) as $key) { + $response->removeHeader($key); + } + + // Set cached headers + foreach ($headers as $name => $value) { + $response->setHeader($name, $value); + } + + $response->setBody($output); + + return $response; + } + + return null; + } +} diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 06b0c1f5c500..b8625b281978 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -12,6 +12,7 @@ namespace CodeIgniter; use Closure; +use CodeIgniter\Cache\PageCache; use CodeIgniter\Debug\Timer; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; @@ -175,6 +176,11 @@ class CodeIgniter */ protected int $bufferLevel; + /** + * Web Page Caching + */ + protected PageCache $pageCache; + /** * Constructor. */ @@ -182,6 +188,8 @@ public function __construct(App $config) { $this->startTime = microtime(true); $this->config = $config; + + $this->pageCache = Services::pagecache(); } /** @@ -518,7 +526,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. if (static::$cacheTTL > 0) { - $this->cachePage($cacheConfig); + $this->pageCache->cachePage($this->request, $this->response, static::$cacheTTL); } // Update the performance metrics @@ -674,27 +682,11 @@ protected function forceSecureAccess($duration = 31_536_000) */ public function displayCache(Cache $config) { - if ($cachedResponse = cache()->get($this->generateCacheName($config))) { - $cachedResponse = unserialize($cachedResponse); - if (! is_array($cachedResponse) || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers'])) { - throw new Exception('Error unserializing page cache'); - } - - $headers = $cachedResponse['headers']; - $output = $cachedResponse['output']; - - // Clear all default headers - foreach (array_keys($this->response->headers()) as $key) { - $this->response->removeHeader($key); - } - - // Set cached headers - foreach ($headers as $name => $value) { - $this->response->setHeader($name, $value); - } + if ($cachedResponse = $this->pageCache->getCachedResponse($this->request, $this->response)) { + $this->response = $cachedResponse; $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); - $output = $this->displayPerformanceMetrics($output); + $output = $this->displayPerformanceMetrics($cachedResponse->getBody()); $this->response->setBody($output); return $this->response; @@ -716,6 +708,8 @@ public static function cache(int $time) * full-page caching for very high performance. * * @return bool + * + * @deprecated 4.4.0 No longer used. */ public function cachePage(Cache $config) { @@ -741,6 +735,8 @@ public function getPerformanceStats(): array /** * Generates the cache name to use for our full-page caching. + * + * @deprecated 4.4.0 No longer used. */ protected function generateCacheName(Cache $config): string { diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index d517691b0c1f..f98ec9192856 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -14,6 +14,7 @@ use CodeIgniter\Autoloader\Autoloader; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Cache\CacheInterface; +use CodeIgniter\Cache\PageCache; use CodeIgniter\CLI\Commands; use CodeIgniter\CodeIgniter; use CodeIgniter\Database\ConnectionInterface; @@ -111,6 +112,7 @@ * @method static Logger logger($getShared = true) * @method static MigrationRunner migrations(Migrations $config = null, ConnectionInterface $db = null, $getShared = true) * @method static Negotiate negotiator(RequestInterface $request = null, $getShared = true) + * @method static PageCache pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) * @method static Pager pager(ConfigPager $config = null, RendererInterface $view = null, $getShared = true) * @method static Parser parser($viewPath = null, ConfigView $config = null, $getShared = true) * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true) diff --git a/system/Config/Services.php b/system/Config/Services.php index 5e0c4e70b96e..14c9b122cc36 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -13,6 +13,7 @@ use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Cache\CacheInterface; +use CodeIgniter\Cache\PageCache; use CodeIgniter\CLI\Commands; use CodeIgniter\CodeIgniter; use CodeIgniter\Database\ConnectionInterface; @@ -438,6 +439,23 @@ public static function negotiator(?RequestInterface $request = null, bool $getSh return new Negotiate($request); } + /** + * Return the PageCache. + * + * @return PageCache + */ + public static function pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) + { + if ($getShared) { + return static::getSharedInstance('pagecache', $config, $cache); + } + + $config ??= config(Cache::class); + $cache ??= AppServices::cache(); + + return new PageCache($config, $cache); + } + /** * Return the appropriate pagination handler. * diff --git a/tests/system/Cache/PageCacheTest.php b/tests/system/Cache/PageCacheTest.php new file mode 100644 index 000000000000..d95c9f10f91f --- /dev/null +++ b/tests/system/Cache/PageCacheTest.php @@ -0,0 +1,249 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Cache; + +use CodeIgniter\HTTP\CLIRequest; +use CodeIgniter\HTTP\IncomingRequest; +use CodeIgniter\HTTP\Response; +use CodeIgniter\HTTP\ResponseInterface; +use CodeIgniter\HTTP\URI; +use CodeIgniter\HTTP\UserAgent; +use CodeIgniter\Test\CIUnitTestCase; +use Config\App as AppConfig; +use Config\Cache as CacheConfig; +use ErrorException; +use Exception; + +/** + * @backupGlobals enabled + * + * @internal + * + * @group Others + */ +final class PageCacheTest extends CIUnitTestCase +{ + private AppConfig $appConfig; + + protected function setUp(): void + { + parent::setUp(); + + $this->appConfig = new AppConfig(); + } + + private function createIncomingRequest( + string $uri = '', + array $query = [], + ?AppConfig $appConfig = null + ): IncomingRequest { + $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = []; + + $_SERVER['REQUEST_URI'] = '/' . $uri . ($query ? '?' . http_build_query($query) : ''); + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $appConfig ??= $this->appConfig; + + $siteUri = new URI($appConfig->baseURL . $uri); + if ($query !== []) { + $_GET = $_REQUEST = $query; + $siteUri->setQueryArray($query); + } + + return new IncomingRequest( + $appConfig, + $siteUri, + null, + new UserAgent() + ); + } + + /** + * @phpstan-param list $params + */ + private function createCLIRequest(array $params = [], ?AppConfig $appConfig = null): CLIRequest + { + $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = []; + + $_SERVER['argv'] = ['public/index.php', ...$params]; + $_SERVER['SCRIPT_NAME'] = 'public/index.php'; + + $appConfig ??= $this->appConfig; + + return new CLIRequest($appConfig); + } + + private function createPageCache(?CacheConfig $cacheConfig = null): pageCache + { + $cache = mock(CacheFactory::class); + + $cacheConfig ??= new CacheConfig(); + + return new PageCache($cacheConfig, $cache); + } + + public function testCachePageIncomingRequest() + { + $pageCache = $this->createPageCache(); + + $request = $this->createIncomingRequest('foo/bar'); + + $response = new Response($this->appConfig); + $response->setHeader('ETag', 'abcd1234'); + $response->setBody('The response body.'); + + $return = $pageCache->cachePage($request, $response, 300); + + $this->assertTrue($return); + + // Check cache with a request with the same URI path. + $request = $this->createIncomingRequest('foo/bar'); + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); + $this->assertSame('The response body.', $cachedResponse->getBody()); + $this->assertSame('abcd1234', $cachedResponse->getHeaderLine('ETag')); + + // Check cache with a request with the same URI path and different query string. + $request = $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); + $this->assertSame('The response body.', $cachedResponse->getBody()); + $this->assertSame('abcd1234', $cachedResponse->getHeaderLine('ETag')); + + // Check cache with another request with the different URI path. + $request = $this->createIncomingRequest('another'); + + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertNull($cachedResponse); + } + + public function testCachePageIncomingRequestWithCacheQueryString() + { + $cacheConfig = new CacheConfig(); + $cacheConfig->cacheQueryString = true; + $pageCache = $this->createPageCache($cacheConfig); + + $request = $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); + + $response = new Response($this->appConfig); + $response->setHeader('ETag', 'abcd1234'); + $response->setBody('The response body.'); + + $return = $pageCache->cachePage($request, $response, 300); + + $this->assertTrue($return); + + // Check cache with a request with the same URI path and same query string. + $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); + $this->assertSame('The response body.', $cachedResponse->getBody()); + $this->assertSame('abcd1234', $cachedResponse->getHeaderLine('ETag')); + + // Check cache with a request with the same URI path and different query string. + $request = $this->createIncomingRequest('foo/bar', ['xfoo' => 'bar', 'bar' => 'baz']); + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertNull($cachedResponse); + + // Check cache with another request with the different URI path. + $request = $this->createIncomingRequest('another'); + + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertNull($cachedResponse); + } + + public function testCachePageCLIRequest() + { + $pageCache = $this->createPageCache(); + + $request = $this->createCLIRequest(['foo', 'bar']); + + $response = new Response($this->appConfig); + $response->setBody('The response body.'); + + $return = $pageCache->cachePage($request, $response, 300); + + $this->assertTrue($return); + + // Check cache with a request with the same params. + $request = $this->createCLIRequest(['foo', 'bar']); + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); + $this->assertSame('The response body.', $cachedResponse->getBody()); + + // Check cache with another request with the different params. + $request = $this->createCLIRequest(['baz']); + + $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + + $this->assertNull($cachedResponse); + } + + public function testUnserializeError() + { + $this->expectException(ErrorException::class); + $this->expectExceptionMessage('unserialize(): Error at offset 0 of 12 bytes'); + + $cache = mock(CacheFactory::class); + $cacheConfig = new CacheConfig(); + $pageCache = new PageCache($cacheConfig, $cache); + + $request = $this->createIncomingRequest('foo/bar'); + + $response = new Response($this->appConfig); + $response->setHeader('ETag', 'abcd1234'); + $response->setBody('The response body.'); + + $pageCache->cachePage($request, $response, 300); + + $cacheKey = $pageCache->generateCacheKey($request); + + // Save invalid data. + $cache->save($cacheKey, 'Invalid data'); + + // Check cache with a request with the same URI path. + $pageCache->getCachedResponse($request, new Response($this->appConfig)); + } + + public function testInvalidCacheError() + { + $this->expectException(Exception::class); + $this->expectExceptionMessage('Error unserializing page cache'); + + $cache = mock(CacheFactory::class); + $cacheConfig = new CacheConfig(); + $pageCache = new PageCache($cacheConfig, $cache); + + $request = $this->createIncomingRequest('foo/bar'); + + $response = new Response($this->appConfig); + $response->setHeader('ETag', 'abcd1234'); + $response->setBody('The response body.'); + + $pageCache->cachePage($request, $response, 300); + + $cacheKey = $pageCache->generateCacheKey($request); + + // Save invalid data. + $cache->save($cacheKey, serialize(['a' => '1'])); + + // Check cache with a request with the same URI path. + $pageCache->getCachedResponse($request, new Response($this->appConfig)); + } +} From 28f4a88166c7a6d455a9af1c38b65823a7a7bcbb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 20:04:57 +0900 Subject: [PATCH 4056/8282] fix: [BC] fix wrong types for Requests Fixes the following errors: ------ ------------------------------------------------------------------ Line system/CodeIgniter.php ------ ------------------------------------------------------------------ 529 Parameter #1 $request of method CodeIgniter\Cache\PageCache::cachePage() expects CodeIgniter\HTTP\CLIRequest|CodeIgniter\HTTP\IncomingRequest, CodeIgniter\HTTP\Request|null given. 685 Parameter #1 $request of method CodeIgniter\Cache\PageCache::getCachedResponse() expects CodeIgniter\HTTP\CLIRequest|CodeIgniter\HTTP\IncomingRequest, CodeIgniter\HTTP\Request|null given. ------ ------------------------------------------------------------------ --- phpstan-baseline.neon.dist | 10 ---------- system/CodeIgniter.php | 8 +++++--- system/Test/FeatureTestCase.php | 16 +++++++++++----- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 2d60b2b599d2..e1ecece1f5f0 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -25,16 +25,6 @@ parameters: count: 1 path: system/Cache/Handlers/RedisHandler.php - - - message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#" - count: 1 - path: system/CodeIgniter.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:setLocale\\(\\)\\.$#" - count: 1 - path: system/CodeIgniter.php - - message: "#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#" count: 1 diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index b8625b281978..1d4ccd12fed0 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -85,7 +85,7 @@ class CodeIgniter /** * Current request. * - * @var CLIRequest|IncomingRequest|Request|null + * @var CLIRequest|IncomingRequest|null */ protected $request; @@ -471,7 +471,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache return $possibleResponse; } - if ($possibleResponse instanceof Request) { + if ($possibleResponse instanceof IncomingRequest || $possibleResponse instanceof CLIRequest) { $this->request = $possibleResponse; } } @@ -611,9 +611,11 @@ protected function startBenchmark() * Sets a Request object to be used for this request. * Used when running certain tests. * + * @param CLIRequest|IncomingRequest $request + * * @return $this */ - public function setRequest(Request $request) + public function setRequest($request) { $this->request = $request; diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php index 7163d3e85717..371e302c59ae 100644 --- a/system/Test/FeatureTestCase.php +++ b/system/Test/FeatureTestCase.php @@ -12,6 +12,7 @@ namespace CodeIgniter\Test; use CodeIgniter\Events\Events; +use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Request; @@ -328,11 +329,13 @@ protected function setupHeaders(IncomingRequest $request) * * Always populate the GET vars based on the URI. * - * @return Request + * @param CLIRequest|IncomingRequest $request + * + * @return CLIRequest|IncomingRequest * * @throws ReflectionException */ - protected function populateGlobals(string $method, Request $request, ?array $params = null) + protected function populateGlobals(string $method, $request, ?array $params = null) { // $params should set the query vars if present, // otherwise set it from the URL. @@ -357,10 +360,13 @@ protected function populateGlobals(string $method, Request $request, ?array $par * This allows the body to be formatted in a way that the controller is going to * expect as in the case of testing a JSON or XML API. * - * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the - * what has been loaded into the request global of the request class. + * @param CLIRequest|IncomingRequest $request + * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the + * what has been loaded into the request global of the request class. + * + * @return CLIRequest|IncomingRequest */ - protected function setRequestBody(Request $request, ?array $params = null): Request + protected function setRequestBody($request, ?array $params = null) { if (isset($this->requestBody) && $this->requestBody !== '') { $request->setBody($this->requestBody); From 397194166a413518e94a325b6aa32f691a0bb294 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 20:09:09 +0900 Subject: [PATCH 4057/8282] chore: add exemptions for CodeIgniter\Cache\PageCache --- deptrac.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deptrac.yaml b/deptrac.yaml index bf39d4f54734..96cfc8fe522a 100644 --- a/deptrac.yaml +++ b/deptrac.yaml @@ -222,6 +222,10 @@ parameters: - Cache skip_violations: # Individual class exemptions + CodeIgniter\Cache\PageCache: + - CodeIgniter\HTTP\CLIRequest + - CodeIgniter\HTTP\IncomingRequest + - CodeIgniter\HTTP\ResponseInterface CodeIgniter\Entity\Cast\URICast: - CodeIgniter\HTTP\URI CodeIgniter\Log\Handlers\ChromeLoggerHandler: From b2afd719fde71229afa1e2082baa5ca7e6dbcceb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:31:07 +0900 Subject: [PATCH 4058/8282] refactor: rename PageCache to ResponseCache --- .../Cache/{PageCache.php => ResponseCache.php} | 2 +- system/CodeIgniter.php | 6 +++--- system/Config/BaseService.php | 4 ++-- system/Config/Services.php | 12 ++++++------ .../{PageCacheTest.php => ResponseCacheTest.php} | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) rename system/Cache/{PageCache.php => ResponseCache.php} (99%) rename tests/system/Cache/{PageCacheTest.php => ResponseCacheTest.php} (94%) diff --git a/system/Cache/PageCache.php b/system/Cache/ResponseCache.php similarity index 99% rename from system/Cache/PageCache.php rename to system/Cache/ResponseCache.php index ad52f02433bc..a04b369b348c 100644 --- a/system/Cache/PageCache.php +++ b/system/Cache/ResponseCache.php @@ -20,7 +20,7 @@ /** * Web Page Caching */ -class PageCache +class ResponseCache { /** * Whether to take the URL query string into consideration when generating diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 1d4ccd12fed0..5ce7ac69b2c4 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -12,7 +12,7 @@ namespace CodeIgniter; use Closure; -use CodeIgniter\Cache\PageCache; +use CodeIgniter\Cache\ResponseCache; use CodeIgniter\Debug\Timer; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; @@ -179,7 +179,7 @@ class CodeIgniter /** * Web Page Caching */ - protected PageCache $pageCache; + protected ResponseCache $pageCache; /** * Constructor. @@ -189,7 +189,7 @@ public function __construct(App $config) $this->startTime = microtime(true); $this->config = $config; - $this->pageCache = Services::pagecache(); + $this->pageCache = Services::responsecache(); } /** diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index f98ec9192856..133805a6a585 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -14,7 +14,7 @@ use CodeIgniter\Autoloader\Autoloader; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Cache\CacheInterface; -use CodeIgniter\Cache\PageCache; +use CodeIgniter\Cache\ResponseCache; use CodeIgniter\CLI\Commands; use CodeIgniter\CodeIgniter; use CodeIgniter\Database\ConnectionInterface; @@ -112,13 +112,13 @@ * @method static Logger logger($getShared = true) * @method static MigrationRunner migrations(Migrations $config = null, ConnectionInterface $db = null, $getShared = true) * @method static Negotiate negotiator(RequestInterface $request = null, $getShared = true) - * @method static PageCache pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) * @method static Pager pager(ConfigPager $config = null, RendererInterface $view = null, $getShared = true) * @method static Parser parser($viewPath = null, ConfigView $config = null, $getShared = true) * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true) * @method static View renderer($viewPath = null, ConfigView $config = null, $getShared = true) * @method static IncomingRequest|CLIRequest request(App $config = null, $getShared = true) * @method static ResponseInterface response(App $config = null, $getShared = true) + * @method static ResponseCache responsecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) * @method static Router router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true) * @method static RouteCollection routes($getShared = true) * @method static Security security(App $config = null, $getShared = true) diff --git a/system/Config/Services.php b/system/Config/Services.php index 14c9b122cc36..c8ded8034257 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -13,7 +13,7 @@ use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Cache\CacheInterface; -use CodeIgniter\Cache\PageCache; +use CodeIgniter\Cache\ResponseCache; use CodeIgniter\CLI\Commands; use CodeIgniter\CodeIgniter; use CodeIgniter\Database\ConnectionInterface; @@ -440,20 +440,20 @@ public static function negotiator(?RequestInterface $request = null, bool $getSh } /** - * Return the PageCache. + * Return the ResponseCache. * - * @return PageCache + * @return ResponseCache */ - public static function pagecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) + public static function responsecache(?Cache $config = null, ?CacheInterface $cache = null, bool $getShared = true) { if ($getShared) { - return static::getSharedInstance('pagecache', $config, $cache); + return static::getSharedInstance('responsecache', $config, $cache); } $config ??= config(Cache::class); $cache ??= AppServices::cache(); - return new PageCache($config, $cache); + return new ResponseCache($config, $cache); } /** diff --git a/tests/system/Cache/PageCacheTest.php b/tests/system/Cache/ResponseCacheTest.php similarity index 94% rename from tests/system/Cache/PageCacheTest.php rename to tests/system/Cache/ResponseCacheTest.php index d95c9f10f91f..75038e2753fa 100644 --- a/tests/system/Cache/PageCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -30,7 +30,7 @@ * * @group Others */ -final class PageCacheTest extends CIUnitTestCase +final class ResponseCacheTest extends CIUnitTestCase { private AppConfig $appConfig; @@ -82,18 +82,18 @@ private function createCLIRequest(array $params = [], ?AppConfig $appConfig = nu return new CLIRequest($appConfig); } - private function createPageCache(?CacheConfig $cacheConfig = null): pageCache + private function createResponseCache(?CacheConfig $cacheConfig = null): ResponseCache { $cache = mock(CacheFactory::class); $cacheConfig ??= new CacheConfig(); - return new PageCache($cacheConfig, $cache); + return new ResponseCache($cacheConfig, $cache); } public function testCachePageIncomingRequest() { - $pageCache = $this->createPageCache(); + $pageCache = $this->createResponseCache(); $request = $this->createIncomingRequest('foo/bar'); @@ -133,7 +133,7 @@ public function testCachePageIncomingRequestWithCacheQueryString() { $cacheConfig = new CacheConfig(); $cacheConfig->cacheQueryString = true; - $pageCache = $this->createPageCache($cacheConfig); + $pageCache = $this->createResponseCache($cacheConfig); $request = $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); @@ -169,7 +169,7 @@ public function testCachePageIncomingRequestWithCacheQueryString() public function testCachePageCLIRequest() { - $pageCache = $this->createPageCache(); + $pageCache = $this->createResponseCache(); $request = $this->createCLIRequest(['foo', 'bar']); @@ -202,7 +202,7 @@ public function testUnserializeError() $cache = mock(CacheFactory::class); $cacheConfig = new CacheConfig(); - $pageCache = new PageCache($cacheConfig, $cache); + $pageCache = new ResponseCache($cacheConfig, $cache); $request = $this->createIncomingRequest('foo/bar'); @@ -228,7 +228,7 @@ public function testInvalidCacheError() $cache = mock(CacheFactory::class); $cacheConfig = new CacheConfig(); - $pageCache = new PageCache($cacheConfig, $cache); + $pageCache = new ResponseCache($cacheConfig, $cache); $request = $this->createIncomingRequest('foo/bar'); From d0b986802f5d8c82a9c70c5d4421ebdd3e762ac5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:33:05 +0900 Subject: [PATCH 4059/8282] refactor: rename cachePage() to make() --- system/Cache/ResponseCache.php | 2 +- system/CodeIgniter.php | 2 +- tests/system/Cache/ResponseCacheTest.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index a04b369b348c..20e871cc2f3c 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -74,7 +74,7 @@ public function generateCacheKey($request): string * * @params int $ttl time to live in seconds. */ - public function cachePage($request, ResponseInterface $response, int $ttl): bool + public function make($request, ResponseInterface $response, int $ttl): bool { $headers = []; diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 5ce7ac69b2c4..ace073b5ed9e 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -526,7 +526,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. if (static::$cacheTTL > 0) { - $this->pageCache->cachePage($this->request, $this->response, static::$cacheTTL); + $this->pageCache->make($this->request, $this->response, static::$cacheTTL); } // Update the performance metrics diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index 75038e2753fa..a24a91e2ea52 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -101,7 +101,7 @@ public function testCachePageIncomingRequest() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $return = $pageCache->cachePage($request, $response, 300); + $return = $pageCache->make($request, $response, 300); $this->assertTrue($return); @@ -141,7 +141,7 @@ public function testCachePageIncomingRequestWithCacheQueryString() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $return = $pageCache->cachePage($request, $response, 300); + $return = $pageCache->make($request, $response, 300); $this->assertTrue($return); @@ -176,7 +176,7 @@ public function testCachePageCLIRequest() $response = new Response($this->appConfig); $response->setBody('The response body.'); - $return = $pageCache->cachePage($request, $response, 300); + $return = $pageCache->make($request, $response, 300); $this->assertTrue($return); @@ -210,7 +210,7 @@ public function testUnserializeError() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $pageCache->cachePage($request, $response, 300); + $pageCache->make($request, $response, 300); $cacheKey = $pageCache->generateCacheKey($request); @@ -236,7 +236,7 @@ public function testInvalidCacheError() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $pageCache->cachePage($request, $response, 300); + $pageCache->make($request, $response, 300); $cacheKey = $pageCache->generateCacheKey($request); From 8b0230a2278d08bbaccb297197be156e254e0937 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:33:53 +0900 Subject: [PATCH 4060/8282] refactor: rename getCachedResponse() to get() --- deptrac.yaml | 2 +- system/Cache/ResponseCache.php | 2 +- system/CodeIgniter.php | 2 +- tests/system/Cache/ResponseCacheTest.php | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deptrac.yaml b/deptrac.yaml index 96cfc8fe522a..d2db0605103b 100644 --- a/deptrac.yaml +++ b/deptrac.yaml @@ -222,7 +222,7 @@ parameters: - Cache skip_violations: # Individual class exemptions - CodeIgniter\Cache\PageCache: + CodeIgniter\Cache\ResponseCache: - CodeIgniter\HTTP\CLIRequest - CodeIgniter\HTTP\IncomingRequest - CodeIgniter\HTTP\ResponseInterface diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index 20e871cc2f3c..3328f3824e1e 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -94,7 +94,7 @@ public function make($request, ResponseInterface $response, int $ttl): bool * * @param CLIRequest|IncomingRequest $request */ - public function getCachedResponse($request, ResponseInterface $response): ?ResponseInterface + public function get($request, ResponseInterface $response): ?ResponseInterface { if ($cachedResponse = $this->cache->get($this->generateCacheKey($request))) { $cachedResponse = unserialize($cachedResponse); diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index ace073b5ed9e..f61e99936aa4 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -684,7 +684,7 @@ protected function forceSecureAccess($duration = 31_536_000) */ public function displayCache(Cache $config) { - if ($cachedResponse = $this->pageCache->getCachedResponse($this->request, $this->response)) { + if ($cachedResponse = $this->pageCache->get($this->request, $this->response)) { $this->response = $cachedResponse; $this->totalTime = $this->benchmark->getElapsedTime('total_execution'); diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index a24a91e2ea52..b97efa223233 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -107,7 +107,7 @@ public function testCachePageIncomingRequest() // Check cache with a request with the same URI path. $request = $this->createIncomingRequest('foo/bar'); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); $this->assertSame('The response body.', $cachedResponse->getBody()); @@ -115,7 +115,7 @@ public function testCachePageIncomingRequest() // Check cache with a request with the same URI path and different query string. $request = $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); $this->assertSame('The response body.', $cachedResponse->getBody()); @@ -124,7 +124,7 @@ public function testCachePageIncomingRequest() // Check cache with another request with the different URI path. $request = $this->createIncomingRequest('another'); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertNull($cachedResponse); } @@ -147,7 +147,7 @@ public function testCachePageIncomingRequestWithCacheQueryString() // Check cache with a request with the same URI path and same query string. $this->createIncomingRequest('foo/bar', ['foo' => 'bar', 'bar' => 'baz']); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); $this->assertSame('The response body.', $cachedResponse->getBody()); @@ -155,14 +155,14 @@ public function testCachePageIncomingRequestWithCacheQueryString() // Check cache with a request with the same URI path and different query string. $request = $this->createIncomingRequest('foo/bar', ['xfoo' => 'bar', 'bar' => 'baz']); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertNull($cachedResponse); // Check cache with another request with the different URI path. $request = $this->createIncomingRequest('another'); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertNull($cachedResponse); } @@ -182,7 +182,7 @@ public function testCachePageCLIRequest() // Check cache with a request with the same params. $request = $this->createCLIRequest(['foo', 'bar']); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertInstanceOf(ResponseInterface::class, $cachedResponse); $this->assertSame('The response body.', $cachedResponse->getBody()); @@ -190,7 +190,7 @@ public function testCachePageCLIRequest() // Check cache with another request with the different params. $request = $this->createCLIRequest(['baz']); - $cachedResponse = $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $cachedResponse = $pageCache->get($request, new Response($this->appConfig)); $this->assertNull($cachedResponse); } @@ -218,7 +218,7 @@ public function testUnserializeError() $cache->save($cacheKey, 'Invalid data'); // Check cache with a request with the same URI path. - $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $pageCache->get($request, new Response($this->appConfig)); } public function testInvalidCacheError() @@ -244,6 +244,6 @@ public function testInvalidCacheError() $cache->save($cacheKey, serialize(['a' => '1'])); // Check cache with a request with the same URI path. - $pageCache->getCachedResponse($request, new Response($this->appConfig)); + $pageCache->get($request, new Response($this->appConfig)); } } From f0748dde688a8004851480f58a5c19246e3749bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 11:55:04 +0900 Subject: [PATCH 4061/8282] refactor: add ResponseCache::$ttl and use it --- system/Cache/ResponseCache.php | 28 ++++++++++++++++++++---- system/CodeIgniter.php | 10 ++++++--- system/Controller.php | 7 +++--- tests/system/Cache/ResponseCacheTest.php | 12 +++++----- tests/system/CodeIgniterTest.php | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index 3328f3824e1e..8a3865b3814e 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -37,6 +37,13 @@ class ResponseCache */ protected $cacheQueryString = false; + /** + * Cache time to live. + * + * @var int seconds + */ + protected int $ttl = 0; + protected CacheInterface $cache; public function __construct(CacheConfig $config, CacheInterface $cache) @@ -45,6 +52,21 @@ public function __construct(CacheConfig $config, CacheInterface $cache) $this->cache = $cache; } + public function getTtl(): int + { + return $this->ttl; + } + + /** + * @return $this + */ + public function setTtl(int $ttl) + { + $this->ttl = $ttl; + + return $this; + } + /** * Generates the cache key to use from the current request. * @@ -71,10 +93,8 @@ public function generateCacheKey($request): string * Caches the full response from the current request. * * @param CLIRequest|IncomingRequest $request - * - * @params int $ttl time to live in seconds. */ - public function make($request, ResponseInterface $response, int $ttl): bool + public function make($request, ResponseInterface $response): bool { $headers = []; @@ -85,7 +105,7 @@ public function make($request, ResponseInterface $response, int $ttl): bool return $this->cache->save( $this->generateCacheKey($request), serialize(['headers' => $headers, 'output' => $response->getBody()]), - $ttl + $this->ttl ); } diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index f61e99936aa4..20d788132677 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -128,6 +128,8 @@ class CodeIgniter * Cache expiration time * * @var int seconds + * + * @deprecated 4.4.0 Moved to ResponseCache::$ttl. No longer used. */ protected static $cacheTTL = 0; @@ -338,7 +340,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon ); } - static::$cacheTTL = 0; + $this->pageCache->setTtl(0); $this->bufferLevel = ob_get_level(); $this->startBenchmark(); @@ -525,8 +527,8 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // Cache it without the performance metrics replaced // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. - if (static::$cacheTTL > 0) { - $this->pageCache->make($this->request, $this->response, static::$cacheTTL); + if ($this->pageCache->getTtl() > 0) { + $this->pageCache->make($this->request, $this->response); } // Update the performance metrics @@ -699,6 +701,8 @@ public function displayCache(Cache $config) /** * Tells the app that the final output should be cached. + * + * @deprecated 4.4.0 Moved to ResponseCache::setTtl(). to No longer used. */ public static function cache(int $time) { diff --git a/system/Controller.php b/system/Controller.php index 64de91ab2938..e808e0b8c20f 100644 --- a/system/Controller.php +++ b/system/Controller.php @@ -104,12 +104,13 @@ protected function forceHTTPS(int $duration = 31_536_000) } /** - * Provides a simple way to tie into the main CodeIgniter class and - * tell it how long to cache the current page for. + * How long to cache the current page for. + * + * @params int $time time to live in seconds. */ protected function cachePage(int $time) { - CodeIgniter::cache($time); + Services::responsecache()->setTtl($time); } /** diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index b97efa223233..a1079e63a463 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -88,7 +88,7 @@ private function createResponseCache(?CacheConfig $cacheConfig = null): Response $cacheConfig ??= new CacheConfig(); - return new ResponseCache($cacheConfig, $cache); + return (new ResponseCache($cacheConfig, $cache))->setTtl(300); } public function testCachePageIncomingRequest() @@ -101,7 +101,7 @@ public function testCachePageIncomingRequest() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $return = $pageCache->make($request, $response, 300); + $return = $pageCache->make($request, $response); $this->assertTrue($return); @@ -141,7 +141,7 @@ public function testCachePageIncomingRequestWithCacheQueryString() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $return = $pageCache->make($request, $response, 300); + $return = $pageCache->make($request, $response); $this->assertTrue($return); @@ -176,7 +176,7 @@ public function testCachePageCLIRequest() $response = new Response($this->appConfig); $response->setBody('The response body.'); - $return = $pageCache->make($request, $response, 300); + $return = $pageCache->make($request, $response); $this->assertTrue($return); @@ -210,7 +210,7 @@ public function testUnserializeError() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $pageCache->make($request, $response, 300); + $pageCache->make($request, $response); $cacheKey = $pageCache->generateCacheKey($request); @@ -236,7 +236,7 @@ public function testInvalidCacheError() $response->setHeader('ETag', 'abcd1234'); $response->setBody('The response body.'); - $pageCache->make($request, $response, 300); + $pageCache->make($request, $response); $cacheKey = $pageCache->generateCacheKey($request); diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index b2430a26a7c8..25ee4eda832a 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -838,7 +838,7 @@ public function testPageCacheWithCacheQueryString( $routePath = explode('?', $testingUrl)[0]; $string = 'This is a test page, to check cache configuration'; $routes->add($routePath, static function () use ($string) { - CodeIgniter::cache(60); + Services::responsecache()->setTtl(60); $response = Services::response(); return $response->setBody($string); From fd4e951280dd21cf6900ccd891899043d895d757 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 12:42:27 +0900 Subject: [PATCH 4062/8282] test: set $_SERVER['SCRIPT_NAME'] --- tests/system/CodeIgniterTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 25ee4eda832a..584310ba08c6 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -96,6 +96,7 @@ public function testRunClosureRoute() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -193,6 +194,7 @@ public function testControllersCanReturnString() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -216,6 +218,7 @@ public function testControllersCanReturnResponseObject() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -244,6 +247,7 @@ public function testControllersCanReturnDownloadResponseObject() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -268,6 +272,7 @@ public function testRunExecuteFilterByClassName() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -298,6 +303,7 @@ public function testRegisterSameFilterTwiceWithDifferentArgument() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $routes = Services::routes(); $routes->add( @@ -331,6 +337,7 @@ public function testDisableControllerFilters() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/pages/about'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -452,6 +459,7 @@ public function testRunRedirectionWithNamed() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -475,6 +483,7 @@ public function testRunRedirectionWithURI() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -501,6 +510,7 @@ public function testRunRedirectionWithGET() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -527,6 +537,7 @@ public function testRunRedirectionWithGETAndHTTPCode301() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -551,6 +562,7 @@ public function testRunRedirectionWithPOSTAndHTTPCode301() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'POST'; @@ -615,6 +627,7 @@ public function testNotStoresPreviousURL() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/example'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -638,6 +651,7 @@ public function testNotStoresPreviousURLByCheckingContentType() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/image'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; // Inject mock router. $routes = Services::routes(); @@ -679,6 +693,7 @@ public function testRunCLIRoute() $_SERVER['argc'] = 2; $_SERVER['REQUEST_URI'] = '/cli'; + $_SERVER['SCRIPT_NAME'] = 'public/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'CLI'; @@ -698,6 +713,7 @@ public function testSpoofRequestMethodCanUsePUT() $_SERVER['argc'] = 1; $_SERVER['REQUEST_URI'] = '/'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'POST'; @@ -722,6 +738,7 @@ public function testSpoofRequestMethodCannotUseGET() $_SERVER['argc'] = 1; $_SERVER['REQUEST_URI'] = '/'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1'; $_SERVER['REQUEST_METHOD'] = 'POST'; @@ -754,6 +771,7 @@ public function testPageCacheSendSecureHeaders() command('cache:clear'); $_SERVER['REQUEST_URI'] = '/test'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $routes = Services::routes(); $routes->add('test', static function () { @@ -832,6 +850,7 @@ public function testPageCacheWithCacheQueryString( foreach ($testingUrls as $testingUrl) { $this->resetServices(); $_SERVER['REQUEST_URI'] = '/' . $testingUrl; + $_SERVER['SCRIPT_NAME'] = '/index.php'; $this->codeigniter = new MockCodeIgniter(new App()); $routes = Services::routes(true); From cd5b817cc08deb0666e316f9f5fe24da50d40ae2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 13:38:35 +0900 Subject: [PATCH 4063/8282] refactor: don't make cahce if $ttl is 0 --- system/Cache/ResponseCache.php | 11 +++++------ system/CodeIgniter.php | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index 8a3865b3814e..b4c2fe9187fa 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -52,11 +52,6 @@ public function __construct(CacheConfig $config, CacheInterface $cache) $this->cache = $cache; } - public function getTtl(): int - { - return $this->ttl; - } - /** * @return $this */ @@ -90,12 +85,16 @@ public function generateCacheKey($request): string } /** - * Caches the full response from the current request. + * Caches the response. * * @param CLIRequest|IncomingRequest $request */ public function make($request, ResponseInterface $response): bool { + if ($this->ttl === 0) { + return true; + } + $headers = []; foreach ($response->headers() as $header) { diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 20d788132677..2ff8da02d456 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -527,9 +527,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache // Cache it without the performance metrics replaced // so that we can have live speed updates along the way. // Must be run after filters to preserve the Response headers. - if ($this->pageCache->getTtl() > 0) { - $this->pageCache->make($this->request, $this->response); - } + $this->pageCache->make($this->request, $this->response); // Update the performance metrics $body = $this->response->getBody(); From eb288ec342262ac3ced5ad09a38184c14a176230 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 14:13:53 +0900 Subject: [PATCH 4064/8282] docs: group items of the same class --- user_guide_src/source/changelogs/v4.4.0.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index c686450ef864..f8b3768a78ef 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -52,11 +52,12 @@ Parameter Type Changes - **Services:** The first parameter of ``Services::security()`` has been changed from ``Config\App`` to ``Config\Security``. -- **Session:** The second parameter of ``Session::__construct()`` has been - changed from ``Config\App`` to ``Config\Session``. -- **Session:** The first parameter of ``__construct()`` in ``BaseHandler``, - ``DatabaseHandler``, ``FileHandler``, ``MemcachedHandler``, and ``RedisHandler`` - has been changed from ``Config\App`` to ``Config\Session``. +- **Session:** + - The second parameter of ``Session::__construct()`` has been changed from + ``Config\App`` to ``Config\Session``. + - The first parameter of ``__construct()`` in ``BaseHandler``, + ``DatabaseHandler``, ``FileHandler``, ``MemcachedHandler``, and ``RedisHandler`` + has been changed from ``Config\App`` to ``Config\Session``. - **Security:** The first parameter of ``Security::__construct()`` has been changed from ``Config\App`` to ``Config\Security``. - **Validation:** The method signature of ``Validation::check()`` has been changed. From 7d31f522c78c7ff935a077edad473b46439f543f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 14:14:27 +0900 Subject: [PATCH 4065/8282] docs: add "Parameter Type Changes" and "Deprecations" --- user_guide_src/source/changelogs/v4.4.0.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index f8b3768a78ef..b101decaad4d 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -62,6 +62,14 @@ Parameter Type Changes changed from ``Config\App`` to ``Config\Security``. - **Validation:** The method signature of ``Validation::check()`` has been changed. The ``string`` typehint on the ``$rule`` parameter was removed. +- **CodeIgniter:** The method signature of ``CodeIgniter::setRequest()`` has been + changed. The ``Request`` typehint on the ``$request`` parameter was removed. +- **FeatureTestCase:** + - The method signature of ``FeatureTestCase::populateGlobals()`` has been + changed. The ``Request`` typehint on the ``$request`` parameter was removed. + - The method signature of ``FeatureTestCase::setRequestBody()`` has been + changed. The ``Request`` typehint on the ``$request`` parameter and the + return type ``Request`` were removed. Added Parameters ---------------- @@ -180,7 +188,12 @@ Deprecations are deprecated. Because these methods have been moved to ``BaseExceptionHandler`` or ``ExceptionHandler``. - **Autoloader:** ``Autoloader::sanitizeFilename()`` is deprecated. -- **CodeIgniter:** ``CodeIgniter::$returnResponse`` property is deprecated. No longer used. +- **CodeIgniter:** + - ``CodeIgniter::$returnResponse`` property is deprecated. No longer used. + - ``CodeIgniter::$cacheTTL`` property is deprecated. No longer used. Use ``ResponseCache`` instead. + - ``CodeIgniter::cache()`` method is deprecated. No longer used. Use ``ResponseCache`` instead. + - ``CodeIgniter::cachePage()`` method is deprecated. No longer used. Use ``ResponseCache`` instead. + - ``CodeIgniter::generateCacheName()`` method is deprecated. No longer used. Use ``ResponseCache`` instead. - **RedirectException:** ``\CodeIgniter\Router\Exceptions\RedirectException`` is deprecated. Use ``\CodeIgniter\HTTP\Exceptions\RedirectException`` instead. - **Session:** The property ``$sessionDriverName``, ``$sessionCookieName``, ``$sessionExpiration``, ``$sessionSavePath``, ``$sessionMatchIP``, From 6f93b8bf9ca669b60e68bc7e0d04ff8967dedfb0 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Sat, 24 Jun 2023 21:29:42 +0900 Subject: [PATCH 4066/8282] docs:replace type mixed at all helpers class. --- system/Helpers/array_helper.php | 6 +++--- system/Helpers/cookie_helper.php | 2 +- system/Helpers/filesystem_helper.php | 4 ++-- system/Helpers/number_helper.php | 4 ++-- system/Helpers/text_helper.php | 12 ++++++------ 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index 9b88cc2a0e0f..cdc1b81ab7f0 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -41,7 +41,7 @@ function dot_array_search(string $index, array $array) * * @internal This should not be used on its own. * - * @return mixed + * @return array|bool|float|int|object|string|null */ function _array_search_dot(array $indexes, array $array) { @@ -103,9 +103,9 @@ function _array_search_dot(array $indexes, array $array) /** * Returns the value of an element at a key in an array of uncertain depth. * - * @param mixed $key + * @param float|int|string $key * - * @return mixed|null + * @return array|bool|float|int|object|string|null */ function array_deep_search($key, array $array) { diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php index cb5f227279d3..9fc004c28b9a 100755 --- a/system/Helpers/cookie_helper.php +++ b/system/Helpers/cookie_helper.php @@ -86,7 +86,7 @@ function get_cookie($index, bool $xssClean = false, ?string $prefix = '') /** * Delete a cookie * - * @param mixed $name + * @param string $name * @param string $domain the cookie domain. Usually: .yourdomain.com * @param string $path the cookie path * @param string $prefix the cookie prefix diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php index 4918e87e7bf2..ba4dd66d7f84 100644 --- a/system/Helpers/filesystem_helper.php +++ b/system/Helpers/filesystem_helper.php @@ -292,8 +292,8 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r * Options are: name, server_path, size, date, readable, writable, executable, fileperms * Returns false if the file cannot be found. * - * @param string $file Path to file - * @param mixed $returnedValues Array or comma separated string of information returned + * @param string $file Path to file + * @param array|string|null $returnedValues Array or comma separated string of information returned * * @return array|null */ diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index af0d6fb83cc8..7983d669470b 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -15,8 +15,8 @@ /** * Formats a numbers as bytes, based on size, and adds the appropriate suffix * - * @param mixed $num Will be cast as int - * @param string $locale + * @param array|int|string $num Will be cast as int + * @param string $locale * * @return bool|string */ diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php index 2343a89bfafe..145515459eba 100755 --- a/system/Helpers/text_helper.php +++ b/system/Helpers/text_helper.php @@ -410,10 +410,10 @@ function word_wrap(string $str, int $charlim = 76): string * * This function will strip tags from a string, split it at its max_length and ellipsize * - * @param string $str String to ellipsize - * @param int $maxLength Max length of string - * @param mixed $position int (1|0) or float, .5, .2, etc for position to split - * @param string $ellipsis ellipsis ; Default '...' + * @param string $str String to ellipsize + * @param int $maxLength Max length of string + * @param float|int $position int (1|0) or float, .5, .2, etc for position to split + * @param string $ellipsis ellipsis ; Default '...' * * @return string Ellipsized string */ @@ -446,9 +446,9 @@ function ellipsize(string $str, int $maxLength, $position = 1, string $ellipsis * * Removes slashes contained in a string or in an array * - * @param mixed $str string or array + * @param array|string $str string or array * - * @return mixed string or array + * @return array|string string or array */ function strip_slashes($str) { From 753edef10fca6aafec347b69972e94dc9192c569 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Thu, 29 Jun 2023 18:28:59 +0800 Subject: [PATCH 4067/8282] docs: fix some type. --- system/Helpers/array_helper.php | 2 +- system/Helpers/filesystem_helper.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php index cdc1b81ab7f0..c5c9d956a411 100644 --- a/system/Helpers/array_helper.php +++ b/system/Helpers/array_helper.php @@ -103,7 +103,7 @@ function _array_search_dot(array $indexes, array $array) /** * Returns the value of an element at a key in an array of uncertain depth. * - * @param float|int|string $key + * @param int|string $key * * @return array|bool|float|int|object|string|null */ diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php index ba4dd66d7f84..47c829bbc3c6 100644 --- a/system/Helpers/filesystem_helper.php +++ b/system/Helpers/filesystem_helper.php @@ -292,8 +292,8 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r * Options are: name, server_path, size, date, readable, writable, executable, fileperms * Returns false if the file cannot be found. * - * @param string $file Path to file - * @param array|string|null $returnedValues Array or comma separated string of information returned + * @param string $file Path to file + * @param array|string $returnedValues Array or comma separated string of information returned * * @return array|null */ From 87f690620712ae4545193d48b6df795f9587fe6d Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Thu, 29 Jun 2023 18:30:05 +0800 Subject: [PATCH 4068/8282] docs: fix the type. --- system/Helpers/number_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 7983d669470b..ba79754f4fce 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -15,8 +15,8 @@ /** * Formats a numbers as bytes, based on size, and adds the appropriate suffix * - * @param array|int|string $num Will be cast as int - * @param string $locale + * @param int|string $num Will be cast as int + * @param string $locale * * @return bool|string */ From 3240062e9152c6689c12b6f04f6a655165789759 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Thu, 29 Jun 2023 19:12:10 +0800 Subject: [PATCH 4069/8282] fix: fix some error. --- system/Helpers/number_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index ba79754f4fce..7983d669470b 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -15,8 +15,8 @@ /** * Formats a numbers as bytes, based on size, and adds the appropriate suffix * - * @param int|string $num Will be cast as int - * @param string $locale + * @param array|int|string $num Will be cast as int + * @param string $locale * * @return bool|string */ From 5d7b8864341b0a737b8a81439b4ed126d35d587c Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Mon, 3 Jul 2023 13:35:24 +0800 Subject: [PATCH 4070/8282] fix: fix the conflict --- system/Helpers/number_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 7983d669470b..ba79754f4fce 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -15,8 +15,8 @@ /** * Formats a numbers as bytes, based on size, and adds the appropriate suffix * - * @param array|int|string $num Will be cast as int - * @param string $locale + * @param int|string $num Will be cast as int + * @param string $locale * * @return bool|string */ From b8524e805be4fea5b23b7d24fcfc70376452504f Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 30 Jun 2023 12:58:24 +0800 Subject: [PATCH 4071/8282] fix: Add one more limit type. --- system/Helpers/number_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index ba79754f4fce..00efea9c2422 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -77,7 +77,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) { // Strip any formatting & ensure numeric input try { - $num = 0 + str_replace(',', '', $num); + $num = 0 + (int) str_replace(',', '', $num); } catch (ErrorException $ee) { return false; } From 63ba16fc102b4801a7b003f60baceb5fd22eed2c Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 30 Jun 2023 13:00:24 +0800 Subject: [PATCH 4072/8282] fix: fix the error. --- system/Helpers/number_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 00efea9c2422..ba79754f4fce 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -77,7 +77,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) { // Strip any formatting & ensure numeric input try { - $num = 0 + (int) str_replace(',', '', $num); + $num = 0 + str_replace(',', '', $num); } catch (ErrorException $ee) { return false; } From bdd2b5049568ac47a83274cec2ad7cc385f5a94c Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Fri, 30 Jun 2023 14:45:47 +0800 Subject: [PATCH 4073/8282] fix: remove the phpstan message. --- phpstan-baseline.neon.dist | 5 ----- system/Helpers/number_helper.php | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index a32d4fc11a79..c3eaed7ade31 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -155,11 +155,6 @@ parameters: count: 1 path: system/Helpers/filesystem_helper.php - - - message: "#^Binary operation \"\\+\" between 0 and string results in an error\\.$#" - count: 1 - path: system/Helpers/number_helper.php - - message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#" count: 1 diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index ba79754f4fce..4ce90aa6acde 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -69,7 +69,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null) * * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers * - * @param string $num + * @param int|string $num * * @return bool|string */ @@ -77,7 +77,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) { // Strip any formatting & ensure numeric input try { - $num = 0 + str_replace(',', '', $num); + $num = 0 + (int) str_replace(',', '', $num); } catch (ErrorException $ee) { return false; } From d88d751976704c35b2d1ee5a6ab48665931c0e6a Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Mon, 3 Jul 2023 13:39:11 +0800 Subject: [PATCH 4074/8282] fix: changed by rector. --- system/Helpers/number_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 4ce90aa6acde..e37bba4eb09e 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -77,7 +77,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) { // Strip any formatting & ensure numeric input try { - $num = 0 + (int) str_replace(',', '', $num); + $num = (int) str_replace(',', '', $num); } catch (ErrorException $ee) { return false; } From 95cf346eb1eb9b3bdb7824d56c1d9969395bba36 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Mon, 3 Jul 2023 13:44:38 +0800 Subject: [PATCH 4075/8282] fix: fix the phpstan --- system/Helpers/number_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index e37bba4eb09e..5f0e59232fb3 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -77,7 +77,8 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) { // Strip any formatting & ensure numeric input try { - $num = (int) str_replace(',', '', $num); + // @phpstan-ignore-next-line + $num = 0 + str_replace(',', '', $num); } catch (ErrorException $ee) { return false; } From 5f2cdd2bd03ec0c6b73dbba859a088c1672a788f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 10:04:06 +0900 Subject: [PATCH 4076/8282] test: add tests for $params in call() --- tests/system/Test/FeatureTestTraitTest.php | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 0d0237301f98..71341ce079b4 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -358,6 +358,60 @@ public function testIsOkWithRedirects() $this->assertTrue($response->isOK()); } + public function testCallGetWithParams() + { + $this->withRoutes([ + [ + 'get', + 'home', + static fn () => json_encode(Services::request()->getGet()), + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->get('home', $data); + + $response->assertOK(); + $this->assertStringContainsString( + // All GET values will be strings. + '{"true":"1","false":"","int":"2","null":"","float":"1.23","string":"foo"}', + $response->getBody() + ); + } + + public function testCallPostWithParams() + { + $this->withRoutes([ + [ + 'post', + 'home', + static fn () => json_encode(Services::request()->getPost()), + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->post('home', $data); + + $response->assertOK(); + $this->assertStringContainsString( + // All POST values will be strings. + '{"true":"1","false":"","int":"2","null":"","float":"1.23","string":"foo"}', + $response->getBody() + ); + } + public function testCallWithJsonRequest() { $this->withRoutes([ From f7ef2780b80b3cd79201700bdff827d9313b2bc0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 10:06:22 +0900 Subject: [PATCH 4077/8282] test: add test values with various types --- tests/system/Test/FeatureTestTraitTest.php | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 71341ce079b4..2a38c29e02c9 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -421,9 +421,19 @@ public function testCallWithJsonRequest() '\Tests\Support\Controllers\Popcorn::echoJson', ], ]); - $response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->withBodyFormat('json') + ->call('post', 'home', $data); + $response->assertOK(); - $response->assertJSONExact(['foo' => 'bar']); + $response->assertJSONExact($data); } public function testSetupRequestBodyWithParams() @@ -440,10 +450,18 @@ public function testSetupRequestBodyWithXml() { $request = $this->setupRequest('post', 'home'); - $request = $this->withBodyFormat('xml')->setRequestBody($request, ['foo' => 'bar']); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $request = $this->withBodyFormat('xml')->setRequestBody($request, $data); $expectedXml = ' -bar +121.23foo '; $this->assertSame($expectedXml, $request->getBody()); From d96be52008575eb7a3db923892b050bd153e7221 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 10:07:37 +0900 Subject: [PATCH 4078/8282] fix: FeatureTestTrait changes $params values passed to call() --- system/Test/FeatureTestTrait.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index f7a6d0609b19..fbe4231e1b40 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -156,7 +156,7 @@ public function call(string $method, string $path, ?array $params = null) $request = $this->setupRequest($method, $path); $request = $this->setupHeaders($request); $request = $this->populateGlobals($method, $request, $params); - $request = $this->setRequestBody($request); + $request = $this->setRequestBody($request, $params); // Initialize the RouteCollection if (! $routes = $this->routes) { @@ -369,12 +369,14 @@ protected function setRequestBody(Request $request, ?array $params = null): Requ if (empty($params)) { $params = $request->fetchGlobal('request'); } + $formatMime = ''; if ($this->bodyFormat === 'json') { $formatMime = 'application/json'; } elseif ($this->bodyFormat === 'xml') { $formatMime = 'application/xml'; } + if (! empty($formatMime) && ! empty($params)) { $formatted = Services::format()->getFormatter($formatMime)->format($params); $request->setBody($formatted); From 63296dedaf38ef7c81ffcb6e28b0065a7aba70ee Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 16:52:48 +0900 Subject: [PATCH 4079/8282] test: add tests for call() params and REQUEST --- tests/system/Test/FeatureTestTraitTest.php | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 2a38c29e02c9..2db6bcf964fc 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -385,6 +385,33 @@ public function testCallGetWithParams() ); } + public function testCallGetWithParamsAndREQEST() + { + $this->withRoutes([ + [ + 'get', + 'home', + static fn () => json_encode(Services::request()->fetchGlobal('request')), + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->get('home', $data); + + $response->assertOK(); + $this->assertStringContainsString( + // All GET values will be strings. + '{"true":"1","false":"","int":"2","null":"","float":"1.23","string":"foo"}', + $response->getBody() + ); + } + public function testCallPostWithParams() { $this->withRoutes([ @@ -412,6 +439,33 @@ public function testCallPostWithParams() ); } + public function testCallPostWithParamsAndREQUEST() + { + $this->withRoutes([ + [ + 'post', + 'home', + static fn () => json_encode(Services::request()->fetchGlobal('request')), + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->post('home', $data); + + $response->assertOK(); + $this->assertStringContainsString( + // All POST values will be strings. + '{"true":"1","false":"","int":"2","null":"","float":"1.23","string":"foo"}', + $response->getBody() + ); + } + public function testCallWithJsonRequest() { $this->withRoutes([ From 9981d44accf9561616a3dfbbe1d9cabb3be502b5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 17:11:53 +0900 Subject: [PATCH 4080/8282] test: add tests for PUT JSON request and REQUEST --- tests/system/Test/FeatureTestTraitTest.php | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 2db6bcf964fc..73a0293e5685 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -466,6 +466,54 @@ public function testCallPostWithParamsAndREQUEST() ); } + public function testCallPutWithJsonRequest() + { + $this->withRoutes([ + [ + 'put', + 'home', + '\Tests\Support\Controllers\Popcorn::echoJson', + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->withBodyFormat('json') + ->call('put', 'home', $data); + + $response->assertOK(); + $response->assertJSONExact($data); + } + + public function testCallPutWithJsonRequestAndREQUEST() + { + $this->withRoutes([ + [ + 'put', + 'home', + static fn () => json_encode(Services::request()->fetchGlobal('request')), + ], + ]); + $data = [ + 'true' => true, + 'false' => false, + 'int' => 2, + 'null' => null, + 'float' => 1.23, + 'string' => 'foo', + ]; + $response = $this->withBodyFormat('json') + ->call('put', 'home', $data); + + $response->assertOK(); + $this->assertStringContainsString('[]', $response->getBody()); + } + public function testCallWithJsonRequest() { $this->withRoutes([ From 10f5034ce678890e1c44e0e024c1791e72de56cc Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 17:13:11 +0900 Subject: [PATCH 4081/8282] docs: add @param --- system/Test/FeatureTestTrait.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index fbe4231e1b40..55210e4f1c84 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -137,6 +137,8 @@ public function skipEvents() * Calls a single URI, executes it, and returns a TestResponse * instance that can be used to run many assertions against. * + * @param string $method HTTP verb + * * @return TestResponse */ public function call(string $method, string $path, ?array $params = null) @@ -281,6 +283,8 @@ public function options(string $path, ?array $params = null) /** * Setup a Request object to use so that CodeIgniter * won't try to auto-populate some of the items. + * + * @param string $method HTTP verb */ protected function setupRequest(string $method, ?string $path = null): IncomingRequest { @@ -325,6 +329,8 @@ protected function setupHeaders(IncomingRequest $request) * * Always populate the GET vars based on the URI. * + * @param string $method HTTP verb + * * @return Request * * @throws ReflectionException From 903fee87f6e5a0784700f460c13bce6557362b2d Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 17:14:15 +0900 Subject: [PATCH 4082/8282] refactor: add () --- system/Test/FeatureTestTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 55210e4f1c84..27cd3bc16194 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -339,7 +339,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par { // $params should set the query vars if present, // otherwise set it from the URL. - $get = ! empty($params) && $method === 'get' + $get = (! empty($params) && $method === 'get') ? $params : $this->getPrivateProperty($request->getUri(), 'query'); From 79b83c0e4058eec56203fe225c293449018c65ba Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 17:15:03 +0900 Subject: [PATCH 4083/8282] fix: incorrect REQUEST superglobal data --- system/Test/FeatureTestTrait.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 27cd3bc16194..1aa47dd639b2 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -344,11 +344,18 @@ protected function populateGlobals(string $method, Request $request, ?array $par : $this->getPrivateProperty($request->getUri(), 'query'); $request->setGlobal('get', $get); - if ($method !== 'get') { - $request->setGlobal($method, $params); + + if ($method === 'get') { + $request->setGlobal('request', $request->fetchGlobal('get')); } - $request->setGlobal('request', $params); + if ($method === 'post') { + $request->setGlobal($method, $params); + $request->setGlobal( + 'request', + $request->fetchGlobal('post') + $request->fetchGlobal('get') + ); + } $_SESSION = $this->session ?? []; From faa014cfeec7bdf92d1de926e786a62307117860 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 17:58:08 +0900 Subject: [PATCH 4084/8282] test: add test for JSON request Content-Type --- tests/system/Test/FeatureTestTraitTest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 73a0293e5685..70ac13c7e0ff 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -548,6 +548,23 @@ public function testSetupRequestBodyWithParams() $this->assertSame('application/json', $request->header('Content-Type')->getValue()); } + public function testSetupJSONRequestBodyWithBody() + { + $request = $this->setupRequest('post', 'home'); + $request = $this->withBodyFormat('json') + ->withBody(json_encode(['foo1' => 'bar1'])) + ->setRequestBody($request); + + $this->assertJsonStringEqualsJsonString( + json_encode(['foo1' => 'bar1']), + $request->getBody() + ); + $this->assertSame( + 'application/json', + $request->header('Content-Type')->getValue() + ); + } + public function testSetupRequestBodyWithXml() { $request = $this->setupRequest('post', 'home'); From c7ec2c901c90142de6475a94dbfc9a2b0d49d509 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 18:00:00 +0900 Subject: [PATCH 4085/8282] fix: incorrect logic in setRequestBody() - When it is a JSON/XML request, REQUEST global should be empty. - When calling withBody() and withBodyFormat(), Content-Type is not set. --- system/Test/FeatureTestTrait.php | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 1aa47dd639b2..33f4d19ce5c0 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -367,22 +367,11 @@ protected function populateGlobals(string $method, Request $request, ?array $par * This allows the body to be formatted in a way that the controller is going to * expect as in the case of testing a JSON or XML API. * - * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the - * what has been loaded into the request global of the request class. + * @param array|null $params The parameters to be formatted and put in the body. */ protected function setRequestBody(Request $request, ?array $params = null): Request { - if (isset($this->requestBody) && $this->requestBody !== '') { - $request->setBody($this->requestBody); - - return $request; - } - if (isset($this->bodyFormat) && $this->bodyFormat !== '') { - if (empty($params)) { - $params = $request->fetchGlobal('request'); - } - $formatMime = ''; if ($this->bodyFormat === 'json') { $formatMime = 'application/json'; @@ -390,13 +379,21 @@ protected function setRequestBody(Request $request, ?array $params = null): Requ $formatMime = 'application/xml'; } - if (! empty($formatMime) && ! empty($params)) { + if ($formatMime !== '') { + $request->setHeader('Content-Type', $formatMime); + } + + if ($params !== null && $formatMime !== '') { $formatted = Services::format()->getFormatter($formatMime)->format($params); $request->setBody($formatted); - $request->setHeader('Content-Type', $formatMime); } } + // withBody() has higher priority than $params of withBodyFormat(). + if (isset($this->requestBody) && $this->requestBody !== '') { + $request->setBody($this->requestBody); + } + return $request; } } From d9d19c67d6408edc579d18e05706c926e00da19b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 18:55:49 +0900 Subject: [PATCH 4086/8282] docs: fix @param type --- system/Test/FeatureTestTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 33f4d19ce5c0..d28e59df8872 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -110,7 +110,7 @@ public function withBodyFormat(string $format) /** * Set the raw body for the request * - * @param mixed $body + * @param string $body * * @return $this */ From 963b2e27f63427b7242c901828d3016074ec8f08 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 18:57:13 +0900 Subject: [PATCH 4087/8282] refactor: remove uneeded isset() --- system/Test/FeatureTestTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index d28e59df8872..6653702eb61f 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -371,7 +371,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par */ protected function setRequestBody(Request $request, ?array $params = null): Request { - if (isset($this->bodyFormat) && $this->bodyFormat !== '') { + if ($this->bodyFormat !== '') { $formatMime = ''; if ($this->bodyFormat === 'json') { $formatMime = 'application/json'; @@ -390,7 +390,7 @@ protected function setRequestBody(Request $request, ?array $params = null): Requ } // withBody() has higher priority than $params of withBodyFormat(). - if (isset($this->requestBody) && $this->requestBody !== '') { + if ($this->requestBody !== '') { $request->setBody($this->requestBody); } From d273222b7eb25d239a2b51ad53fed2cb9bca442b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 21 Jun 2023 19:04:59 +0900 Subject: [PATCH 4088/8282] fix: [BC] change priority for request body "withBodyFormat() and $params of call()" has higher priority than withBody(). --- system/Test/FeatureTestTrait.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php index 6653702eb61f..74529e77abca 100644 --- a/system/Test/FeatureTestTrait.php +++ b/system/Test/FeatureTestTrait.php @@ -371,6 +371,10 @@ protected function populateGlobals(string $method, Request $request, ?array $par */ protected function setRequestBody(Request $request, ?array $params = null): Request { + if ($this->requestBody !== '') { + $request->setBody($this->requestBody); + } + if ($this->bodyFormat !== '') { $formatMime = ''; if ($this->bodyFormat === 'json') { @@ -385,15 +389,11 @@ protected function setRequestBody(Request $request, ?array $params = null): Requ if ($params !== null && $formatMime !== '') { $formatted = Services::format()->getFormatter($formatMime)->format($params); + // "withBodyFormat() and $params of call()" has higher priority than withBody(). $request->setBody($formatted); } } - // withBody() has higher priority than $params of withBodyFormat(). - if ($this->requestBody !== '') { - $request->setBody($this->requestBody); - } - return $request; } } From 5fe0572c66a98a80164196a8f8d460e374b9424e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 08:42:54 +0900 Subject: [PATCH 4089/8282] docs: improve feature.rst --- user_guide_src/source/testing/feature.rst | 38 ++++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst index f41212b4eba0..651d02eb7b8d 100644 --- a/user_guide_src/source/testing/feature.rst +++ b/user_guide_src/source/testing/feature.rst @@ -21,23 +21,31 @@ are called if you implement your own methods. .. literalinclude:: feature/001.php -Requesting A Page +Requesting a Page ================= Essentially, feature tests simply allows you to call an endpoint on your application and get the results back. -to do this, you use the ``call()`` method. The first parameter is the HTTP method to use (most frequently either GET or POST). -The second parameter is the path on your site to test. The third parameter accepts an array that is used to populate the -superglobal variables for the HTTP verb you are using. So, a method of **GET** would have the **$_GET** variable -populated, while a **post** request would have the **$_POST** array populated. +To do this, you use the ``call()`` method. + +1. The first parameter is the HTTP method to use (most frequently either GET or POST). +2. The second parameter is the URI path on your site to test. +3. The third parameter ``$params`` accepts an array that is used to populate the + superglobal variables for the HTTP verb you are using. So, a method of **GET** + would have the **$_GET** variable populated, while a **POST** request would + have the **$_POST** array populated. + + .. note:: The ``$params`` array does not make sense for every HTTP verb, but is + included for consistency. .. literalinclude:: feature/002.php +Shorthand Methods +----------------- + Shorthand methods for each of the HTTP verbs exist to ease typing and make things clearer: .. literalinclude:: feature/003.php -.. note:: The ``$params`` array does not make sense for every HTTP verb, but is included for consistency. - Setting Different Routes ------------------------ @@ -74,22 +82,28 @@ to send out emails. You can tell the system to skip any event handling with the .. literalinclude:: feature/007.php -Formatting The Request +Formatting the Request ----------------------- You can set the format of your request's body using the ``withBodyFormat()`` method. Currently this supports either -`json` or `xml`. This will take the parameters passed into ``call()``, ``post()``, ``get()``... and assign them to the -body of the request in the given format. This will also set the `Content-Type` header for your request accordingly. +``json`` or ``xml``. This is useful when testing JSON or XML APIs so that you can set the request in the form that the controller will expect. +This will take the parameters passed into ``call()``, ``post()``, ``get()``... and assign them to the +body of the request in the given format. + +This will also set the `Content-Type` header for your request accordingly. + .. literalinclude:: feature/008.php Setting the Body ---------------- You can set the body of your request with the ``withBody()`` method. This allows you to format the body how you want -to format it. It is recommended that you use this if you have more complicated XMLs to test. This will also not set -the Content-Type header for you so if you need that, you can set it with the ``withHeaders()`` method. +to format it. It is recommended that you use this if you have more complicated XMLs to test. + +This will not set +the `Content-Type` header for you. If you need that, you can set it with the ``withHeaders()`` method. Checking the Response ===================== From 3c430819148fc29a5423b81a04c2a3789519843f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 30 Jun 2023 09:49:18 +0900 Subject: [PATCH 4090/8282] docs: add changelog, upgrade guide, and missing explanation for $params --- user_guide_src/source/changelogs/v4.3.7.rst | 4 ++++ .../source/installation/upgrade_437.rst | 21 +++++++++++++++++++ user_guide_src/source/testing/feature.rst | 9 +++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.3.7.rst b/user_guide_src/source/changelogs/v4.3.7.rst index b167c0c48dcf..47fc19f161d1 100644 --- a/user_guide_src/source/changelogs/v4.3.7.rst +++ b/user_guide_src/source/changelogs/v4.3.7.rst @@ -12,6 +12,10 @@ Release Date: Unreleased BREAKING ******** +- **FeatureTestTrait:** When using :ref:`withBodyFormat() `, + the priority of the request body has been changed. + See :ref:`Upgrading Guide ` for details. + Message Changes *************** diff --git a/user_guide_src/source/installation/upgrade_437.rst b/user_guide_src/source/installation/upgrade_437.rst index 36cac74545d7..389c145f4109 100644 --- a/user_guide_src/source/installation/upgrade_437.rst +++ b/user_guide_src/source/installation/upgrade_437.rst @@ -18,6 +18,27 @@ Mandatory File Changes Breaking Changes **************** +.. _upgrade-437-feature-testing: + +Feature Testing Request Body +============================ + +If you call: + +1. :ref:`withBody() ` +2. and :ref:`withBodyFormat() ` +3. and pass the ``$params`` to :ref:`call() ` (or shorthand methods) + +the priority for a Request body has been changed. In the unlikely event that you +have test code affected by this change, modify it. + +For example, now the ``$params`` is used to build the request body, and the ``$body`` +is not used:: + + $this->withBody($body)->withBodyFormat('json')->call('post', $params) + +Previously, the ``$body`` was used for the request body. + Breaking Enhancements ********************* diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst index 651d02eb7b8d..f113eab68cce 100644 --- a/user_guide_src/source/testing/feature.rst +++ b/user_guide_src/source/testing/feature.rst @@ -21,6 +21,8 @@ are called if you implement your own methods. .. literalinclude:: feature/001.php +.. _feature-requesting-a-page: + Requesting a Page ================= @@ -32,7 +34,8 @@ To do this, you use the ``call()`` method. 3. The third parameter ``$params`` accepts an array that is used to populate the superglobal variables for the HTTP verb you are using. So, a method of **GET** would have the **$_GET** variable populated, while a **POST** request would - have the **$_POST** array populated. + have the **$_POST** array populated. The ``$params`` is also used in + :ref:`feature-formatting-the-request`. .. note:: The ``$params`` array does not make sense for every HTTP verb, but is included for consistency. @@ -82,6 +85,8 @@ to send out emails. You can tell the system to skip any event handling with the .. literalinclude:: feature/007.php +.. _feature-formatting-the-request: + Formatting the Request ----------------------- @@ -96,6 +101,8 @@ This will also set the `Content-Type` header for your request accordingly. .. literalinclude:: feature/008.php +.. _feature-setting-the-body: + Setting the Body ---------------- From f1509f1c9eeaa2e2536b66b980e43af2bf681d10 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 08:41:47 +0900 Subject: [PATCH 4091/8282] test: fix typo in method name Co-authored-by: MGatner --- tests/system/Test/FeatureTestTraitTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 70ac13c7e0ff..33a29d522f47 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -385,7 +385,7 @@ public function testCallGetWithParams() ); } - public function testCallGetWithParamsAndREQEST() + public function testCallGetWithParamsAndREQUEST() { $this->withRoutes([ [ From 54ebb52eadabfdfbd30411b826ded994886bbde1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 09:26:21 +0900 Subject: [PATCH 4092/8282] test: add test for missing argument --- tests/system/Helpers/URLHelper/MiscUrlTest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index 7f5d9667501a..b943722d3908 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -17,6 +17,7 @@ use CodeIgniter\Router\Exceptions\RouterException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use InvalidArgumentException; /** * @backupGlobals enabled @@ -900,4 +901,20 @@ public function testUrlToWithSupportedLocaleInRoute() url_to('path-to', 'string', 13, 'en') ); } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/7651 + */ + public function testUrlToMissingArgument() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('Missing argument for "([a-zA-Z]+)" in route "([a-zA-Z]+)/login".'); + + $routes = Services::routes(); + $routes->group('(:alpha)', static function ($routes) { + $routes->match(['get'], 'login', 'Common\LoginController::loginView', ['as' => 'loginURL']); + }); + + url_to('loginURL'); + } } From 2ff1dc887f54ed1faa71593b62a547ade522e79e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 09:26:42 +0900 Subject: [PATCH 4093/8282] fix: improve exception message --- system/Router/RouteCollection.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 965a0c746ce7..9dbeefc33569 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1239,6 +1239,11 @@ protected function buildReverseRoute(string $from, array $params): string // Build our resulting string, inserting the $params in // the appropriate places. foreach ($matches[0] as $index => $pattern) { + if (! isset($params[$index])) { + throw new InvalidArgumentException( + 'Missing argument for "' . $pattern . '" in route "' . $from . '".' + ); + } if (! preg_match('#^' . $pattern . '$#u', $params[$index])) { throw RouterException::forInvalidParameterType(); } From 42ea49371ad78be79c0d319385a376c2013edac3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 09:46:23 +0900 Subject: [PATCH 4094/8282] docs: fix by proofreading Co-authored-by: MGatner --- user_guide_src/source/changelogs/v4.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index b101decaad4d..8bf257532fb4 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -55,7 +55,7 @@ Parameter Type Changes - **Session:** - The second parameter of ``Session::__construct()`` has been changed from ``Config\App`` to ``Config\Session``. - - The first parameter of ``__construct()`` in ``BaseHandler``, + - The first parameter of ``__construct()`` in the database's ``BaseHandler``, ``DatabaseHandler``, ``FileHandler``, ``MemcachedHandler``, and ``RedisHandler`` has been changed from ``Config\App`` to ``Config\Session``. - **Security:** The first parameter of ``Security::__construct()`` has been From d19a39306256d7598a0e9cec2095413fb275cbdd Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 11:16:46 +0900 Subject: [PATCH 4095/8282] feat: add DefinedRouteCollector --- system/Router/DefinedRouteCollector.php | 63 +++++++++++++ .../Router/DefinedRouteCollectorTest.php | 90 +++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 system/Router/DefinedRouteCollector.php create mode 100644 tests/system/Router/DefinedRouteCollectorTest.php diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php new file mode 100644 index 000000000000..f9e0454b7b07 --- /dev/null +++ b/system/Router/DefinedRouteCollector.php @@ -0,0 +1,63 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Router; + +use Closure; +use Generator; + +class DefinedRouteCollector +{ + private RouteCollection $routeCollection; + + public function __construct(RouteCollection $routes) + { + $this->routeCollection = $routes; + } + + public function collect(): Generator + { + $methods = [ + 'get', + 'head', + 'post', + 'patch', + 'put', + 'delete', + 'options', + 'trace', + 'connect', + 'cli', + ]; + + foreach ($methods as $method) { + $routes = $this->routeCollection->getRoutes($method); + + foreach ($routes as $route => $handler) { + if (is_string($handler) || $handler instanceof Closure) { + + if ($handler instanceof Closure) { + $handler = '(Closure)'; + } + + $routeName = $this->routeCollection->getRoutesOptions($route)['as'] ?? $route; + + yield [ + 'method' => $method, + 'route' => $route, + 'name' => $routeName, + 'handler' => $handler, + ]; + } + } + } + } +} diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php new file mode 100644 index 000000000000..61647967766c --- /dev/null +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -0,0 +1,90 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Router; + +use CodeIgniter\Config\Services; +use CodeIgniter\Test\CIUnitTestCase; +use Config\Modules; +use Config\Routing; + +/** + * @internal + * + * @group Others + */ +final class DefinedRouteCollectorTest extends CIUnitTestCase +{ + private function createRouteCollection(array $config = [], $moduleConfig = null): RouteCollection + { + $defaults = [ + 'Config' => APPPATH . 'Config', + 'App' => APPPATH, + ]; + $config = array_merge($config, $defaults); + + Services::autoloader()->addNamespace($config); + + $loader = Services::locator(); + + if ($moduleConfig === null) { + $moduleConfig = new Modules(); + $moduleConfig->enabled = false; + } + + return (new RouteCollection($loader, $moduleConfig, new Routing()))->setHTTPVerb('get'); + } + + public function test() + { + $routes = $this->createRouteCollection(); + $routes->get('journals', 'Blogs'); + $routes->get('product/(:num)', 'Catalog::productLookupByID/$1'); + $routes->get('feed', static fn () => 'A Closure route.'); + $routes->view('about', 'pages/about'); + + $collector = new DefinedRouteCollector($routes); + + $definedRoutes = []; + + foreach ($collector->collect() as $route) { + $definedRoutes[] = $route; + } + + $expected = [ + [ + 'method' => 'get', + 'route' => 'journals', + 'name' => 'journals', + 'handler' => '\App\Controllers\Blogs', + ], + [ + 'method' => 'get', + 'route' => 'product/([0-9]+)', + 'name' => 'product/([0-9]+)', + 'handler' => '\App\Controllers\Catalog::productLookupByID/$1', + ], + [ + 'method' => 'get', + 'route' => 'feed', + 'name' => 'feed', + 'handler' => '(Closure)', + ], + [ + 'method' => 'get', + 'route' => 'about', + 'name' => 'about', + 'handler' => '(Closure)', + ], + ]; + $this->assertSame($expected, $definedRoutes); + } +} From d1224ccd97760e94463ec9288da50b98f207823b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 11:31:17 +0900 Subject: [PATCH 4096/8282] refactor: use DefinedRouteCollector in `spark routes` --- system/Commands/Utilities/Routes.php | 35 ++++++++++++---------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index 97b990bb1092..68d2f8d07d50 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -18,6 +18,7 @@ use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollector as AutoRouteCollectorImproved; use CodeIgniter\Commands\Utilities\Routes\FilterCollector; use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator; +use CodeIgniter\Router\DefinedRouteCollector; use Config\Feature; use Config\Routing; use Config\Services; @@ -115,29 +116,23 @@ public function run(array $params) $uriGenerator = new SampleURIGenerator(); $filterCollector = new FilterCollector(); - foreach ($methods as $method) { - $routes = $collection->getRoutes($method); + $definedRouteCollector = new DefinedRouteCollector($collection); - foreach ($routes as $route => $handler) { - if (is_string($handler) || $handler instanceof Closure) { - $sampleUri = $uriGenerator->get($route); - $filters = $filterCollector->get($method, $sampleUri); + foreach ($definedRouteCollector->collect() as $route) { + if (is_string($route['handler']) || $route['handler'] instanceof Closure) { + $sampleUri = $uriGenerator->get($route['route']); + $filters = $filterCollector->get($route['method'], $sampleUri); - if ($handler instanceof Closure) { - $handler = '(Closure)'; - } - - $routeName = $collection->getRoutesOptions($route)['as'] ?? '»'; + $routeName = ($route['route'] === $route['name']) ? '»' : $route['route']; - $tbody[] = [ - strtoupper($method), - $route, - $routeName, - $handler, - implode(' ', array_map('class_basename', $filters['before'])), - implode(' ', array_map('class_basename', $filters['after'])), - ]; - } + $tbody[] = [ + strtoupper($route['method']), + $route['route'], + $routeName, + $route['handler'], + implode(' ', array_map('class_basename', $filters['before'])), + implode(' ', array_map('class_basename', $filters['after'])), + ]; } } From 06faf737beb08996b234719ba92c6ecd4c2e8b79 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 11:51:32 +0900 Subject: [PATCH 4097/8282] refactor: use DefinedRouteCollector in DebugBar --- system/Debug/Toolbar/Collectors/Routes.php | 42 +++++++--------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php index 5ea88c0411c8..0420c19b92dd 100644 --- a/system/Debug/Toolbar/Collectors/Routes.php +++ b/system/Debug/Toolbar/Collectors/Routes.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; +use CodeIgniter\Router\DefinedRouteCollector; use Config\Services; use ReflectionException; use ReflectionFunction; @@ -55,9 +56,6 @@ public function display(): array $rawRoutes = Services::routes(true); $router = Services::router(null, null, true); - // Matched Route - $route = $router->getMatchedRoute(); - // Get our parameters // Closure routes if (is_callable($router->controllerName())) { @@ -100,32 +98,18 @@ public function display(): array ]; // Defined Routes - $routes = []; - $methods = [ - 'get', - 'head', - 'post', - 'patch', - 'put', - 'delete', - 'options', - 'trace', - 'connect', - 'cli', - ]; - - foreach ($methods as $method) { - $raw = $rawRoutes->getRoutes($method); - - foreach ($raw as $route => $handler) { - // filter for strings, as callbacks aren't displayable - if (is_string($handler)) { - $routes[] = [ - 'method' => strtoupper($method), - 'route' => $route, - 'handler' => $handler, - ]; - } + $routes = []; + + $definedRouteCollector = new DefinedRouteCollector($rawRoutes); + + foreach ($definedRouteCollector->collect() as $route) { + // filter for strings, as callbacks aren't displayable + if ($route['handler'] !== '(Closure)') { + $routes[] = [ + 'method' => strtoupper($route['method']), + 'route' => $route['route'], + 'handler' => $route['handler'], + ]; } } From 6f0d950c33a9a7d2b4c1d98fd6b4313098ee56aa Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 12:03:19 +0900 Subject: [PATCH 4098/8282] refactor: use DefinedRouteCollector in `spark routes` --- system/Commands/Utilities/Routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index 68d2f8d07d50..ee726d4aa93d 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -123,7 +123,7 @@ public function run(array $params) $sampleUri = $uriGenerator->get($route['route']); $filters = $filterCollector->get($route['method'], $sampleUri); - $routeName = ($route['route'] === $route['name']) ? '»' : $route['route']; + $routeName = ($route['route'] === $route['name']) ? '»' : $route['name']; $tbody[] = [ strtoupper($route['method']), From 453511c582b2ee3829be115f4b83abcc29441e49 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 12:08:14 +0900 Subject: [PATCH 4099/8282] docs: add comment --- system/Router/DefinedRouteCollector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php index f9e0454b7b07..c1d98a5ea95b 100644 --- a/system/Router/DefinedRouteCollector.php +++ b/system/Router/DefinedRouteCollector.php @@ -14,6 +14,9 @@ use Closure; use Generator; +/** + * Collect all defined routes for display. + */ class DefinedRouteCollector { private RouteCollection $routeCollection; From ea62e0b022dccda589aef1333b6bf36166c6ba0c Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 18:30:52 +0900 Subject: [PATCH 4100/8282] fix: add final keyword to DefinedRouteCollector --- system/Router/DefinedRouteCollector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php index c1d98a5ea95b..62aebce51ba0 100644 --- a/system/Router/DefinedRouteCollector.php +++ b/system/Router/DefinedRouteCollector.php @@ -17,7 +17,7 @@ /** * Collect all defined routes for display. */ -class DefinedRouteCollector +final class DefinedRouteCollector { private RouteCollection $routeCollection; From f6e636256ea157c4818e6f93fbacb8c256a65e4b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 18:31:58 +0900 Subject: [PATCH 4101/8282] test: fix test method name --- tests/system/Router/DefinedRouteCollectorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php index 61647967766c..619f4386886f 100644 --- a/tests/system/Router/DefinedRouteCollectorTest.php +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -43,7 +43,7 @@ private function createRouteCollection(array $config = [], $moduleConfig = null) return (new RouteCollection($loader, $moduleConfig, new Routing()))->setHTTPVerb('get'); } - public function test() + public function testCollect() { $routes = $this->createRouteCollection(); $routes->get('journals', 'Blogs'); From f5a284154c78d68cbe85e9ad76f82e0f85e2b3d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 18:48:26 +0900 Subject: [PATCH 4102/8282] docs: add @phpstan-return --- system/Router/DefinedRouteCollector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php index 62aebce51ba0..eeae28379d04 100644 --- a/system/Router/DefinedRouteCollector.php +++ b/system/Router/DefinedRouteCollector.php @@ -26,6 +26,9 @@ public function __construct(RouteCollection $routes) $this->routeCollection = $routes; } + /** + * @phpstan-return Generator + */ public function collect(): Generator { $methods = [ From 789015666afae712308721b12010b91021044074 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 07:38:13 +0900 Subject: [PATCH 4103/8282] refactor: make ResponseCache final --- system/Cache/ResponseCache.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index b4c2fe9187fa..44da42947633 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -20,7 +20,7 @@ /** * Web Page Caching */ -class ResponseCache +final class ResponseCache { /** * Whether to take the URL query string into consideration when generating @@ -35,16 +35,16 @@ class ResponseCache * * @var bool|string[] */ - protected $cacheQueryString = false; + private $cacheQueryString = false; /** * Cache time to live. * * @var int seconds */ - protected int $ttl = 0; + private int $ttl = 0; - protected CacheInterface $cache; + private CacheInterface $cache; public function __construct(CacheConfig $config, CacheInterface $cache) { From 7131946ee491916e4342ac5ca7b1ba8f5c7c53f7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 10:49:14 +0900 Subject: [PATCH 4104/8282] docs: improve sample code If a dev copy and paste the constructor, it won't work becaseu `parent::__construct();` is missing. --- user_guide_src/source/database/configuration/008.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php index 5639c484d125..9073ee71ff4f 100644 --- a/user_guide_src/source/database/configuration/008.php +++ b/user_guide_src/source/database/configuration/008.php @@ -4,14 +4,20 @@ use CodeIgniter\Database\Config; +/** + * Database Configuration + */ class Database extends Config { + // ... public $development = [/* ... */]; public $test = [/* ... */]; public $production = [/* ... */]; public function __construct() { + // ... + $this->defaultGroup = ENVIRONMENT; } } From a275140b536893d53ee40c8e6bb74546c4265fb7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 11:03:52 +0900 Subject: [PATCH 4105/8282] fix: update variable name in 4.4 See https://github.com/codeigniter4/CodeIgniter4/pull/7652 --- system/Router/RouteCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 28b3a1779ab4..21fa22dda707 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1328,7 +1328,7 @@ protected function buildReverseRoute(string $routeKey, array $params): string foreach ($matches[0] as $index => $pattern) { if (! isset($params[$index])) { throw new InvalidArgumentException( - 'Missing argument for "' . $pattern . '" in route "' . $from . '".' + 'Missing argument for "' . $pattern . '" in route "' . $routeKey . '".' ); } if (! preg_match('#^' . $pattern . '$#u', $params[$index])) { From d91fb77195a6c293ac38dfc3f26a97a3e1e3f348 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:18:31 +0900 Subject: [PATCH 4106/8282] docs: fix @param in CLIRequest --- system/HTTP/CLIRequest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index dd4733e97c86..31b0f36f7ff6 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -221,7 +221,7 @@ public function isCLI(): bool * * @param array|string|null $index Index for item to fetch from $_GET. * @param int|null $filter A filter name to apply. - * @param mixed|null $flags + * @param array|int|null $flags * * @return array|null */ @@ -235,7 +235,7 @@ public function getGet($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to fetch from $_POST. * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * * @return array|null */ @@ -249,7 +249,7 @@ public function getPost($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to fetch from $_POST or $_GET * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * * @return array|null */ @@ -263,7 +263,7 @@ public function getPostGet($index = null, $filter = null, $flags = null) * * @param array|string|null $index Index for item to be fetched from $_GET or $_POST * @param int|null $filter A filter name to apply - * @param mixed $flags + * @param array|int|null $flags * * @return array|null */ From 752eddcf766a430d745fd9b276edb353ec1b5d57 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:18:57 +0900 Subject: [PATCH 4107/8282] docs: fix @return in FilterInterface --- system/Filters/FilterInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php index 8055d11e7949..1a3363c90866 100644 --- a/system/Filters/FilterInterface.php +++ b/system/Filters/FilterInterface.php @@ -31,7 +31,7 @@ interface FilterInterface * * @param array|null $arguments * - * @return mixed + * @return RequestInterface|ResponseInterface|string|void */ public function before(RequestInterface $request, $arguments = null); @@ -43,7 +43,7 @@ public function before(RequestInterface $request, $arguments = null); * * @param array|null $arguments * - * @return mixed + * @return ResponseInterface|void */ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null); } From ab19d07cfab235bb77bbf7b4079392397b81618e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:19:19 +0900 Subject: [PATCH 4108/8282] docs: fix typo in OCI8\Connection --- system/Database/OCI8/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php index ce6554ddc63a..dd54bf9d4a11 100644 --- a/system/Database/OCI8/Connection.php +++ b/system/Database/OCI8/Connection.php @@ -98,7 +98,7 @@ class Connection extends BaseConnection public $lastInsertedTableName; /** - * confirm DNS format. + * confirm DSN format. */ private function isValidDSN(): bool { From 90089c90bb89b03525844768414e4235014bbfa2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:20:10 +0900 Subject: [PATCH 4109/8282] docs: fix versions of @deprecated --- system/CLI/CLI.php | 2 +- system/Model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 80d001a354ac..2798319b057d 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -520,7 +520,7 @@ public static function wait(int $seconds, bool $countdown = false) /** * if operating system === windows * - * @deprecated v4.3 Use `is_windows()` instead + * @deprecated 4.3.0 Use `is_windows()` instead */ public static function isWindows(): bool { diff --git a/system/Model.php b/system/Model.php index b60bb966dd85..a9c8e4f2eba9 100644 --- a/system/Model.php +++ b/system/Model.php @@ -866,7 +866,7 @@ private function checkBuilderMethod(string $name): void * * @codeCoverageIgnore * - * @deprecated since 4.1 + * @deprecated 4.1.0 */ public static function classToArray($data, $primaryKey = null, string $dateFormat = 'datetime', bool $onlyChanged = true): array { From 97dfb4a1e762ac9b0e8b573ebc2cfa19b8550510 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:20:48 +0900 Subject: [PATCH 4110/8282] docs: fix @var in UserAgent --- system/HTTP/UserAgent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php index 10088111cec1..ff1c68c4d54c 100644 --- a/system/HTTP/UserAgent.php +++ b/system/HTTP/UserAgent.php @@ -91,7 +91,7 @@ class UserAgent /** * HTTP Referer * - * @var mixed + * @var bool|string|null */ protected $referrer; From 960cb91340ff205e7de4b585e41aab0179cf3839 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:21:23 +0900 Subject: [PATCH 4111/8282] docs: fix @param in URI --- system/HTTP/URI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index dee9365ded51..b88712e18c76 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -557,7 +557,7 @@ public function getSegment(int $number, string $default = ''): string * Set the value of a specific segment of the URI path. * Allows to set only existing segments or add new one. * - * @param mixed $value (string or int) + * @param int|string $value (string or int) * * @return $this */ @@ -844,7 +844,7 @@ public function setQueryArray(array $query) /** * Adds a single new element to the query vars. * - * @param mixed $value + * @param int|string $value * * @return $this */ From 2cda17f9e41fd287b45b5d50437b0005da2df53a Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:21:49 +0900 Subject: [PATCH 4112/8282] docs: fix @param in CURLRequest --- system/HTTP/CURLRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 616ef143fde8..019b12e2b8df 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -263,7 +263,7 @@ public function setForm(array $params, bool $multipart = false) /** * Set JSON data to be sent. * - * @param mixed $data + * @param array|bool|float|int|object|string|null $data * * @return $this */ From b6ed0ae91a077f6e4e1158428bcd0cb6bf2f4d54 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:22:14 +0900 Subject: [PATCH 4113/8282] docs: fix @param in MessageInterface --- system/HTTP/MessageInterface.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php index ac4ccf416bb3..99867bde5800 100644 --- a/system/HTTP/MessageInterface.php +++ b/system/HTTP/MessageInterface.php @@ -30,7 +30,7 @@ public function getProtocolVersion(): string; /** * Sets the body of the current message. * - * @param mixed $data + * @param string $data * * @return $this */ @@ -48,7 +48,7 @@ public function getBody(); /** * Appends data to the body of the current message. * - * @param mixed $data + * @param string $data * * @return $this */ From 684e478edf430dc34ca1d817f5368958c4b24b29 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:22:35 +0900 Subject: [PATCH 4114/8282] docs: fix @return in ResponseTrait --- system/HTTP/ResponseTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index 6bec1c90234f..2ab026c9ba82 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -307,7 +307,7 @@ public function getXML() * @param array|object|string $body * @param string $format Valid: json, xml * - * @return mixed + * @return false|string * * @throws InvalidArgumentException If the body property is not string or array. */ From 563ef336615aa89489a2b896d10486fae24b1039 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:22:57 +0900 Subject: [PATCH 4115/8282] docs: fix @param in RouteCollection --- system/Router/RouteCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 9dbeefc33569..3f728da77ce3 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -409,7 +409,7 @@ public function setAutoRoute(bool $value): RouteCollectionInterface * * This setting is passed to the Router class and handled there. * - * @param callable|null $callable + * @param callable|string|null $callable */ public function set404Override($callable = null): RouteCollectionInterface { From 96d92dd80895bb1856a6fcd6139b6f52a5ac227f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:23:17 +0900 Subject: [PATCH 4116/8282] docs: fix @param in MessageTrait --- system/HTTP/MessageTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php index 7e2665d09157..e565c8d9827f 100644 --- a/system/HTTP/MessageTrait.php +++ b/system/HTTP/MessageTrait.php @@ -59,7 +59,7 @@ public function setBody($data): self /** * Appends data to the body of the current message. * - * @param mixed $data + * @param string $data * * @return $this */ From 9f1fdc648665b33907694d784f972df1e0883469 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:23:38 +0900 Subject: [PATCH 4117/8282] docs: fix @return in FileCollection --- system/HTTP/Files/FileCollection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php index 87f31ee511ea..37c44a88d45d 100644 --- a/system/HTTP/Files/FileCollection.php +++ b/system/HTTP/Files/FileCollection.php @@ -159,7 +159,7 @@ protected function populateFiles() * Given a file array, will create UploadedFile instances. Will * loop over an array and create objects for each. * - * @return array|UploadedFile + * @return UploadedFile|UploadedFile[] */ protected function createFileObject(array $array) { @@ -240,7 +240,7 @@ protected function fixFilesArray(array $data): array * @param array $index The index sequence we are navigating down * @param array $value The portion of the array to process * - * @return mixed + * @return UploadedFile|null */ protected function getValueDotNotationSyntax(array $index, array $value) { From eb22231b899ed00705e05e7277e818653709d0a7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:24:12 +0900 Subject: [PATCH 4118/8282] docs: improve comments in Validation --- system/Validation/Validation.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 5e539561271a..cbfd396f325f 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -462,14 +462,14 @@ public function withRequest(RequestInterface $request): ValidationInterface } /** - * Sets an individual rule and custom error messages for a single field. + * Sets (or adds) an individual rule and custom error messages for a single + * field. * * The custom error message should be just the messages that apply to * this field, like so: - * * [ - * 'rule' => 'message', - * 'rule' => 'message', + * 'rule1' => 'message1', + * 'rule2' => 'message2', * ] * * @param array|string $rules @@ -502,8 +502,8 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [ /** * Stores the rules that should be used to validate the items. - * Rules should be an array formatted like: * + * Rules should be an array formatted like: * [ * 'field' => 'rule1|rule2' * ] @@ -511,12 +511,12 @@ public function setRule(string $field, ?string $label, $rules, array $errors = [ * The $errors array should be formatted like: * [ * 'field' => [ - * 'rule' => 'message', - * 'rule' => 'message + * 'rule1' => 'message1', + * 'rule2' => 'message2', * ], * ] * - * @param array $errors // An array of custom error messages + * @param array $errors An array of custom error messages */ public function setRules(array $rules, array $errors = []): ValidationInterface { From 8d175b250dd5eb04297adb3ad3962e826225ccd0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:36:42 +0900 Subject: [PATCH 4119/8282] docs: fix text decoration --- .../source/installation/running.rst | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index e858adc91d6c..3fe5a1659eba 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -45,7 +45,7 @@ Initial Configuration run using the "production" environment. See also :ref:`environment-constant`. .. note:: If you will be running your site using a web server (e.g., Apache or Nginx), - you will need to modify the permissions for the ``writable`` folder inside + you will need to modify the permissions for the **writable** folder inside your project, so that it is writable by the user or account used by your web server. @@ -64,8 +64,8 @@ This will launch the server and you can now view your application in your browse be used on a production server. If you need to run the site on a host other than simply localhost, you'll first need to add the host -to your ``hosts`` file. The exact location of the file varies in each of the main operating systems, though -all unix-type systems (include OS X) will typically keep the file at **/etc/hosts**. +to your **hosts** file. The exact location of the file varies in each of the main operating systems, though +all unix-type systems (include macOS) will typically keep the file at **/etc/hosts**. The local development server can be customized with three command line options: @@ -99,12 +99,12 @@ The "mod_rewrite" module enables URLs without "index.php" in them, and is assume in our user guide. Make sure that the rewrite module is enabled (uncommented) in the main -configuration file, e.g., ``apache2/conf/httpd.conf``:: +configuration file, e.g., **apache2/conf/httpd.conf**:: LoadModule rewrite_module modules/mod_rewrite.so -Also make sure that the default document root's element enables this too, -in the "AllowOverride" setting:: +Also make sure that the default document root's ```` element enables this too, +in the ``AllowOverride`` setting:: Options Indexes FollowSymLinks @@ -124,18 +124,18 @@ We recommend using "virtual hosting" to run your apps. You can set up different aliases for each of the apps you work on, Make sure that the virtual hosting module is enabled (uncommented) in the main -configuration file, e.g., ``apache2/conf/httpd.conf``:: +configuration file, e.g., **apache2/conf/httpd.conf**:: LoadModule vhost_alias_module modules/mod_vhost_alias.so -Add a host alias in your "hosts" file, typically ``/etc/hosts`` on unix-type platforms, -or ``c:/Windows/System32/drivers/etc/hosts`` on Windows. -Add a line to the file. This could be "myproject.local" or "myproject.test", for instance:: +Add a host alias in your "hosts" file, typically **/etc/hosts** on unix-type platforms, +or **c:/Windows/System32/drivers/etc/hosts** on Windows. +Add a line to the file. This could be ``myproject.local`` or ``myproject.test``, for instance:: 127.0.0.1 myproject.local -Add a element for your webapp inside the virtual hosting configuration, -e.g., ``apache2/conf/extra/httpd-vhost.conf``:: +Add a ```` element for your webapp inside the virtual hosting configuration, +e.g., **apache2/conf/extra/httpd-vhost.conf**:: DocumentRoot "/opt/lamp/apache2/htdocs/myproject/public" @@ -145,18 +145,18 @@ e.g., ``apache2/conf/extra/httpd-vhost.conf``:: If your project folder is not a subfolder of the Apache document root, then your - element may need a nested element to grant the web server access to the files. +```` element may need a nested ```` element to grant the web server access to the files. -With mod_userdir (shared hosts) +With mod_userdir (Shared Hosts) -------------------------------- A common practice in shared hosting environments is to use the Apache module "mod_userdir" to enable per-user Virtual Hosts automatically. Additional configuration is required to allow CodeIgniter4 to be run from these per-user directories. The following assumes that the server is already configured for mod_userdir. A guide to enabling this module is available `in the Apache documentation `_. -Because CodeIgniter4 expects the server to find the framework front controller at ``/public/index.php`` by default, you must specify this location as an alternative to search for the request (even if CodeIgniter4 is installed within the per-user web directory). +Because CodeIgniter4 expects the server to find the framework front controller at **public/index.php** by default, you must specify this location as an alternative to search for the request (even if CodeIgniter4 is installed within the per-user web directory). -The default user web directory ``~/public_html`` is specified by the ``UserDir`` directive, typically in ``/apache2/mods-available/userdir.conf`` or ``/apache2/conf/extra/httpd-userdir.conf``:: +The default user web directory **~/public_html** is specified by the ``UserDir`` directive, typically in **apache2/mods-available/userdir.conf** or **apache2/conf/extra/httpd-userdir.conf**:: UserDir public_html @@ -164,7 +164,7 @@ So you will need to configure Apache to look for CodeIgniter's public directory UserDir "public_html/public" "public_html" -Be sure to specify options and permissions for the CodeIgniter public directory as well. A ``userdir.conf`` might look like:: +Be sure to specify options and permissions for the CodeIgniter public directory as well. A **userdir.conf** might look like:: UserDir "public_html/public" "public_html" @@ -221,7 +221,7 @@ See :ref:`Handling Multiple Environments `. Testing ------- -With the above configuration, your webapp would be accessed with the URL ``http://myproject.local`` in your browser. +With the above configuration, your webapp would be accessed with the URL **http://myproject.local/** in your browser. Apache needs to be restarted whenever you change its configuration. @@ -279,7 +279,7 @@ Bootstrapping the App In some scenarios you will want to load the framework without actually running the whole application. This is particularly useful for unit testing your project, but may also be handy for using third-party tools to analyze and modify your code. The framework comes -with a separate bootstrap script specifically for this scenario: ``system/Test/bootstrap.php``. +with a separate bootstrap script specifically for this scenario: **system/Test/bootstrap.php**. Most of the paths to your project are defined during the bootstrap process. You may use pre-defined constants to override these, but when using the defaults be sure that your From b4ea83bb55b7fd3ae40427d12323e53de1d93ae5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:37:29 +0900 Subject: [PATCH 4120/8282] docs: update PHP version for sample --- user_guide_src/source/installation/running.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 3fe5a1659eba..16c6f6b852ad 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -229,7 +229,7 @@ Hosting with Nginx ================== Nginx is the second most widely used HTTP server for web hosting. -Here you can find an example configuration using PHP 7.3 FPM (unix sockets) under Ubuntu Server. +Here you can find an example configuration using PHP 8.1 FPM (unix sockets) under Ubuntu Server. default.conf ------------ @@ -255,7 +255,7 @@ This configuration enables URLs without "index.php" in them and using CodeIgnite include snippets/fastcgi-php.conf; # With php-fpm: - fastcgi_pass unix:/run/php/php7.3-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; # With php-cgi: # fastcgi_pass 127.0.0.1:9000; } From c4b2e1e3b40736d2d2238ecde5dfa721a05871f3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 16:38:13 +0900 Subject: [PATCH 4121/8282] docs: minor improvements --- user_guide_src/source/installation/running.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 16c6f6b852ad..8a77c9b71f20 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -53,7 +53,7 @@ Local Development Server ======================== CodeIgniter 4 comes with a local development server, leveraging PHP's built-in web server -with CodeIgniter routing. You can use the ``serve`` script to launch it, +with CodeIgniter routing. You can use the ``spark serve`` command to launch it, with the following command line in the main directory:: > php spark serve @@ -87,7 +87,7 @@ Hosting with Apache =================== A CodeIgniter4 webapp is normally hosted on a web server. -Apache's ``httpd`` is the "standard" platform, and assumed in much of our documentation. +Apache HTTP Server is the "standard" platform, and assumed in much of our documentation. Apache is bundled with many platforms, but can also be downloaded in a bundle with a database engine and PHP from `Bitnami `_. From 13287e786d1094be881f6d15e375756046687455 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 5 Jul 2023 19:43:01 +0700 Subject: [PATCH 4122/8282] Make typed property for ResponseTraitTest --- tests/system/API/ResponseTraitTest.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index 653cac115f21..b8a522da86dd 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -29,16 +29,8 @@ */ final class ResponseTraitTest extends CIUnitTestCase { - /** - * @var MockIncomingRequest|null - */ - private $request; - - /** - * @var MockResponse|null - */ - private $response; - + private ?MockIncomingRequest $request = null; + private ?MockResponse $response = null; private ?FormatterInterface $formatter = null; protected function setUp(): void From 5a5bfaef0b4eee5fba5382ece823bc1258358112 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 08:25:40 +0900 Subject: [PATCH 4123/8282] docs: fix by proofreading Co-authored-by: Michal Sniatala --- user_guide_src/source/installation/running.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 8a77c9b71f20..4b08568866f9 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -53,8 +53,8 @@ Local Development Server ======================== CodeIgniter 4 comes with a local development server, leveraging PHP's built-in web server -with CodeIgniter routing. You can use the ``spark serve`` command to launch it, -with the following command line in the main directory:: +with CodeIgniter routing. You can launch it, with the following command line +in the main directory:: > php spark serve From 77a7d27e9b98fd03cd80c35880b69370fd388938 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 13:06:17 +0900 Subject: [PATCH 4124/8282] docs: fix by proofreading Co-authored-by: John Paul E. Balandan, CPA --- user_guide_src/source/installation/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 4b08568866f9..0b974180f7e7 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -65,7 +65,7 @@ This will launch the server and you can now view your application in your browse If you need to run the site on a host other than simply localhost, you'll first need to add the host to your **hosts** file. The exact location of the file varies in each of the main operating systems, though -all unix-type systems (include macOS) will typically keep the file at **/etc/hosts**. +all unix-type systems (including macOS) will typically keep the file at **/etc/hosts**. The local development server can be customized with three command line options: From 6878e43f27fe808fdfe9e42b1fee4641e85a8e4b Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 13:46:40 +0900 Subject: [PATCH 4125/8282] refactor: remove uneeded `if` --- system/Commands/Utilities/Routes.php | 29 +++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php index ee726d4aa93d..b3693ec6860e 100644 --- a/system/Commands/Utilities/Routes.php +++ b/system/Commands/Utilities/Routes.php @@ -11,7 +11,6 @@ namespace CodeIgniter\Commands\Utilities; -use Closure; use CodeIgniter\CLI\BaseCommand; use CodeIgniter\CLI\CLI; use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector; @@ -119,21 +118,19 @@ public function run(array $params) $definedRouteCollector = new DefinedRouteCollector($collection); foreach ($definedRouteCollector->collect() as $route) { - if (is_string($route['handler']) || $route['handler'] instanceof Closure) { - $sampleUri = $uriGenerator->get($route['route']); - $filters = $filterCollector->get($route['method'], $sampleUri); - - $routeName = ($route['route'] === $route['name']) ? '»' : $route['name']; - - $tbody[] = [ - strtoupper($route['method']), - $route['route'], - $routeName, - $route['handler'], - implode(' ', array_map('class_basename', $filters['before'])), - implode(' ', array_map('class_basename', $filters['after'])), - ]; - } + $sampleUri = $uriGenerator->get($route['route']); + $filters = $filterCollector->get($route['method'], $sampleUri); + + $routeName = ($route['route'] === $route['name']) ? '»' : $route['name']; + + $tbody[] = [ + strtoupper($route['method']), + $route['route'], + $routeName, + $route['handler'], + implode(' ', array_map('class_basename', $filters['before'])), + implode(' ', array_map('class_basename', $filters['after'])), + ]; } if ($collection->shouldAutoRoute()) { From ef1b3b230a0b8bfaefbd0e0c0f3ac1d9c59c106d Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 08:35:19 +0900 Subject: [PATCH 4126/8282] docs: add @phpstan-var to stop rector to skip RemoveAlwaysTrueIfConditionRector Without this doc type, Rector will refactor the following: 1) system/Router/AutoRouterImproved.php:294 ---------- begin diff ---------- @@ @@ // Update the positions. $this->methodPos = $this->paramPos; - if ($params === []) { - $this->paramPos = null; - } + $this->paramPos = null; if ($this->paramPos !== null) { $this->paramPos++; } ----------- end diff ----------- Applied rules: * RemoveAlwaysTrueIfConditionRector --- system/Router/AutoRouterImproved.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php index b8c1e9d35099..a186fd33ef55 100644 --- a/system/Router/AutoRouterImproved.php +++ b/system/Router/AutoRouterImproved.php @@ -46,6 +46,8 @@ final class AutoRouterImproved implements AutoRouterInterface /** * An array of params to the controller method. + * + * @phpstan-var list */ private array $params = []; @@ -72,6 +74,8 @@ final class AutoRouterImproved implements AutoRouterInterface /** * The URI segments. + * + * @phpstan-var list */ private array $segments = []; @@ -279,6 +283,7 @@ public function getRoute(string $uri, string $httpVerb): array } // The first item may be a method name. + /** @phpstan-var list $params */ $params = $this->params; $methodParam = array_shift($params); From 73aded644761abb4f9dcaf4c00ad9bc5aae9ba5c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 14:33:31 +0900 Subject: [PATCH 4127/8282] docs: fix text decoration --- user_guide_src/source/outgoing/view_cells.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst index c797ec4bd8e4..09a6f5b6c12a 100644 --- a/user_guide_src/source/outgoing/view_cells.rst +++ b/user_guide_src/source/outgoing/view_cells.rst @@ -119,7 +119,7 @@ At the most basic level, all you need to implement within the class are public p Generating Cell via Command =========================== -You can also create a controlled cell via a built in command from the CLI. The command is ``php spark make:cell``. It takes one argument, the name of the cell to create. The name should be in PascalCase, and the class will be created in the ``app/Cells`` directory. The view file will also be created in the ``app/Cells`` directory. +You can also create a controlled cell via a built in command from the CLI. The command is ``php spark make:cell``. It takes one argument, the name of the cell to create. The name should be in PascalCase, and the class will be created in the **app/Cells** directory. The view file will also be created in the **app/Cells** directory. :: From da067273a7e55e73aa59f413d6b14d201cfe59d5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 14:33:46 +0900 Subject: [PATCH 4128/8282] docs: add sub section titles, etc. --- user_guide_src/source/outgoing/view_cells.rst | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst index 09a6f5b6c12a..cad0d3e392a4 100644 --- a/user_guide_src/source/outgoing/view_cells.rst +++ b/user_guide_src/source/outgoing/view_cells.rst @@ -16,17 +16,27 @@ CodeIgniter supports two types of View Cells: simple and controlled. Simple View Calling a View Cell ******************* -No matter which type of View Cell you are using, you can call it from any view by using the ``view_cell()`` helper method. The first parameter is the name of the class and method to call, and the second parameter is an array of parameters to pass to the method. The method must return a string, which will be inserted into the view where the ``view_cell()`` method was called. +No matter which type of View Cell you are using, you can call it from any view by using the ``view_cell()`` helper function. + +The first parameter is the name of the class and method to call, and the second parameter is an array of parameters to pass to the method. :: 'value1', 'param2' => 'value2']) ?> -If you do not include the full namespace for the class, it will assume in can be found in the ``App\Cells`` namespace. So, the following example would attempt to find the ``MyClass`` class in ``app/Cells/MyClass.php``. If it is not found there, all namespaces will be scanned until it is found, searching within a ``Cells`` subdirectory of each namespace. +The Cell method must return a string, which will be inserted into the view where the ``view_cell()`` function was called. + +Namespace Omission +================== + +.. versionadded:: 4.3.0 + +If you do not include the full namespace for the class, it will assume in can be found in the ``App\Cells`` namespace. So, the following example would attempt to find the ``MyClass`` class in **app/Cells/MyClass.php**. If it is not found there, all namespaces will be scanned until it is found, searching within a **Cells** subdirectory of each namespace. :: 'value1', 'param2' => 'value2']) ?> -.. note:: Namespace omission is available since v4.3.0 and later. +Passing Parameters as Key/Value String +====================================== You can also pass the parameters along as a key/value string: :: From 99ae8bdea1d5c870001cac7d6280f7d3f480e322 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 15:16:50 +0900 Subject: [PATCH 4129/8282] docs: extract source files and fix some bugs --- user_guide_src/source/outgoing/view_cells.rst | 221 +++--------------- .../source/outgoing/view_cells/001.php | 2 + .../source/outgoing/view_cells/002.php | 2 + .../source/outgoing/view_cells/003.php | 2 + .../source/outgoing/view_cells/004.php | 11 + .../source/outgoing/view_cells/005.php | 2 + .../source/outgoing/view_cells/006.php | 2 + .../source/outgoing/view_cells/007.php | 20 ++ .../source/outgoing/view_cells/008.php | 13 ++ .../source/outgoing/view_cells/009.php | 4 + .../source/outgoing/view_cells/010.php | 2 + .../source/outgoing/view_cells/011.php | 13 ++ .../source/outgoing/view_cells/012.php | 16 ++ .../source/outgoing/view_cells/013.php | 2 + .../source/outgoing/view_cells/014.php | 34 +++ .../source/outgoing/view_cells/015.php | 6 + .../source/outgoing/view_cells/016.php | 17 ++ .../source/outgoing/view_cells/017.php | 6 + .../source/outgoing/view_cells/018.php | 15 ++ .../source/outgoing/view_cells/019.php | 22 ++ .../source/outgoing/view_cells/020.php | 2 + .../source/outgoing/view_cells/021.php | 2 + .../source/outgoing/view_cells/022.php | 2 + 23 files changed, 230 insertions(+), 188 deletions(-) create mode 100644 user_guide_src/source/outgoing/view_cells/001.php create mode 100644 user_guide_src/source/outgoing/view_cells/002.php create mode 100644 user_guide_src/source/outgoing/view_cells/003.php create mode 100644 user_guide_src/source/outgoing/view_cells/004.php create mode 100644 user_guide_src/source/outgoing/view_cells/005.php create mode 100644 user_guide_src/source/outgoing/view_cells/006.php create mode 100644 user_guide_src/source/outgoing/view_cells/007.php create mode 100644 user_guide_src/source/outgoing/view_cells/008.php create mode 100644 user_guide_src/source/outgoing/view_cells/009.php create mode 100644 user_guide_src/source/outgoing/view_cells/010.php create mode 100644 user_guide_src/source/outgoing/view_cells/011.php create mode 100644 user_guide_src/source/outgoing/view_cells/012.php create mode 100644 user_guide_src/source/outgoing/view_cells/013.php create mode 100644 user_guide_src/source/outgoing/view_cells/014.php create mode 100644 user_guide_src/source/outgoing/view_cells/015.php create mode 100644 user_guide_src/source/outgoing/view_cells/016.php create mode 100644 user_guide_src/source/outgoing/view_cells/017.php create mode 100644 user_guide_src/source/outgoing/view_cells/018.php create mode 100644 user_guide_src/source/outgoing/view_cells/019.php create mode 100644 user_guide_src/source/outgoing/view_cells/020.php create mode 100644 user_guide_src/source/outgoing/view_cells/021.php create mode 100644 user_guide_src/source/outgoing/view_cells/022.php diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst index cad0d3e392a4..b26213459796 100644 --- a/user_guide_src/source/outgoing/view_cells.rst +++ b/user_guide_src/source/outgoing/view_cells.rst @@ -18,10 +18,9 @@ Calling a View Cell No matter which type of View Cell you are using, you can call it from any view by using the ``view_cell()`` helper function. -The first parameter is the name of the class and method to call, and the second parameter is an array of parameters to pass to the method. -:: +The first parameter is the name of the class and method to call, and the second parameter is an array of parameters to pass to the method: - 'value1', 'param2' => 'value2']) ?> +.. literalinclude:: view_cells/001.php The Cell method must return a string, which will be inserted into the view where the ``view_cell()`` function was called. @@ -30,57 +29,35 @@ Namespace Omission .. versionadded:: 4.3.0 -If you do not include the full namespace for the class, it will assume in can be found in the ``App\Cells`` namespace. So, the following example would attempt to find the ``MyClass`` class in **app/Cells/MyClass.php**. If it is not found there, all namespaces will be scanned until it is found, searching within a **Cells** subdirectory of each namespace. -:: +If you do not include the full namespace for the class, it will assume in can be found in the ``App\Cells`` namespace. So, the following example would attempt to find the ``MyClass`` class in **app/Cells/MyClass.php**. If it is not found there, all namespaces will be scanned until it is found, searching within a **Cells** subdirectory of each namespace: - 'value1', 'param2' => 'value2']) ?> +.. literalinclude:: view_cells/002.php Passing Parameters as Key/Value String ====================================== You can also pass the parameters along as a key/value string: -:: - +.. literalinclude:: view_cells/003.php ************ Simple Cells ************ Simple Cells are classes that return a string from the chosen method. An example of a simple Alert Message cell might look like this: -:: - - namespace App\Cells; - class AlertMessage - { - public function show(array $params): string - { - return "
        {$params['message']}
        "; - } - } +.. literalinclude:: view_cells/004.php You would call it from within a view like: -:: - 'success', 'message' => 'The user has been updated.']) ?> +.. literalinclude:: view_cells/005.php Additionally, you can use parameter names that match the parameter variables in the method for better readability. -When you use it this way, all of the parameters must always be specified in the view cell call:: - - // In a View. - +When you use it this way, all of the parameters must always be specified in the view cell call: - // In a Cell. - public function recentPosts(string $category, int $limit) - { - $posts = $this->blogModel->where('category', $category) - ->orderBy('published_on', 'desc') - ->limit($limit) - ->get(); +.. literalinclude:: view_cells/006.php - return view('recentPosts', ['posts' => $posts]); - } +.. literalinclude:: view_cells/007.php .. _controlled-cells: @@ -103,26 +80,12 @@ Creating a Controlled Cell ========================== At the most basic level, all you need to implement within the class are public properties. These properties will be made available to the view file automatically. Implementing the AlertMessage from above as a Controlled Cell would look like this: -:: - - // app/Cells/AlertMessageCell.php - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; - class AlertMessageCell extends Cell - { - public $type; - public $message; - } +.. literalinclude:: view_cells/008.php - // app/Cells/alert_message.php -
        - -
        +.. literalinclude:: view_cells/009.php - // Called in main View: - +.. literalinclude:: view_cells/010.php .. _generating-cell-via-command: @@ -138,90 +101,27 @@ You can also create a controlled cell via a built in command from the CLI. The c Using a Different View ====================== -You can specify a custom view name by setting the ``view`` property in the class. The view will be located like any view would be normally. +You can specify a custom view name by setting the ``view`` property in the class. The view will be located like any view would be normally: -:: - - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; - - class AlertMessageCell extends Cell - { - public $type; - public $message; - - protected $view = 'my/custom/view'; - } +.. literalinclude:: view_cells/011.php Customize the Rendering ======================= -If you need more control over the rendering of the HTML, you can implement a ``render()`` method. This method allows you to perform additional logic and pass extra data the view, if needed. The ``render()`` method must return a string. To take advantage of the full features of controlled Cells, you should use ``$this->view()`` instead of the normal ``view()`` helper function. -:: - - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; +If you need more control over the rendering of the HTML, you can implement a ``render()`` method. This method allows you to perform additional logic and pass extra data the view, if needed. The ``render()`` method must return a string. To take advantage of the full features of controlled Cells, you should use ``$this->view()`` instead of the normal ``view()`` helper function: - class AlertMessageCell extends Cell - { - public $type; - public $message; - - public function render(): string - { - return $this->view('my/custom/view', ['extra' => 'data']); - } - } +.. literalinclude:: view_cells/012.php Computed Properties =================== -If you need to perform additional logic for one or more properties you can use computed properties. These require setting the property to either ``protected`` or ``private`` and implementing a public method whose name consists of the property name surrounded by ``get`` and ``Property``. -:: - - // In a View. Initialize the protected properties. - view_cell('AlertMessageCell', ['type' => 'note', 'message' => 'test']); - - // app/Cells/AlertMessageCell.php - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; - - class AlertMessageCell extends Cell - { - protected $type; - protected $message; - private $computed; - - public function mount() - { - $this->computed = sprintf('%s - %s', $this->type, $this->message); - } +If you need to perform additional logic for one or more properties you can use computed properties. These require setting the property to either ``protected`` or ``private`` and implementing a public method whose name consists of the property name surrounded by ``get`` and ``Property``: - public function getComputedProperty(): string - { - return $this->computed; - } +.. literalinclude:: view_cells/013.php - public function getTypeProperty(): string - { - return $this->type; - } +.. literalinclude:: view_cells/014.php - public function getMessageProperty(): string - { - return $this->message; - } - } - - // app/Cells/alert_message.php -
        -

        type -

        -

        message -

        -

        computed:

        -
        +.. literalinclude:: view_cells/015.php .. important:: You can't set properties that are declared as private during cell initialization. @@ -229,90 +129,35 @@ If you need to perform additional logic for one or more properties you can use c Presentation Methods ==================== -Sometimes you need to perform additional logic for the view, but you don't want to pass it as a parameter. You can implement a method that will be called from within the cell's view itself. This can help the readability of your views. -:: - - // app/Cells/RecentPostsCell.php - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; - - class RecentPostsCell extends Cell - { - protected $posts; +Sometimes you need to perform additional logic for the view, but you don't want to pass it as a parameter. You can implement a method that will be called from within the cell's view itself. This can help the readability of your views: - public function linkPost($post) - { - return anchor('posts/' . $post->id, $post->title); - } - } +.. literalinclude:: view_cells/016.php - // app/Cells/recent_posts.php -
          - -
        • linkPost($post) ?>
          • - -
        +.. literalinclude:: view_cells/017.php Performing Setup Logic ====================== -If you need to perform additional logic before the view is rendered, you can implement a ``mount()`` method. This method will be called just after the class is instantiated, and can be used to set additional properties or perform other logic. +If you need to perform additional logic before the view is rendered, you can implement a ``mount()`` method. This method will be called just after the class is instantiated, and can be used to set additional properties or perform other logic: -:: - - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; - - class RecentPostsCell extends Cell - { - protected $posts; - - public function mount() - { - $this->posts = model('PostModel')->getRecent(); - } - } +.. literalinclude:: view_cells/018.php -You can pass additional parameters to the ``mount()`` method by passing them as an array to the ``view_cell()`` helper function. Any of the parameters sent that match a parameter name of the ``mount`` method will be passed in. -:: - - // app/Cells/RecentPostsCell.php - namespace App\Cells; - - use CodeIgniter\View\Cells\Cell; +You can pass additional parameters to the ``mount()`` method by passing them as an array to the ``view_cell()`` helper function. Any of the parameters sent that match a parameter name of the ``mount`` method will be passed in: - class RecentPostsCell extends Cell - { - protected $posts; +.. literalinclude:: view_cells/019.php - public function mount(?int $categoryId) - { - $this->posts = model('PostModel') - ->when($categoryId, function ($query, $category) { - return $query->where('category_id', $categoryId); - }) - ->getRecent(); - } - } - - // Called in main View: - 5]) ?> +.. literalinclude:: view_cells/020.php ************ Cell Caching ************ You can cache the results of the view cell call by passing the number of seconds to cache the data for as the -third parameter. This will use the currently configured cache engine. -:: +third parameter. This will use the currently configured cache engine: - // Cache the view for 5 minutes - +.. literalinclude:: view_cells/021.php You can provide a custom name to use instead of the auto-generated one if you like, by passing the new name -as the fourth parameter:: +as the fourth parameter: - // Cache the view for 5 minutes - +.. literalinclude:: view_cells/022.php diff --git a/user_guide_src/source/outgoing/view_cells/001.php b/user_guide_src/source/outgoing/view_cells/001.php new file mode 100644 index 000000000000..2a9e4361796e --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/001.php @@ -0,0 +1,2 @@ +// In a View. + 'value1', 'param2' => 'value2']) ?> diff --git a/user_guide_src/source/outgoing/view_cells/002.php b/user_guide_src/source/outgoing/view_cells/002.php new file mode 100644 index 000000000000..1dcea35569f2 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/002.php @@ -0,0 +1,2 @@ +// In a View. + 'value1', 'param2' => 'value2']) ?> diff --git a/user_guide_src/source/outgoing/view_cells/003.php b/user_guide_src/source/outgoing/view_cells/003.php new file mode 100644 index 000000000000..93fa8eea5e19 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/003.php @@ -0,0 +1,2 @@ +// In a View. + diff --git a/user_guide_src/source/outgoing/view_cells/004.php b/user_guide_src/source/outgoing/view_cells/004.php new file mode 100644 index 000000000000..26009d86a8eb --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/004.php @@ -0,0 +1,11 @@ +{$params['message']}
        "; + } +} diff --git a/user_guide_src/source/outgoing/view_cells/005.php b/user_guide_src/source/outgoing/view_cells/005.php new file mode 100644 index 000000000000..776b26573251 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/005.php @@ -0,0 +1,2 @@ +// In a View. + 'success', 'message' => 'The user has been updated.']) ?> diff --git a/user_guide_src/source/outgoing/view_cells/006.php b/user_guide_src/source/outgoing/view_cells/006.php new file mode 100644 index 000000000000..64157d309b12 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/006.php @@ -0,0 +1,2 @@ +// In a View. + diff --git a/user_guide_src/source/outgoing/view_cells/007.php b/user_guide_src/source/outgoing/view_cells/007.php new file mode 100644 index 000000000000..ab1e56b3c5e8 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/007.php @@ -0,0 +1,20 @@ +blogModel->where('category', $category) + ->orderBy('published_on', 'desc') + ->limit($limit) + ->get(); + + return view('recentPosts', ['posts' => $posts]); + } +} diff --git a/user_guide_src/source/outgoing/view_cells/008.php b/user_guide_src/source/outgoing/view_cells/008.php new file mode 100644 index 000000000000..f8b8c68ea8f2 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/008.php @@ -0,0 +1,13 @@ +"> + +
        diff --git a/user_guide_src/source/outgoing/view_cells/010.php b/user_guide_src/source/outgoing/view_cells/010.php new file mode 100644 index 000000000000..3fdcbd9d18c1 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/010.php @@ -0,0 +1,2 @@ +// Called in main View: + diff --git a/user_guide_src/source/outgoing/view_cells/011.php b/user_guide_src/source/outgoing/view_cells/011.php new file mode 100644 index 000000000000..75f37da190db --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/011.php @@ -0,0 +1,13 @@ +view('my/custom/view', ['extra' => 'data']); + } +} diff --git a/user_guide_src/source/outgoing/view_cells/013.php b/user_guide_src/source/outgoing/view_cells/013.php new file mode 100644 index 000000000000..32e02a03dce6 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/013.php @@ -0,0 +1,2 @@ +// In a View. Initialize the protected properties. + 'note', 'message' => 'test']) ?> diff --git a/user_guide_src/source/outgoing/view_cells/014.php b/user_guide_src/source/outgoing/view_cells/014.php new file mode 100644 index 000000000000..29378e1199ab --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/014.php @@ -0,0 +1,34 @@ +computed = sprintf('%s - %s', $this->type, $this->message); + } + + public function getComputedProperty(): string + { + return $this->computed; + } + + public function getTypeProperty(): string + { + return $this->type; + } + + public function getMessageProperty(): string + { + return $this->message; + } +} diff --git a/user_guide_src/source/outgoing/view_cells/015.php b/user_guide_src/source/outgoing/view_cells/015.php new file mode 100644 index 000000000000..382152cfb105 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/015.php @@ -0,0 +1,6 @@ +// app/Cells/alert_message.php +
        +

        type -

        +

        message -

        +

        computed:

        +
        diff --git a/user_guide_src/source/outgoing/view_cells/016.php b/user_guide_src/source/outgoing/view_cells/016.php new file mode 100644 index 000000000000..4b2c10ef0cc6 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/016.php @@ -0,0 +1,17 @@ +id, $post->title); + } +} diff --git a/user_guide_src/source/outgoing/view_cells/017.php b/user_guide_src/source/outgoing/view_cells/017.php new file mode 100644 index 000000000000..359eb6fce035 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/017.php @@ -0,0 +1,6 @@ +// app/Cells/recent_posts.php +
          + +
        • linkPost($post) ?>
          • + +
        diff --git a/user_guide_src/source/outgoing/view_cells/018.php b/user_guide_src/source/outgoing/view_cells/018.php new file mode 100644 index 000000000000..8fc2a4c5b6ae --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/018.php @@ -0,0 +1,15 @@ +posts = model('PostModel')->getRecent(); + } +} diff --git a/user_guide_src/source/outgoing/view_cells/019.php b/user_guide_src/source/outgoing/view_cells/019.php new file mode 100644 index 000000000000..2ed71e348e29 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/019.php @@ -0,0 +1,22 @@ +posts = model('PostModel') + ->when( + $categoryId, + static fn ($query, $categoryId) => $query->where('category_id', $categoryId) + ) + ->getRecent(); + } +} diff --git a/user_guide_src/source/outgoing/view_cells/020.php b/user_guide_src/source/outgoing/view_cells/020.php new file mode 100644 index 000000000000..55d6788211d6 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/020.php @@ -0,0 +1,2 @@ +// Called in main View: + 5]) ?> diff --git a/user_guide_src/source/outgoing/view_cells/021.php b/user_guide_src/source/outgoing/view_cells/021.php new file mode 100644 index 000000000000..a6b814d1f9cb --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/021.php @@ -0,0 +1,2 @@ +// Cache the view for 5 minutes + diff --git a/user_guide_src/source/outgoing/view_cells/022.php b/user_guide_src/source/outgoing/view_cells/022.php new file mode 100644 index 000000000000..8c588695719f --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/022.php @@ -0,0 +1,2 @@ +// Cache the view for 5 minutes + From 1a547723fc9a962f82082a4f42015d76d2bbc728 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 15:29:55 +0900 Subject: [PATCH 4130/8282] docs: add () after method name --- user_guide_src/source/outgoing/view_cells.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst index b26213459796..91b22fadb639 100644 --- a/user_guide_src/source/outgoing/view_cells.rst +++ b/user_guide_src/source/outgoing/view_cells.rst @@ -142,7 +142,7 @@ If you need to perform additional logic before the view is rendered, you can imp .. literalinclude:: view_cells/018.php -You can pass additional parameters to the ``mount()`` method by passing them as an array to the ``view_cell()`` helper function. Any of the parameters sent that match a parameter name of the ``mount`` method will be passed in: +You can pass additional parameters to the ``mount()`` method by passing them as an array to the ``view_cell()`` helper function. Any of the parameters sent that match a parameter name of the ``mount()`` method will be passed in: .. literalinclude:: view_cells/019.php From 6d13ca95d79ee0deabd6c70ac0f73f3b6bc35316 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 14:23:01 +0900 Subject: [PATCH 4131/8282] docs: add @param --- system/View/Cell.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/View/Cell.php b/system/View/Cell.php index b898adc0e754..ddb2941b5f44 100644 --- a/system/View/Cell.php +++ b/system/View/Cell.php @@ -64,7 +64,10 @@ public function __construct(CacheInterface $cache) /** * Render a cell, returning its body as a string. * - * @param array|string|null $params + * @param string $library Cell class and method name. + * @param array|string|null $params Parameters to pass to the method. + * @param int $ttl Number of seconds to cache the cell. + * @param string|null $cacheName Cache item name. * * @throws ReflectionException */ From 6e0a9a506c7c829e7f03f33a6d2995c55c8221b0 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 6 Jul 2023 17:39:21 +0800 Subject: [PATCH 4132/8282] Remove `SODIUM_LIBRARY_VERSION` from `dynamicConstantNames` --- phpstan.neon.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index c6d69a55dbe2..751c67ca23f1 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -44,4 +44,3 @@ parameters: - APP_NAMESPACE - CI_DEBUG - ENVIRONMENT - - SODIUM_LIBRARY_VERSION From e5cfd4e27798629d85f6e29c4513ab2a477f9189 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 6 Jul 2023 17:48:47 +0800 Subject: [PATCH 4133/8282] Remove `parallel.processTimeout` --- phpstan.neon.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index c6d69a55dbe2..d8c90f3bf1da 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -36,8 +36,6 @@ parameters: - system/Test/Filters/CITestStreamFilter.php - system/ThirdParty/* - system/Validation/Views/single.php - parallel: - processTimeout: 300.0 scanDirectories: - system/Helpers dynamicConstantNames: From c009117834c2f249a6a444cb0a41a85cba5e3f15 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 3 Jul 2023 19:30:03 +0900 Subject: [PATCH 4134/8282] docs: fix @phpstan-return --- system/Router/RouteCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 21fa22dda707..5e4cdb36ef6e 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1649,7 +1649,7 @@ public function resetRoutes() * array{ * filter?: string|list, namespace?: string, hostname?: string, * subdomain?: string, offset?: int, priority?: int, as?: string, - * redirect?: string + * redirect?: int * } * > */ From 3f3d2162367f613401f4e5f64de50f2e0d79788c Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 4 Jul 2023 13:12:54 +0900 Subject: [PATCH 4135/8282] feat: improve `spark routes` output for View routes --- system/Router/DefinedRouteCollector.php | 4 +++- system/Router/RouteCollection.php | 5 ++++- tests/system/Router/DefinedRouteCollectorTest.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php index eeae28379d04..f77383fa6cef 100644 --- a/system/Router/DefinedRouteCollector.php +++ b/system/Router/DefinedRouteCollector.php @@ -51,7 +51,9 @@ public function collect(): Generator if (is_string($handler) || $handler instanceof Closure) { if ($handler instanceof Closure) { - $handler = '(Closure)'; + $view = $this->routeCollection->getRoutesOptions($route, $method)['view'] ?? false; + + $handler = $view ? '(View) ' . $view : '(Closure)'; } $routeName = $this->routeCollection->getRoutesOptions($route)['as'] ?? $route; diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 5e4cdb36ef6e..3e45d6b95588 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -1101,7 +1101,10 @@ public function view(string $from, string $view, ?array $options = null): RouteC ->setData(['segments' => $data], 'raw') ->render($view, $options); - $this->create('get', $from, $to, $options); + $routeOptions = $options ?? []; + $routeOptions = array_merge($routeOptions, ['view' => $view]); + + $this->create('get', $from, $to, $routeOptions); return $this; } diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php index 619f4386886f..ba74cec1a86a 100644 --- a/tests/system/Router/DefinedRouteCollectorTest.php +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -82,7 +82,7 @@ public function testCollect() 'method' => 'get', 'route' => 'about', 'name' => 'about', - 'handler' => '(Closure)', + 'handler' => '(View) pages/about', ], ]; $this->assertSame($expected, $definedRoutes); From 0aa5dbd1dd5cfecdc64a7d06a24c5a1caadcfad8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jul 2023 08:09:59 +0900 Subject: [PATCH 4136/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 20db5a2d7b38..6b77eac7ecc9 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -83,8 +83,17 @@ Enhancements Commands ======== -- Now ``spark routes`` command can specify the host in the request URL. - See :ref:`routing-spark-routes-specify-host`. +- **spark routes:** + - Now you can specify the host in the request URL. + See :ref:`routing-spark-routes-specify-host`. + - It shows view files of :ref:`view-routes` in *Handler* like the following: + + +---------+-------------+------+------------------------------+----------------+---------------+ + | Method | Route | Name | Handler | Before Filters | After Filters | + +---------+-------------+------+------------------------------+----------------+---------------+ + | GET | about | » | (View) pages/about | | toolbar | + +---------+-------------+------+------------------------------+----------------+---------------+ + Testing ======= @@ -151,6 +160,7 @@ Others - **Error Handling:** Now you can use :ref:`custom-exception-handlers`. - **RedirectException:** can also take an object that implements ResponseInterface as its first argument. - **RedirectException:** implements ResponsableInterface. +- **DebugBar:** Now :ref:`view-routes` are displayed in *DEFINED ROUTES* on the *Routes* tab. Message Changes *************** From f61b41da51565aab9b1e7e1cdef0b0476e1fdab1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 16:03:00 +0900 Subject: [PATCH 4137/8282] fix: normailze params If you call view_cell() with param ['param1' => 'value1'], and call with param 'param1=value1', they should be one cache. --- system/View/Cell.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/View/Cell.php b/system/View/Cell.php index ddb2941b5f44..5d575bced1e7 100644 --- a/system/View/Cell.php +++ b/system/View/Cell.php @@ -79,6 +79,8 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c ? get_class($instance) : null; + $params = $this->prepareParams($params); + // Is the output cached? $cacheName = ! empty($cacheName) ? $cacheName @@ -96,8 +98,6 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c throw ViewException::forInvalidCellMethod($class, $method); } - $params = $this->prepareParams($params); - $output = $instance instanceof BaseCell ? $this->renderCell($instance, $method, $params) : $this->renderSimpleClass($instance, $method, $params, $class); From 8133881ea1b8d1c762064005b7fdf317f3e7ad7f Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 7 Jul 2023 04:11:24 +0700 Subject: [PATCH 4138/8282] [Rector] Remove NodeConnectingVisitor from phsptan config --- phpstan.neon.dist | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 884a3dc91bfa..b196b90397f5 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,7 +1,3 @@ -conditionalTags: - PhpParser\NodeVisitor\NodeConnectingVisitor: - phpstan.parser.richParserNodeVisitor: true - services: - class: Utils\PHPStan\CheckUseStatementsAfterLicenseRule From 3d946c8a4c50c732f3c2732ba9abef22b9aaa27e Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 7 Jul 2023 04:14:50 +0700 Subject: [PATCH 4139/8282] change neon file should run rector as well --- .github/workflows/test-rector.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml index 89f211120d0d..7df4a3a3d3ed 100644 --- a/.github/workflows/test-rector.yml +++ b/.github/workflows/test-rector.yml @@ -15,6 +15,7 @@ on: - '.github/workflows/test-rector.yml' - composer.json - rector.php + - '**.neon.dist' push: branches: @@ -28,6 +29,7 @@ on: - '.github/workflows/test-rector.yml' - composer.json - rector.php + - '**.neon.dist' concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} From 62e20d83e8386a5ad48e42f98ee93433ffd10fc9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 09:26:03 +0900 Subject: [PATCH 4140/8282] fix: Services::session() $config type --- system/Config/Services.php | 9 +++------ tests/system/Config/ServicesTest.php | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/system/Config/Services.php b/system/Config/Services.php index c8ded8034257..a2f6a5cb03a9 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -661,19 +661,16 @@ public static function security(?SecurityConfig $config = null, bool $getShared * Return the session manager. * * @return Session - * - * @TODO replace the first parameter type `?App` with `?SessionConfig` */ - public static function session(?App $config = null, bool $getShared = true) + public static function session(?SessionConfig $config = null, bool $getShared = true) { if ($getShared) { return static::getSharedInstance('session', $config); } - $logger = AppServices::logger(); + $config ??= config(SessionConfig::class); - $config = config(SessionConfig::class); - assert($config instanceof SessionConfig, 'Missing "Config/Session.php".'); + $logger = AppServices::logger(); $driverName = $config->driver; diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index b6ea85e6971f..283233d8b4ed 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -243,7 +243,7 @@ public function testNewViewcell() */ public function testNewSession() { - $actual = Services::session($this->config); + $actual = Services::session(); $this->assertInstanceOf(Session::class, $actual); } From 3eab5e043e7ac43ec5de9fb2b85f8fb797d36657 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 09:28:12 +0900 Subject: [PATCH 4141/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.4.0.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 20db5a2d7b38..e6d6d6a68a63 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -50,8 +50,11 @@ Method Signature Changes Parameter Type Changes ---------------------- -- **Services:** The first parameter of ``Services::security()`` has been - changed from ``Config\App`` to ``Config\Security``. +- **Services:** + - The first parameter of ``Services::security()`` has been changed from + ``Config\App`` to ``Config\Security``. + - The first parameter of ``Services::session()`` has been changed from + ``Config\App`` to ``Config\Session``. - **Session:** - The second parameter of ``Session::__construct()`` has been changed from ``Config\App`` to ``Config\Session``. From e0f4094660561459ada5359ebd78934900f0d569 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 09:39:27 +0900 Subject: [PATCH 4142/8282] test: remove unused property --- tests/system/Config/ServicesTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 283233d8b4ed..349b6b0cc575 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -54,7 +54,6 @@ */ final class ServicesTest extends CIUnitTestCase { - private App $config; private array $original; protected function setUp(): void @@ -62,7 +61,6 @@ protected function setUp(): void parent::setUp(); $this->original = $_SERVER; - $this->config = new App(); } protected function tearDown(): void From 39406f0972d02a0a9fd2e5e707b0649799f68173 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 11:52:32 +0900 Subject: [PATCH 4143/8282] docs: add max_length to sample code It is good practice to check max length. --- user_guide_src/source/libraries/validation/002.php | 8 ++++---- user_guide_src/source/libraries/validation/005.php | 4 ++-- user_guide_src/source/libraries/validation/006.php | 8 ++++---- user_guide_src/source/libraries/validation/007.php | 8 ++++---- user_guide_src/source/libraries/validation/009.php | 4 ++-- user_guide_src/source/libraries/validation/010.php | 2 +- user_guide_src/source/libraries/validation/011.php | 2 +- user_guide_src/source/libraries/validation/013.php | 8 ++++---- user_guide_src/source/libraries/validation/015.php | 8 ++++---- user_guide_src/source/libraries/validation/016.php | 4 ++-- user_guide_src/source/libraries/validation/020.php | 4 ++-- user_guide_src/source/libraries/validation/022.php | 4 ++-- user_guide_src/source/libraries/validation/023.php | 4 ++-- user_guide_src/source/libraries/validation/024.php | 4 ++-- user_guide_src/source/libraries/validation/025.php | 4 ++-- user_guide_src/source/libraries/validation/036.php | 2 +- user_guide_src/source/libraries/validation/038.php | 8 ++++---- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/user_guide_src/source/libraries/validation/002.php b/user_guide_src/source/libraries/validation/002.php index d1eeff19c329..b8d5811f356d 100644 --- a/user_guide_src/source/libraries/validation/002.php +++ b/user_guide_src/source/libraries/validation/002.php @@ -3,10 +3,10 @@ // ... $rules = [ - 'username' => 'required', - 'password' => 'required|min_length[10]', - 'passconf' => 'required|matches[password]', - 'email' => 'required|valid_email', + 'username' => 'required|max_length[30]', + 'password' => 'required|max_length[255]|min_length[10]', + 'passconf' => 'required|max_length[255]|matches[password]', + 'email' => 'required|max_length[254]|valid_email', ]; // ... diff --git a/user_guide_src/source/libraries/validation/005.php b/user_guide_src/source/libraries/validation/005.php index 9d129e6425e1..6ab43932d769 100644 --- a/user_guide_src/source/libraries/validation/005.php +++ b/user_guide_src/source/libraries/validation/005.php @@ -1,4 +1,4 @@ setRule('username', 'Username', 'required|min_length[3]'); -$validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']); +$validation->setRule('username', 'Username', 'required|max_length[30]|min_length[3]'); +$validation->setRule('password', 'Password', ['required', 'max_length[255]', 'min_length[8]', 'alpha_numeric_punct']); diff --git a/user_guide_src/source/libraries/validation/006.php b/user_guide_src/source/libraries/validation/006.php index 5f7cbf645ab2..bd4dbf10c787 100644 --- a/user_guide_src/source/libraries/validation/006.php +++ b/user_guide_src/source/libraries/validation/006.php @@ -1,11 +1,11 @@ setRules([ - 'username' => 'required', - 'password' => 'required|min_length[10]', + 'username' => 'required|max_length[30]', + 'password' => 'required|max_length[255]|min_length[10]', ]); // or $validation->setRules([ - 'username' => 'required', - 'password' => ['required', 'min_length[10]'], + 'username' => ['required', 'max_length[30]'], + 'password' => ['required', 'max_length[255]', 'min_length[10]'], ]); diff --git a/user_guide_src/source/libraries/validation/007.php b/user_guide_src/source/libraries/validation/007.php index cb12c5a61a79..b5f23c355a5c 100644 --- a/user_guide_src/source/libraries/validation/007.php +++ b/user_guide_src/source/libraries/validation/007.php @@ -1,11 +1,11 @@ setRules([ - 'username' => ['label' => 'Username', 'rules' => 'required'], - 'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'], + 'username' => ['label' => 'Username', 'rules' => 'required|max_length[30]'], + 'password' => ['label' => 'Password', 'rules' => 'required|max_length[255]|min_length[10]'], ]); // or $validation->setRules([ - 'username' => ['label' => 'Username', 'rules' => 'required'], - 'password' => ['label' => 'Password', 'rules' => ['required', 'min_length[10]']], + 'username' => ['label' => 'Username', 'rules' => 'required|max_length[30]'], + 'password' => ['label' => 'Password', 'rules' => ['required', '|max_length[255]', 'min_length[10]']], ]); diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php index 58f0749a0c5d..7e321e9664ff 100644 --- a/user_guide_src/source/libraries/validation/009.php +++ b/user_guide_src/source/libraries/validation/009.php @@ -19,10 +19,10 @@ // Joe Smith $validation->setRules([ - 'contacts.name' => 'required', + 'contacts.name' => 'required|max_length[60]', ]); // Fred Flintsone & Wilma $validation->setRules([ - 'contacts.friends.name' => 'required', + 'contacts.friends.name' => 'required|max_length[60]', ]); diff --git a/user_guide_src/source/libraries/validation/010.php b/user_guide_src/source/libraries/validation/010.php index 94c6919311d5..0951f582c882 100644 --- a/user_guide_src/source/libraries/validation/010.php +++ b/user_guide_src/source/libraries/validation/010.php @@ -2,5 +2,5 @@ // Fred Flintsone & Wilma $validation->setRules([ - 'contacts.*.name' => 'required', + 'contacts.*.name' => 'required|max_length[60]', ]); diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php index 2754c41ac933..9b5e03eb4948 100644 --- a/user_guide_src/source/libraries/validation/011.php +++ b/user_guide_src/source/libraries/validation/011.php @@ -13,5 +13,5 @@ // Rule $validation->setRules([ - 'user_ids.*' => 'required', + 'user_ids.*' => 'required|max_length[19]', ]); diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php index 671b5386fe98..383eb8153574 100644 --- a/user_guide_src/source/libraries/validation/013.php +++ b/user_guide_src/source/libraries/validation/013.php @@ -5,10 +5,10 @@ class Validation { public $signup = [ - 'username' => 'required', - 'password' => 'required', - 'pass_confirm' => 'required|matches[password]', - 'email' => 'required|valid_email', + 'username' => 'required|max_length[30]', + 'password' => 'required|max_length[255]', + 'pass_confirm' => 'required|max_length[255]|matches[password]', + 'email' => 'required|max_length[254]|valid_email', ]; // ... diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php index 5815abfaccf4..91f9ac1c1c31 100644 --- a/user_guide_src/source/libraries/validation/015.php +++ b/user_guide_src/source/libraries/validation/015.php @@ -5,10 +5,10 @@ class Validation { public $signup = [ - 'username' => 'required', - 'password' => 'required', - 'pass_confirm' => 'required|matches[password]', - 'email' => 'required|valid_email', + 'username' => 'required|max_length[30]', + 'password' => 'required|max_length[255]', + 'pass_confirm' => 'required|max_length[255]|matches[password]', + 'email' => 'required|max_length[254]|valid_email', ]; public $signup_errors = [ diff --git a/user_guide_src/source/libraries/validation/016.php b/user_guide_src/source/libraries/validation/016.php index 5b08e73980a8..c11237a9cf09 100644 --- a/user_guide_src/source/libraries/validation/016.php +++ b/user_guide_src/source/libraries/validation/016.php @@ -6,13 +6,13 @@ class Validation { public $signup = [ 'username' => [ - 'rules' => 'required', + 'rules' => 'required|max_length[30]', 'errors' => [ 'required' => 'You must choose a Username.', ], ], 'email' => [ - 'rules' => 'required|valid_email', + 'rules' => 'required|max_length[254]|valid_email', 'errors' => [ 'valid_email' => 'Please check the Email field. It does not appear to be valid.', ], diff --git a/user_guide_src/source/libraries/validation/020.php b/user_guide_src/source/libraries/validation/020.php index 67fdb567eda3..792b7ba6bbe9 100644 --- a/user_guide_src/source/libraries/validation/020.php +++ b/user_guide_src/source/libraries/validation/020.php @@ -1,6 +1,6 @@ setRules([ - 'id' => 'is_natural_no_zero', - 'email' => 'required|valid_email|is_unique[users.email,id,{id}]', + 'id' => 'max_length[19]|is_natural_no_zero', + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]', ]); diff --git a/user_guide_src/source/libraries/validation/022.php b/user_guide_src/source/libraries/validation/022.php index 001c0f0d76a7..f3dda9e966df 100644 --- a/user_guide_src/source/libraries/validation/022.php +++ b/user_guide_src/source/libraries/validation/022.php @@ -1,6 +1,6 @@ setRules([ - 'id' => 'is_natural_no_zero', - 'email' => 'required|valid_email|is_unique[users.email,id,4]', + 'id' => 'max_length[19]|is_natural_no_zero', + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,4]', ]); diff --git a/user_guide_src/source/libraries/validation/023.php b/user_guide_src/source/libraries/validation/023.php index f9ba86d1f60c..85fd02e5b8c7 100644 --- a/user_guide_src/source/libraries/validation/023.php +++ b/user_guide_src/source/libraries/validation/023.php @@ -2,8 +2,8 @@ $validation->setRules( [ - 'username' => 'required|is_unique[users.username]', - 'password' => 'required|min_length[10]', + 'username' => 'required|max_length[30]|is_unique[users.username]', + 'password' => 'required|max_length[254]|min_length[10]', ], [ // Errors 'username' => [ diff --git a/user_guide_src/source/libraries/validation/024.php b/user_guide_src/source/libraries/validation/024.php index 17f053ee41a4..a8fb8151d6d4 100644 --- a/user_guide_src/source/libraries/validation/024.php +++ b/user_guide_src/source/libraries/validation/024.php @@ -3,14 +3,14 @@ $validation->setRules([ 'username' => [ 'label' => 'Username', - 'rules' => 'required|is_unique[users.username]', + 'rules' => 'required|max_length[30]|is_unique[users.username]', 'errors' => [ 'required' => 'All accounts must have {field} provided', ], ], 'password' => [ 'label' => 'Password', - 'rules' => 'required|min_length[10]', + 'rules' => 'required|max_length[255]|min_length[10]', 'errors' => [ 'min_length' => 'Your {field} is too short. You want to get hacked?', ], diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php index 6e2f1e40843b..60f53893edce 100644 --- a/user_guide_src/source/libraries/validation/025.php +++ b/user_guide_src/source/libraries/validation/025.php @@ -3,14 +3,14 @@ $validation->setRules([ 'username' => [ 'label' => 'Rules.username', - 'rules' => 'required|is_unique[users.username]', + 'rules' => 'required|max_length[30]|is_unique[users.username]', 'errors' => [ 'required' => 'Rules.username.required', ], ], 'password' => [ 'label' => 'Rules.password', - 'rules' => 'required|min_length[10]', + 'rules' => 'required|max_length[255]|min_length[10]', 'errors' => [ 'min_length' => 'Rules.password.min_length', ], diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php index 2cc83471edfd..66919dadf4a9 100644 --- a/user_guide_src/source/libraries/validation/036.php +++ b/user_guide_src/source/libraries/validation/036.php @@ -1,5 +1,5 @@ setRules([ - 'foo' => 'required|even', + 'foo' => 'required|max_length[19]|even', ]); diff --git a/user_guide_src/source/libraries/validation/038.php b/user_guide_src/source/libraries/validation/038.php index f4ec3371527f..538a7f724dd3 100644 --- a/user_guide_src/source/libraries/validation/038.php +++ b/user_guide_src/source/libraries/validation/038.php @@ -3,10 +3,10 @@ // is_unique[table.field,ignore_field,ignore_value] $validation->setRules([ - 'name' => "is_unique[supplier.name,uuid, {$uuid}]", // is not ok - 'name' => "is_unique[supplier.name,uuid,{$uuid} ]", // is not ok - 'name' => "is_unique[supplier.name,uuid,{$uuid}]", // is ok - 'name' => 'is_unique[supplier.name,uuid,{uuid}]', // is ok - see "Validation Placeholders" + 'name' => "max_length[30]|is_unique[supplier.name,uuid, {$uuid}]", // is not ok + 'name' => "max_length[30]|is_unique[supplier.name,uuid,{$uuid} ]", // is not ok + 'name' => "max_length[30]|is_unique[supplier.name,uuid,{$uuid}]", // is ok + 'name' => 'max_length[30]|is_unique[supplier.name,uuid,{uuid}]', // is ok - see "Validation Placeholders" ]); // Warning: If `$uuid` is a user input, be sure to validate the format of the value before using it. // Otherwise, it is vulnerable. From 9cefb0ed624e0fbd74cc526dd2fdf9bb46a0569f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 11:58:23 +0900 Subject: [PATCH 4144/8282] docs: improve upgrade instruction for validation placeholder --- .../source/installation/upgrade_435.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_435.rst b/user_guide_src/source/installation/upgrade_435.rst index 06d055a03fa4..347bb035befc 100644 --- a/user_guide_src/source/installation/upgrade_435.rst +++ b/user_guide_src/source/installation/upgrade_435.rst @@ -18,7 +18,20 @@ Breaking Changes Validation Placeholders ======================= -- To use :ref:`validation-placeholders` securely, please remember to create a validation rule for the field you will use as a placeholder. +To use :ref:`validation-placeholders` securely, please remember to create a validation rule for the field you will use as a placeholder. + +E.g., if you have the following code:: + + $validation->setRules([ + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]', + ]); + +You need to add the rules for ``{id}``:: + + $validation->setRules([ + 'id' => 'max_length[19]|is_natural_no_zero', // Add this + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]', + ]); Session::stop() =============== From c875d33631a5549f04a68137207a352dacfec199 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 14:09:42 +0900 Subject: [PATCH 4145/8282] docs: improve descriptions in Factories --- user_guide_src/source/concepts/factories.rst | 28 +++++++++---------- .../source/concepts/factories/002.php | 2 ++ .../source/general/common_functions.rst | 2 +- user_guide_src/source/general/modules.rst | 4 +-- user_guide_src/source/models/model.rst | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index c09134a47b54..c043bb6428b0 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -4,7 +4,7 @@ Factories .. contents:: :local: - :depth: 2 + :depth: 3 Introduction ************ @@ -41,17 +41,14 @@ On the other hand, Services have code to create instances, so it can create a co that needs other services or class instances. When you get a service, Services require a service name, not a class name, so the returned instance can be changed without changing the client code. +.. _factories-loading-class: + Loading Classes *************** Loading a Class =============== -.. _factories-example: - -Model Example -------------- - Take a look at **Models** as an example. You can access the Factory specific to Models by using the magic static method of the Factories class, ``Factories::models()``. @@ -64,7 +61,17 @@ In the following code, if you have ``App\Models\UserModel``, the instance will b .. literalinclude:: factories/001.php -Or you could also request a specific class: +If you don't have ``App\Models\UserModel``, it searches for ``Models\UserModel`` in all namespaces. + +Next time you ask for the same class anywhere in your code, Factories will be sure +you get back the instance as before: + +.. literalinclude:: factories/003.php + +preferApp option +---------------- + +You could also request a specific class: .. literalinclude:: factories/002.php :lines: 2- @@ -78,13 +85,6 @@ If you want to get ``Blog\Models\UserModel``, you need to disable the option ``p .. literalinclude:: factories/010.php :lines: 2- -See :ref:`factories-options` for the details. - -Next time you ask for the same class anywhere in your code, Factories will be sure -you get back the instance as before: - -.. literalinclude:: factories/003.php - Loading a Class in Sub-directories ================================== diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php index 6a56bbe7a374..6de5996e74af 100644 --- a/user_guide_src/source/concepts/factories/002.php +++ b/user_guide_src/source/concepts/factories/002.php @@ -1,3 +1,5 @@ `. diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 2298c32a986f..5bfbdf7b75d7 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -194,7 +194,7 @@ Config files are automatically discovered whenever using the ``config()`` functi .. note:: ``config()`` finds the file in **app/Config/** when there is a class with the same shortname, even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``. - This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`Factories Example ` for more information. + This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. Migrations ========== @@ -250,7 +250,7 @@ Model files are automatically discovered whenever using the :php:func:`model()` .. note:: ``model()`` finds the file in **app/Models/** when there is a class with the same shortname, even if you specify a fully qualified class name like ``model(\Acme\Blog\Model\PostModel::class)``. - This is because ``model()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`Factories Example ` for more information. + This is because ``model()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. Views ===== diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 06f7d84f26f2..6fe16326cdd1 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -29,7 +29,7 @@ You can access models within your classes by creating a new instance or using th .. literalinclude:: model/001.php The ``model()`` uses ``Factories::models()`` internally. -See :ref:`factories-example` for details on the first parameter. +See :ref:`factories-loading-class` for details on the first parameter. CodeIgniter's Model ******************* From 1a1d6180eb889afee30cc06d2d1112aac36324bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 14:14:51 +0900 Subject: [PATCH 4146/8282] docs: add section titles and note --- .../source/general/configuration.rst | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index e9a1a7df2cad..a223ad901cb0 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -18,19 +18,24 @@ the application configuration files in the **app/Config** folder. Working with Configuration Files ******************************** +Getting a Config Object +======================= + You can access configuration files for your classes in several different ways. -- By using the ``new`` keyword to create an instance: +new keyword +----------- - .. literalinclude:: configuration/001.php +By using the ``new`` keyword to create an instance: -- By using the ``config()`` function: +.. literalinclude:: configuration/001.php - .. literalinclude:: configuration/002.php +config() +-------- -All configuration object properties are public, so you access the settings like any other property: +By using the ``config()`` function: -.. literalinclude:: configuration/003.php +.. literalinclude:: configuration/002.php If no namespace is provided, it will look for the file in all defined namespaces as well as **app/Config/**. @@ -39,10 +44,16 @@ All of the configuration files that ship with CodeIgniter are namespaced with ``Config``. Using this namespace in your application will provide the best performance since it knows exactly where to find the files. -You can put configuration files in any folder you want by using a different namespace. -This allows you to put configuration files on the production server in a folder -that is not web-accessible while keeping it under **/app** for easy access -during development. +.. note:: ``config()`` finds the file in **app/Config/** when there is a class with the same shortname, + even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``. + This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. + +Getting a Config Property +========================= + +All configuration object properties are public, so you access the settings like any other property: + +.. literalinclude:: configuration/003.php Creating Configuration Files **************************** @@ -52,6 +63,11 @@ The default file location (recommended for most cases) is **app/Config**. The class should use the appropriate namespace, and it should extend ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings. +You can put configuration files in any folder you want by using a different namespace. +This allows you to put configuration files on the production server in a folder +that is not web-accessible while keeping it under **/app** for easy access +during development. + Define the class and fill it with public properties that represent your settings: .. literalinclude:: configuration/004.php From 87864bd72b7f04639c324faedfb5d2aaf66e8c16 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 14:24:14 +0900 Subject: [PATCH 4147/8282] docs: remove unneeded description All source files should be in not web-accessible directories. --- user_guide_src/source/general/configuration.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index a223ad901cb0..9ec7be2c757f 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -60,13 +60,11 @@ Creating Configuration Files When you need a new configuration, first you create a new file at your desired location. The default file location (recommended for most cases) is **app/Config**. -The class should use the appropriate namespace, and it should extend -``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings. You can put configuration files in any folder you want by using a different namespace. -This allows you to put configuration files on the production server in a folder -that is not web-accessible while keeping it under **/app** for easy access -during development. + +The class should use the appropriate namespace, and it should extend +``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings. Define the class and fill it with public properties that represent your settings: From 9084605b2e62d8c54436b4828c28e32706c30da1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 14:30:45 +0900 Subject: [PATCH 4148/8282] docs: add explanation --- user_guide_src/source/general/configuration.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 9ec7be2c757f..5d4c4a5e8737 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -37,8 +37,9 @@ By using the ``config()`` function: .. literalinclude:: configuration/002.php -If no namespace is provided, it will look for the file in all defined namespaces -as well as **app/Config/**. +If no namespace is provided, it will look for the file in the **app/Config** +folder first, and if not found, look for in the **Config** folder in all defined +namespaces. All of the configuration files that ship with CodeIgniter are namespaced with ``Config``. Using this namespace in your application will provide the best @@ -61,7 +62,7 @@ Creating Configuration Files When you need a new configuration, first you create a new file at your desired location. The default file location (recommended for most cases) is **app/Config**. -You can put configuration files in any folder you want by using a different namespace. +You can put configuration files in any **Config** folder by using a different namespace. The class should use the appropriate namespace, and it should extend ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings. From 78ff86fafb7fceba30340d4af7d95e4ef48df23e Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 6 Jul 2023 19:07:07 +0800 Subject: [PATCH 4149/8282] refactor: simplify code of `FileHandler::getItem()` --- phpstan-baseline.neon.dist | 10 ---- system/Cache/Handlers/FileHandler.php | 56 +++++++++---------- .../system/Cache/Handlers/FileHandlerTest.php | 17 +++++- 3 files changed, 39 insertions(+), 44 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index c3eaed7ade31..892f28ffa1c6 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -10,16 +10,6 @@ parameters: count: 1 path: system/Autoloader/Autoloader.php - - - message: "#^Comparison operation \"\\>\" between int and \\(array\\|float\\|int\\) results in an error\\.$#" - count: 1 - path: system/Cache/Handlers/FileHandler.php - - - - message: "#^If condition is always true\\.$#" - count: 1 - path: system/Cache/Handlers/FileHandler.php - - message: "#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$redis \\(Redis\\) in isset\\(\\) is not nullable\\.$#" count: 1 diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php index c217c7edde8e..9d1179feb82a 100644 --- a/system/Cache/Handlers/FileHandler.php +++ b/system/Cache/Handlers/FileHandler.php @@ -144,21 +144,22 @@ public function deleteMatching(string $pattern) */ public function increment(string $key, int $offset = 1) { - $key = static::validateKey($key, $this->prefix); - $data = $this->getItem($key); + $key = static::validateKey($key, $this->prefix); + $tmp = $this->getItem($key); - if ($data === false) { - $data = [ - 'data' => 0, - 'ttl' => 60, - ]; - } elseif (! is_int($data['data'])) { + if ($tmp === false) { + $tmp = ['data' => 0, 'ttl' => 60]; + } + + ['data' => $value, 'ttl' => $ttl] = $tmp; + + if (! is_int($value)) { return false; } - $newValue = $data['data'] + $offset; + $value += $offset; - return $this->save($key, $newValue, $data['ttl']) ? $newValue : false; + return $this->save($key, $value, $ttl) ? $value : false; } /** @@ -166,21 +167,7 @@ public function increment(string $key, int $offset = 1) */ public function decrement(string $key, int $offset = 1) { - $key = static::validateKey($key, $this->prefix); - $data = $this->getItem($key); - - if ($data === false) { - $data = [ - 'data' => 0, - 'ttl' => 60, - ]; - } elseif (! is_int($data['data'])) { - return false; - } - - $newValue = $data['data'] - $offset; - - return $this->save($key, $newValue, $data['ttl']) ? $newValue : false; + return $this->increment($key, -$offset); } /** @@ -229,7 +216,8 @@ public function isSupported(): bool * Does the heavy lifting of actually retrieving the file and * verifying it's age. * - * @return array|bool|float|int|object|string|null + * @return array|false + * @phpstan-return array{data: mixed, ttl: int, time: int}|false */ protected function getItem(string $filename) { @@ -238,15 +226,21 @@ protected function getItem(string $filename) } $data = @unserialize(file_get_contents($this->path . $filename)); - if (! is_array($data) || ! isset($data['ttl'])) { + + if (! is_array($data)) { + return false; + } + + if (! isset($data['ttl']) || ! is_int($data['ttl'])) { + return false; + } + + if (! isset($data['time']) || ! is_int($data['time'])) { return false; } if ($data['ttl'] > 0 && Time::now()->getTimestamp() > $data['time'] + $data['ttl']) { - // If the file is still there then try to remove it - if (is_file($this->path . $filename)) { - @unlink($this->path . $filename); - } + @unlink($this->path . $filename); return false; } diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index dde4ca86e13d..4f354495c81a 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -78,6 +78,11 @@ public function testNew() $this->assertInstanceOf(FileHandler::class, $this->handler); } + /** + * chmod('path', 0444) does not work on Windows + * + * @requires OS Linux|Darwin + */ public function testNewWithNonWritablePath() { $this->expectException(CacheException::class); @@ -132,6 +137,11 @@ public function testRemember() $this->assertNull($this->handler->get(self::$key1)); } + /** + * chmod('path', 0444) does not work on Windows + * + * @requires OS Linux|Darwin + */ public function testSave() { $this->assertTrue($this->handler->save(self::$key1, 'value')); @@ -265,10 +275,11 @@ public function testIsSupported() /** * @dataProvider modeProvider * - * @param mixed $int - * @param mixed $string + * permissions given on Windows are fixed to `0666` + * + * @requires OS Linux|Darwin */ - public function testSaveMode($int, $string) + public function testSaveMode(int $int, string $string): void { // Initialize mode $config = new Cache(); From 47990ba74b664bfbcd4748e958215934f13fffa2 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 7 Jul 2023 16:21:03 +0700 Subject: [PATCH 4150/8282] [Rector] Refactor UnderscoreToCamelCaseVariableNameRector as removed findParentByType() --- .../UnderscoreToCamelCaseVariableNameRector.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php index 054eb75a2800..31834cfc4e88 100644 --- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -113,13 +113,16 @@ public function refactor(Node $node): ?Node private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void { - $parentClassMethodOrFunction = $this->betterNodeFinder->findParentByTypes($variable, [ClassMethod::class, Function_::class]); + $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, ClassMethod::class); - if ($parentClassMethodOrFunction === null) { - return; + if ($parentFunctionLike === null) { + $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, Function_::class); + if ($parentFunctionLike === null) { + return; + } } - $docComment = $parentClassMethodOrFunction->getDocComment(); + $docComment = $parentFunctionLike->getDocComment(); if ($docComment === null) { return; } @@ -133,7 +136,7 @@ private function updateDocblock(Variable $variable, string $variableName, string return; } - $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentClassMethodOrFunction); + $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentFunctionLike); $paramTagValueNodes = $phpDocInfo->getParamTagValueNodes(); foreach ($paramTagValueNodes as $paramTagValueNode) { @@ -143,6 +146,6 @@ private function updateDocblock(Variable $variable, string $variableName, string } } - $parentClassMethodOrFunction->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString())); + $parentFunctionLike->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString())); } } From bc408a538a182a867b842ffde7b5aebadbb17e11 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 07:55:45 +0900 Subject: [PATCH 4151/8282] docs: make option values stand out --- user_guide_src/source/general/common_functions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 5d41dde21fab..896c607d9822 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -79,7 +79,7 @@ Service Accessors If $data is a string, then it simply escapes and returns it. If $data is an array, then it loops over it, escaping each 'value' of the key/value pairs. - Valid context values: html, js, css, url, attr, raw + Valid context values: ``html``, ``js``, ``css``, ``url``, ``attr``, ``raw`` .. php:function:: helper($filename) From 36e40508515177a7ee7adddcf6556071cee8c6cd Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 07:56:42 +0900 Subject: [PATCH 4152/8282] docs: make comment on one line --- user_guide_src/source/general/common_functions/002.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide_src/source/general/common_functions/002.php b/user_guide_src/source/general/common_functions/002.php index 1ade75d94317..f00b1f816398 100644 --- a/user_guide_src/source/general/common_functions/002.php +++ b/user_guide_src/source/general/common_functions/002.php @@ -2,8 +2,7 @@ // in controller, checking form submittal if (! $model->save($user)) { - // 'withInput' is what specifies "old data" - // should be saved. + // 'withInput()' is what specifies "old data" should be saved. return redirect()->back()->withInput(); } From 6f2969d2484e282066d325f4a17e06adc218fffd Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 07:57:28 +0900 Subject: [PATCH 4153/8282] docs: fix types in reference --- user_guide_src/source/general/common_functions.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 896c607d9822..c8f17f09746c 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -117,10 +117,10 @@ Service Accessors .. php:function:: old($key[, $default = null,[, $escape = 'html']]) :param string $key: The name of the old form data to check for. - :param mixed $default: The default value to return if $key doesn't exist. - :param mixed $escape: An `escape <#esc>`_ context or false to disable it. + :param string|null $default: The default value to return if $key doesn't exist. + :param false|string $escape: An `escape <#esc>`_ context or false to disable it. :returns: The value of the defined key, or the default value. - :rtype: mixed + :rtype: array|string|null Provides a simple way to access "old input data" from submitting a form. From d8aef2c95d6a77044cb7a8f2daa81636b491b6ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 07:57:53 +0900 Subject: [PATCH 4154/8282] docs: make description more precise --- user_guide_src/source/general/common_functions.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index c8f17f09746c..cd93382c8fd7 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -128,8 +128,10 @@ Service Accessors .. literalinclude:: common_functions/002.php -.. note:: If you are using the :doc:`form helper `, this feature is built-in. You only - need to use this function when not using the form helper. +.. note:: If you are using the :php:func:`set_value()`, :php:func:`set_select()`, + :php:func:`set_checkbox()`, and :php:func:`set_radio()` functions in + :doc:`form helper `, this feature is built-in. You only + need to use this function when not using the form helper. .. php:function:: session([$key]) From ca4a6ba2888b2c4926457f036ad8bfead82cc3a9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 08:13:25 +0900 Subject: [PATCH 4155/8282] docs: fix incorrect sample code The length of a UUID is 128 bits. That is 32 chars, but typically expressed with a structure of 8-4-4-4-12 separated by hyphens. Co-authored-by: Michal Sniatala --- user_guide_src/source/libraries/validation/038.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/validation/038.php b/user_guide_src/source/libraries/validation/038.php index 538a7f724dd3..1330267ebfce 100644 --- a/user_guide_src/source/libraries/validation/038.php +++ b/user_guide_src/source/libraries/validation/038.php @@ -3,10 +3,10 @@ // is_unique[table.field,ignore_field,ignore_value] $validation->setRules([ - 'name' => "max_length[30]|is_unique[supplier.name,uuid, {$uuid}]", // is not ok - 'name' => "max_length[30]|is_unique[supplier.name,uuid,{$uuid} ]", // is not ok - 'name' => "max_length[30]|is_unique[supplier.name,uuid,{$uuid}]", // is ok - 'name' => 'max_length[30]|is_unique[supplier.name,uuid,{uuid}]', // is ok - see "Validation Placeholders" + 'name' => "max_length[36]|is_unique[supplier.name,uuid, {$uuid}]", // is not ok + 'name' => "max_length[36]|is_unique[supplier.name,uuid,{$uuid} ]", // is not ok + 'name' => "max_length[36]|is_unique[supplier.name,uuid,{$uuid}]", // is ok + 'name' => 'max_length[36]|is_unique[supplier.name,uuid,{uuid}]', // is ok - see "Validation Placeholders" ]); // Warning: If `$uuid` is a user input, be sure to validate the format of the value before using it. // Otherwise, it is vulnerable. From b81d4c378e4815c0d817c80a004010804d35475e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 09:15:29 +0900 Subject: [PATCH 4156/8282] docs: fix heading marks --- user_guide_src/source/general/modules.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 5bfbdf7b75d7..adc98e5e178a 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -11,9 +11,9 @@ language files, etc. Modules may contain as few, or as many, of these as you lik :local: :depth: 2 -========== +********** Namespaces -========== +********** The core element of the modules functionality comes from the :doc:`PSR-4 compatible autoloading <../concepts/autoloader>` that CodeIgniter uses. While any code can use the PSR-4 autoloader and namespaces, the primary way to take full advantage of @@ -58,9 +58,9 @@ Of course, there is nothing forcing you to use this exact structure, and you sho best suits your module, leaving out directories you don't need, creating new directories for Entities, Interfaces, or Repositories, etc. -=========================== +*************************** Autoloading Non-class Files -=========================== +*************************** More often than not that your module will not contain only PHP classes but also others like procedural functions, bootstrapping files, module constants files, etc. which are not normally loaded the way classes @@ -73,9 +73,9 @@ your classes. All we need to do is provide the list of paths to those files and .. literalinclude:: modules/002.php -============== +************** Auto-Discovery -============== +************** Many times, you will need to specify the full namespace to files you want to include, but CodeIgniter can be configured to make integrating modules into your applications simpler by automatically discovering many different @@ -134,9 +134,9 @@ by editing the ``$discoverInComposer`` variable in **app/Config/Modules.php**: .. literalinclude:: modules/004.php -================== +****************** Working with Files -================== +****************** This section will take a look at each of the file types (controllers, views, language files, etc) and how they can be used within the module. Some of this information is described in more detail in the relevant location of the user From 5e6f96ae9b4ee57f748aa949da00a0c19734249a Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 09:20:15 +0900 Subject: [PATCH 4157/8282] docs: improve references --- user_guide_src/source/general/configuration.rst | 2 +- user_guide_src/source/general/modules.rst | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 5d4c4a5e8737..2b3ee93427f6 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -288,7 +288,7 @@ There are two ways to implement a Registrar: implicit and explicit. Implicit Registrars =================== -Any namespace may define registrars by using the **Config/Registrar.php** file, if discovery +Any namespace may define registrars by using the **Config/Registrar.php** file, if :ref:`auto-discovery` is enabled in :doc:`Modules `. These files are classes whose methods are named for each configuration class you wish to extend. For example, a third-party module might wish to supply an additional template to ``Pager`` without overwriting whatever a develop has diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index adc98e5e178a..fe55de3423ce 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -73,6 +73,8 @@ your classes. All we need to do is provide the list of paths to those files and .. literalinclude:: modules/002.php +.. _auto-discovery: + ************** Auto-Discovery ************** @@ -83,7 +85,7 @@ file types, including: - :doc:`Events <../extending/events>` - :doc:`Filters <../incoming/filters>` -- :doc:`Registrars <./configuration>` +- :ref:`registrars` - :doc:`Route files <../incoming/routing>` - :doc:`Services <../concepts/services>` From b0db781e55ecbcdcccbf33621d4a84640a8ae6e7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 09:26:14 +0900 Subject: [PATCH 4158/8282] docs: remove leading `/` in example path --- user_guide_src/source/general/modules.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index fe55de3423ce..6fa8c1735698 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -93,7 +93,7 @@ This is configured in the file **app/Config/Modules.php**. The auto-discovery system works by scanning for particular directories and files within psr4 namespaces that have been defined in **Config/Autoload.php**. -The discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**. +The discovery process would look for discoverable items on that path and should, for example, find the routes file at **acme/Blog/Config/Routes.php**. Enable/Disable Discover ======================= From 9d19dd6dfcd716715cbcb5446c03253d3d6e3290 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 6 Jul 2023 09:32:16 +0900 Subject: [PATCH 4159/8282] docs: add about Composer packages --- user_guide_src/source/general/modules.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 6fa8c1735698..ec3773958998 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -91,7 +91,7 @@ file types, including: This is configured in the file **app/Config/Modules.php**. -The auto-discovery system works by scanning for particular directories and files within psr4 namespaces that have been defined in **Config/Autoload.php**. +The auto-discovery system works by scanning for particular directories and files within psr4 namespaces that have been defined in **Config/Autoload.php** and Composer packages. The discovery process would look for discoverable items on that path and should, for example, find the routes file at **acme/Blog/Config/Routes.php**. @@ -99,7 +99,7 @@ Enable/Disable Discover ======================= You can turn on or off all auto-discovery in the system with the ``$enabled`` class variable. False will disable -all discovery, optimizing performance, but negating the special capabilities of your modules. +all discovery, optimizing performance, but negating the special capabilities of your modules and Composer packages. Specify Discovery Items ======================= From fdc7bd53c9635258a13657a72c3a29e0e3545999 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 12:59:12 +0900 Subject: [PATCH 4160/8282] docs: improve description --- user_guide_src/source/general/configuration.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 2b3ee93427f6..7c107cfd5b92 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -281,6 +281,7 @@ Registrars "Registrars" are any other classes which might provide additional configuration properties. Registrars provide a means of altering a configuration at runtime across namespaces and files. + There are two ways to implement a Registrar: implicit and explicit. .. note:: Values from **.env** always take priority over Registrars. @@ -290,8 +291,10 @@ Implicit Registrars Any namespace may define registrars by using the **Config/Registrar.php** file, if :ref:`auto-discovery` is enabled in :doc:`Modules `. These files are classes whose methods are -named for each configuration class you wish to extend. For example, a third-party module might -wish to supply an additional template to ``Pager`` without overwriting whatever a develop has +named for each configuration class you wish to extend. + +For example, a third-party module or Composer package might +wish to supply an additional template to ``Config\Pager`` without overwriting whatever a developer has already configured. In **src/Config/Registrar.php** there would be a ``Registrar`` class with the single ``Pager()`` method (note the case-sensitivity): From 5fec4b6007e4d217182cd982b7d325ba986cae96 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 12:59:30 +0900 Subject: [PATCH 4161/8282] docs: improve sample code --- user_guide_src/source/general/configuration/007.php | 2 ++ user_guide_src/source/general/configuration/008.php | 2 ++ user_guide_src/source/general/configuration/009.php | 4 ++-- user_guide_src/source/general/configuration/010.php | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/configuration/007.php b/user_guide_src/source/general/configuration/007.php index 3a77c1ca5aa6..5298a99b1367 100644 --- a/user_guide_src/source/general/configuration/007.php +++ b/user_guide_src/source/general/configuration/007.php @@ -1,5 +1,7 @@ 45, From 3295b205bde84c12489beefc637a7dd69097e8da Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 13:06:16 +0900 Subject: [PATCH 4162/8282] docs: improve description Registrars work only if Auto-Discovery is enabled. --- user_guide_src/source/general/configuration.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 7c107cfd5b92..cc524e43ca39 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -282,15 +282,16 @@ Registrars "Registrars" are any other classes which might provide additional configuration properties. Registrars provide a means of altering a configuration at runtime across namespaces and files. -There are two ways to implement a Registrar: implicit and explicit. +Registrars work if :ref:`auto-discovery` is enabled in :doc:`Modules `. +There are two ways to implement a Registrar: **implicit** and **explicit**. .. note:: Values from **.env** always take priority over Registrars. Implicit Registrars =================== -Any namespace may define registrars by using the **Config/Registrar.php** file, if :ref:`auto-discovery` -is enabled in :doc:`Modules `. These files are classes whose methods are +Any namespace may define registrars by using the **Config/Registrar.php** file. +These files are classes whose methods are named for each configuration class you wish to extend. For example, a third-party module or Composer package might From cd52324f94e4ce84371639a88d51d577d0edb8f1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 7 Jul 2023 13:15:22 +0900 Subject: [PATCH 4163/8282] docs: add explanation --- user_guide_src/source/general/configuration.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index cc524e43ca39..50f67dc1c82c 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -283,6 +283,8 @@ Registrars Registrars provide a means of altering a configuration at runtime across namespaces and files. Registrars work if :ref:`auto-discovery` is enabled in :doc:`Modules `. +It alters configuration properties when the Config object is instantiated. + There are two ways to implement a Registrar: **implicit** and **explicit**. .. note:: Values from **.env** always take priority over Registrars. From 92d10b28ddebec42ecfdc6e284e9b3fd94ddd26e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 08:25:22 +0900 Subject: [PATCH 4164/8282] docs: clarify what two registrars can do --- user_guide_src/source/general/configuration.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 50f67dc1c82c..27a64b435913 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -292,9 +292,11 @@ There are two ways to implement a Registrar: **implicit** and **explicit**. Implicit Registrars =================== -Any namespace may define registrars by using the **Config/Registrar.php** file. -These files are classes whose methods are -named for each configuration class you wish to extend. +Implicit Registrars can change any Config class properties. + +Any namespace may define implicit registrars by using the **Config/Registrar.php** +file. These files are classes whose methods are named for each configuration class +you wish to extend. For example, a third-party module or Composer package might wish to supply an additional template to ``Config\Pager`` without overwriting whatever a developer has @@ -310,6 +312,9 @@ overwrite priority. Explicit Registrars =================== +Explicit Registrars can only change the Config class properties in which they are +registered. + A configuration file can also specify any number of registrars explicitly. This is done by adding a ``$registrars`` property to your configuration file, holding an array of the names of candidate registrars: From c79698fce9b0264aecc31191a860a4169c842be4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 22:06:02 +0900 Subject: [PATCH 4165/8282] docs: add config() in Global Functions --- user_guide_src/source/concepts/factories.rst | 4 +++- .../source/general/common_functions.rst | 15 +++++++++++++++ user_guide_src/source/general/configuration.rst | 4 +++- user_guide_src/source/general/modules.rst | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index c043bb6428b0..b3ec0a064176 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -99,10 +99,12 @@ Convenience Functions Two shortcut functions for Factories have been provided. These functions are always available. +.. _factories-config: + config() ======== -The first is ``config()`` which returns a new instance of a Config class. The only required parameter is the class name: +The first is :php:func:`config()` which returns a new instance of a Config class. The only required parameter is the class name: .. literalinclude:: factories/008.php diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 6a823bd46ec1..9430ae11a12b 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -30,6 +30,21 @@ Service Accessors .. literalinclude:: common_functions/001.php +.. php:function:: config(string $name[, bool $getShared = true]) + + :param string $name: The config classname. + :param bool $getShared: Whether to return a shared instance. + :returns: The config instances. + :rtype: object|null + + More simple way of getting config instances from Factories. + + See :ref:`Configuration ` and + :ref:`Factories ` for details. + + The ``config()`` uses ``Factories::config()`` internally. + See :ref:`factories-loading-class` for details on the first parameter ``$name``. + .. php:function:: cookie(string $name[, string $value = ''[, array $options = []]]) :param string $name: Cookie name diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 5d4c4a5e8737..a8aa34da90df 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -30,10 +30,12 @@ By using the ``new`` keyword to create an instance: .. literalinclude:: configuration/001.php +.. _configuration-config: + config() -------- -By using the ``config()`` function: +By using the :php:func:`config()` function: .. literalinclude:: configuration/002.php diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 5bfbdf7b75d7..a608a7806ec8 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -187,7 +187,7 @@ with the ``new`` command: .. literalinclude:: modules/008.php -Config files are automatically discovered whenever using the ``config()`` function that is always available. +Config files are automatically discovered whenever using the :php:func:`config()` function that is always available. .. note:: We don't recommend you use the same short classname in modules. Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`. From a8a53e70cd9715054205ba44ece8acf44c1808ca Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:32:19 +0900 Subject: [PATCH 4166/8282] docs: change TOC depth to 3 --- user_guide_src/source/models/model.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 6fe16326cdd1..accd3dc35f90 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -4,7 +4,7 @@ Using CodeIgniter's Model .. contents:: :local: - :depth: 2 + :depth: 3 Models ****** From a8eec1efe0dd19a27a4634c2ff45107513b170a6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:32:55 +0900 Subject: [PATCH 4167/8282] docs: add sub section titles --- user_guide_src/source/models/model.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index accd3dc35f90..60f7e202b653 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -473,6 +473,9 @@ prior to saving to the database with the ``insert()``, ``update()``, or ``save() If you want to check required fields, you can change the behavior by configuration. See :ref:`clean-validation-rules` for details. +Setting Validation Rules +------------------------ + The first step is to fill out the ``$validationRules`` class property with the fields and rules that should be applied. If you have custom error message that you want to use, place them in the ``$validationMessages`` array: @@ -528,8 +531,16 @@ The other way to set the validation message to fields by functions, .. literalinclude:: model/031.php +Getting Validation Result +------------------------- + Now, whenever you call the ``insert()``, ``update()``, or ``save()`` methods, the data will be validated. If it fails, -the model will return boolean **false**. You can use the ``errors()`` method to retrieve the validation errors: +the model will return boolean **false**. + +Getting Validation Errors +------------------------- + +You can use the ``errors()`` method to retrieve the validation errors: .. literalinclude:: model/032.php From 947a10405c838d4d8aca9c0e9ab9239e568fc157 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:36:01 +0900 Subject: [PATCH 4168/8282] docs: move paragraph to correct section --- user_guide_src/source/models/model.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 60f7e202b653..0556eca4b636 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -481,6 +481,11 @@ be applied. If you have custom error message that you want to use, place them in .. literalinclude:: model/027.php +If you'd rather organize your rules and error messages within the Validation configuration file, you can do that +and simply set ``$validationRules`` to the name of the validation rule group you created: + +.. literalinclude:: model/034.php + The other way to set the validation rules to fields by functions, .. php:namespace:: CodeIgniter @@ -549,11 +554,6 @@ errors at the top of the form, or to display them individually: .. literalinclude:: model/033.php -If you'd rather organize your rules and error messages within the Validation configuration file, you can do that -and simply set ``$validationRules`` to the name of the validation rule group you created: - -.. literalinclude:: model/034.php - Retrieving Validation Rules --------------------------- From bf965a1a579a5684ed9207d2bc636506f3a2c479 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:44:50 +0900 Subject: [PATCH 4169/8282] docs: add note for validation placeholders --- user_guide_src/source/models/model.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 0556eca4b636..427f0eb51df9 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -583,6 +583,9 @@ replaced by the **value** of the matched incoming field. An example should clari .. literalinclude:: model/038.php +.. note:: Since v4.3.5, you must set the validation rules for the placeholder + field (``id``). + In this set of rules, it states that the email address should be unique in the database, except for the row that has an id matching the placeholder's value. Assuming that the form POST data had the following: @@ -594,6 +597,9 @@ then the ``{id}`` placeholder would be replaced with the number **4**, giving th So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique. +.. note:: Since v4.3.5, if the placeholder (``id``) value does not pass the + validation, the placeholder would not be replaced. + This can also be used to create more dynamic rules at runtime, as long as you take care that any dynamic keys passed in don't conflict with your form data. From c9924db6d9f64ac87b351eb97d5bf6e05d39e426 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:45:08 +0900 Subject: [PATCH 4170/8282] docs: update sample code for validation placeholder --- user_guide_src/source/models/model/038.php | 3 ++- user_guide_src/source/models/model/040.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/models/model/038.php b/user_guide_src/source/models/model/038.php index 820d37def40c..5ed40baae0eb 100644 --- a/user_guide_src/source/models/model/038.php +++ b/user_guide_src/source/models/model/038.php @@ -7,6 +7,7 @@ class MyModel extends Model { protected $validationRules = [ - 'email' => 'required|valid_email|is_unique[users.email,id,{id}]', + 'id' => 'max_length[19]|is_natural_no_zero', + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,{id}]', ]; } diff --git a/user_guide_src/source/models/model/040.php b/user_guide_src/source/models/model/040.php index 6e1ff1711960..df4d628d1c9d 100644 --- a/user_guide_src/source/models/model/040.php +++ b/user_guide_src/source/models/model/040.php @@ -7,6 +7,7 @@ class MyModel extends Model { protected $validationRules = [ - 'email' => 'required|valid_email|is_unique[users.email,id,4]', + 'id' => 'max_length[19]|is_natural_no_zero', + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email,id,4]', ]; } From 5a0f9cb09404b66229be0d7e40b42747fb59a694 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 06:48:12 +0900 Subject: [PATCH 4171/8282] docs: add max_length to sample code --- user_guide_src/source/models/model/027.php | 8 ++++---- user_guide_src/source/models/model/028.php | 2 +- user_guide_src/source/models/model/029.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/models/model/027.php b/user_guide_src/source/models/model/027.php index 5c457a09dce3..3a039df49465 100644 --- a/user_guide_src/source/models/model/027.php +++ b/user_guide_src/source/models/model/027.php @@ -7,10 +7,10 @@ class UserModel extends Model { protected $validationRules = [ - 'username' => 'required|alpha_numeric_space|min_length[3]', - 'email' => 'required|valid_email|is_unique[users.email]', - 'password' => 'required|min_length[8]', - 'pass_confirm' => 'required_with[password]|matches[password]', + 'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]', + 'email' => 'required|max_length[254]|valid_email|is_unique[users.email]', + 'password' => 'required|max_length[255]|min_length[8]', + 'pass_confirm' => 'required_with[password]|max_length[255]|matches[password]', ]; protected $validationMessages = [ 'email' => [ diff --git a/user_guide_src/source/models/model/028.php b/user_guide_src/source/models/model/028.php index acffbf22be01..9cea0eb31226 100644 --- a/user_guide_src/source/models/model/028.php +++ b/user_guide_src/source/models/model/028.php @@ -1,6 +1,6 @@ setValidationRule($fieldName, $fieldRules); diff --git a/user_guide_src/source/models/model/029.php b/user_guide_src/source/models/model/029.php index b7876797a6e2..93ba8ae51ffc 100644 --- a/user_guide_src/source/models/model/029.php +++ b/user_guide_src/source/models/model/029.php @@ -1,9 +1,9 @@ 'required|alpha_numeric_space|min_length[3]', + 'username' => 'required|max_length[30]|alpha_numeric_space|min_length[3]', 'email' => [ - 'rules' => 'required|valid_email|is_unique[users.email]', + 'rules' => 'required|max_length[254]|valid_email|is_unique[users.email]', 'errors' => [ 'required' => 'We really need your email.', ], From eda2ff45433d9c5bd0199a5b37e2c0ff28a37a03 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 08:37:54 +0900 Subject: [PATCH 4172/8282] docs: add note for In-Model Validation --- user_guide_src/source/helpers/form_helper.rst | 12 ++++++++++++ user_guide_src/source/models/model.rst | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst index 6bb94e319840..7571429241f3 100644 --- a/user_guide_src/source/helpers/form_helper.rst +++ b/user_guide_src/source/helpers/form_helper.rst @@ -536,6 +536,10 @@ The following functions are available: The returned array is the same as ``Validation::getErrors()``. See :ref:`Validation ` for details. + .. note:: This function does not work with :ref:`in-model-validation`. If you + want to get the validation errors in model validation, see + :ref:`model-getting-validation-errors`. + Example:: @@ -555,6 +559,10 @@ The following functions are available: This function uses :php:func:`validation_errors()` internally. + .. note:: This function does not work with :ref:`in-model-validation`. If you + want to get the validation errors in model validation, see + :ref:`model-getting-validation-errors`. + Example:: @@ -575,6 +583,10 @@ The following functions are available: This function uses :php:func:`validation_errors()` internally. + .. note:: This function does not work with :ref:`in-model-validation`. If you + want to get the validation errors in model validation, see + :ref:`model-getting-validation-errors`. + Example:: diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 427f0eb51df9..46bc5908cb41 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -456,6 +456,8 @@ Cleans out the database table by permanently removing all rows that have 'delete .. literalinclude:: model/026.php +.. _in-model-validation: + In-Model Validation =================== @@ -542,6 +544,8 @@ Getting Validation Result Now, whenever you call the ``insert()``, ``update()``, or ``save()`` methods, the data will be validated. If it fails, the model will return boolean **false**. +.. _model-getting-validation-errors: + Getting Validation Errors ------------------------- From ff3dd1cdc2c3d7274518785b82968030d5d69276 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 09:26:38 +0900 Subject: [PATCH 4173/8282] test: add test to reproduce bug --- .../_support/View/OtherCells/SampleClass.php | 26 +++++++++++++++++++ tests/system/View/CellTest.php | 11 ++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/_support/View/OtherCells/SampleClass.php diff --git a/tests/_support/View/OtherCells/SampleClass.php b/tests/_support/View/OtherCells/SampleClass.php new file mode 100644 index 000000000000..cff88bc58c4f --- /dev/null +++ b/tests/_support/View/OtherCells/SampleClass.php @@ -0,0 +1,26 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Tests\Support\View\OtherCells; + +/** + * Two classes with the same short name. + * + * - Tests\Support\View\SampleClass + * - Tests\Support\View\OtherCells\SampleClass + */ +class SampleClass +{ + public function hello() + { + return 'Good-bye!'; + } +} diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php index 33dd3984bd0d..5c1863236ab1 100644 --- a/tests/system/View/CellTest.php +++ b/tests/system/View/CellTest.php @@ -113,6 +113,17 @@ public function testDisplayRendersWithNamespacedClass() $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello')); } + public function testDisplayRendersTwoCellsWithSameShortName() + { + $output = $this->cell->render('\Tests\Support\View\SampleClass::hello'); + + $this->assertSame('Hello', $output); + + $output = $this->cell->render('\Tests\Support\View\OtherCells\SampleClass::hello'); + + $this->assertSame('Good-bye!', $output); + } + public function testDisplayRendersWithValidParamString() { $params = 'one=two,three=four'; From c193ce7ccd20bebbc4027d21629dbc92079e1edc Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 09:35:29 +0900 Subject: [PATCH 4174/8282] fix: view_cell() cannot load classes with the same short name --- system/View/Cell.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/View/Cell.php b/system/View/Cell.php index 5d575bced1e7..5c4d0ce2e99f 100644 --- a/system/View/Cell.php +++ b/system/View/Cell.php @@ -178,7 +178,8 @@ protected function determineClass(string $library): array } // locate and return an instance of the cell - $object = Factories::cells($class); + // @TODO extend Factories to be able to load classes with the same short name. + $object = class_exists($class) ? new $class() : Factories::cells($class); if (! is_object($object)) { throw ViewException::forInvalidCellClass($class); From 7ac527d72eb718406ea1a904e12fd2e37bc4b7e8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 17:25:02 +0900 Subject: [PATCH 4175/8282] feat: add SiteURI class --- system/HTTP/SiteURI.php | 312 ++++++++++++++++++++++++++++++ system/HTTP/URI.php | 2 + tests/system/HTTP/SiteURITest.php | 245 +++++++++++++++++++++++ 3 files changed, 559 insertions(+) create mode 100644 system/HTTP/SiteURI.php create mode 100644 tests/system/HTTP/SiteURITest.php diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php new file mode 100644 index 000000000000..bf3e06903188 --- /dev/null +++ b/system/HTTP/SiteURI.php @@ -0,0 +1,312 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use BadMethodCallException; +use CodeIgniter\HTTP\Exceptions\HTTPException; +use Config\App; + +/** + * URI for the application site + */ +class SiteURI extends URI +{ + /** + * The baseURL. + */ + private string $baseURL; + + /** + * The Index File. + */ + private string $indexPage; + + /** + * List of URI segments in baseURL and indexPage. + * + * If the URI is "http://localhost:8888/ci431/public/index.php/test?a=b", + * and the baseUR is "http://localhost:8888/ci431/public/", then: + * $baseSegments = [ + * 0 => 'ci431', + * 1 => 'public', + * 2 => 'index.php', + * ]; + */ + private array $baseSegments; + + /** + * List of URI segments after indexPage. + * + * The word "URI Segments" originally means only the URI path part relative + * to the baseURL. + * + * If the URI is "http://localhost:8888/ci431/public/index.php/test?a=b", + * and the baseUR is "http://localhost:8888/ci431/public/", then: + * $segments = [ + * 0 => 'test', + * ]; + * + * @var array + * + * @deprecated This property will be private. + */ + protected $segments; + + /** + * URI path relative to baseURL. + * + * If the baseURL contains sub folders, this value will be different from + * the current URI path. + */ + private string $routePath; + + public function __construct(App $configApp) + { + // It's possible the user forgot a trailing slash on their + // baseURL, so let's help them out. + $baseURL = rtrim($configApp->baseURL, '/ ') . '/'; + + $this->baseURL = $baseURL; + $this->indexPage = $configApp->indexPage; + + $this->setBaseSeegments(); + + // Check for an index page + $indexPage = ''; + if ($configApp->indexPage !== '') { + $indexPage = $configApp->indexPage . '/'; + } + + $tempUri = $this->baseURL . $indexPage; + $uri = new URI($tempUri); + + if ($configApp->forceGlobalSecureRequests) { + $uri->setScheme('https'); + } + + $parts = parse_url((string) $uri); + if ($parts === false) { + throw HTTPException::forUnableToParseURI($uri); + } + $this->applyParts($parts); + + $this->setPath('/'); + } + + /** + * Sets baseSegments. + */ + private function setBaseSeegments(): void + { + $basePath = (new URI($this->baseURL))->getPath(); + $this->baseSegments = $this->convertToSegments($basePath); + + if ($this->indexPage) { + $this->baseSegments[] = $this->indexPage; + } + } + + public function setURI(?string $uri = null) + { + throw new BadMethodCallException('Cannot use this method.'); + } + + /** + * Returns the URI path relative to baseURL. + * + * @return string The Route path. + */ + public function getRoutePath(): string + { + return $this->routePath; + } + + /** + * Returns the URI segments of the path as an array. + */ + public function getSegments(): array + { + return $this->segments; + } + + /** + * Returns the value of a specific segment of the URI path relative to baseURL. + * + * @param int $number Segment number + * @param string $default Default value + * + * @return string The value of the segment. If no segment is found, + * throws HTTPException + */ + public function getSegment(int $number, string $default = ''): string + { + if ($number < 1) { + throw HTTPException::forURISegmentOutOfRange($number); + } + + if ($number > count($this->segments) && ! $this->silent) { + throw HTTPException::forURISegmentOutOfRange($number); + } + + // The segment should treat the array as 1-based for the user + // but we still have to deal with a zero-based array. + $number--; + + return $this->segments[$number] ?? $default; + } + + /** + * Set the value of a specific segment of the URI path relative to baseURL. + * Allows to set only existing segments or add new one. + * + * @param int $number The segment number. Starting with 1. + * @param string $value The segment value. + * + * @return $this + */ + public function setSegment(int $number, $value) + { + if ($number < 1) { + throw HTTPException::forURISegmentOutOfRange($number); + } + + if ($number > count($this->segments) + 1) { + if ($this->silent) { + return $this; + } + + throw HTTPException::forURISegmentOutOfRange($number); + } + + // The segment should treat the array as 1-based for the user, + // but we still have to deal with a zero-based array. + $number--; + + $this->segments[$number] = $value; + + $this->refreshPath(); + + return $this; + } + + /** + * Returns the total number of segments. + */ + public function getTotalSegments(): int + { + return count($this->segments); + } + + /** + * Formats the URI as a string. + */ + public function __toString(): string + { + return static::createURIString( + $this->getScheme(), + $this->getAuthority(), + $this->getPath(), // Absolute URIs should use a "/" for an empty path + $this->getQuery(), + $this->getFragment() + ); + } + + /** + * Sets the route path (and segments). + * + * @return $this + */ + public function setPath(string $path) + { + $this->routePath = $this->filterPath($path); + + $this->segments = $this->convertToSegments($this->routePath); + + $this->refreshPath(); + + return $this; + } + + /** + * Converts path to segments + */ + private function convertToSegments(string $path): array + { + $tempPath = trim($path, '/'); + + return ($tempPath === '') ? [] : explode('/', $tempPath); + } + + /** + * Sets the path portion of the URI based on segments. + * + * @return $this + * + * @deprecated This method will be private. + */ + public function refreshPath() + { + $allSegments = array_merge($this->baseSegments, $this->segments); + $this->path = '/' . $this->filterPath(implode('/', $allSegments)); + + $this->routePath = $this->filterPath(implode('/', $this->segments)); + + if ($this->routePath === '') { + $this->routePath = '/'; + + if ($this->indexPage !== '') { + $this->path .= '/'; + } + } + + return $this; + } + + /** + * Saves our parts from a parse_url() call. + */ + protected function applyParts(array $parts) + { + if (! empty($parts['host'])) { + $this->host = $parts['host']; + } + if (! empty($parts['user'])) { + $this->user = $parts['user']; + } + if (isset($parts['path']) && $parts['path'] !== '') { + $this->path = $this->filterPath($parts['path']); + } + if (! empty($parts['query'])) { + $this->setQuery($parts['query']); + } + if (! empty($parts['fragment'])) { + $this->fragment = $parts['fragment']; + } + + // Scheme + if (isset($parts['scheme'])) { + $this->setScheme(rtrim($parts['scheme'], ':/')); + } else { + $this->setScheme('http'); + } + + // Port + if (isset($parts['port']) && $parts['port'] !== null) { + // Valid port numbers are enforced by earlier parse_url() or setPort() + $this->port = $parts['port']; + } + + if (isset($parts['pass'])) { + $this->password = $parts['pass']; + } + } +} diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 1e11953051bb..55c359d17d98 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -797,6 +797,8 @@ public function getBaseURL(): string * Sets the path portion of the URI based on segments. * * @return $this + * + * @deprecated This method will be private. */ public function refreshPath() { diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php new file mode 100644 index 000000000000..3a7c532519f6 --- /dev/null +++ b/tests/system/HTTP/SiteURITest.php @@ -0,0 +1,245 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use BadMethodCallException; +use CodeIgniter\HTTP\Exceptions\HTTPException; +use CodeIgniter\Test\CIUnitTestCase; +use Config\App; + +/** + * @backupGlobals enabled + * + * @internal + * + * @group Others + */ +final class SiteURITest extends CIUnitTestCase +{ + public function testConstructor() + { + $config = new App(); + + $uri = new SiteURI($config); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://example.com/index.php/', (string) $uri); + $this->assertSame('/index.php/', $uri->getPath()); + } + + public function testConstructorSubfolder() + { + $config = new App(); + $config->baseURL = 'http://example.com/ci4/'; + + $uri = new SiteURI($config); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://example.com/ci4/index.php/', (string) $uri); + $this->assertSame('/ci4/index.php/', $uri->getPath()); + } + + public function testConstructorForceGlobalSecureRequests() + { + $config = new App(); + $config->forceGlobalSecureRequests = true; + + $uri = new SiteURI($config); + + $this->assertSame('https://example.com/index.php/', (string) $uri); + } + + public function testConstructorIndexPageEmpty() + { + $config = new App(); + $config->indexPage = ''; + + $uri = new SiteURI($config); + + $this->assertSame('http://example.com/', (string) $uri); + } + + public function testSetPath() + { + $config = new App(); + + $uri = new SiteURI($config); + + $uri->setPath('test/method'); + + $this->assertSame('http://example.com/index.php/test/method', (string) $uri); + $this->assertSame('test/method', $uri->getRoutePath()); + $this->assertSame('/index.php/test/method', $uri->getPath()); + $this->assertSame(['test', 'method'], $uri->getSegments()); + $this->assertSame('test', $uri->getSegment(1)); + $this->assertSame(2, $uri->getTotalSegments()); + } + + public function testSetPathSubfolder() + { + $config = new App(); + $config->baseURL = 'http://example.com/ci4/'; + + $uri = new SiteURI($config); + + $uri->setPath('test/method'); + + $this->assertSame('http://example.com/ci4/index.php/test/method', (string) $uri); + $this->assertSame('test/method', $uri->getRoutePath()); + $this->assertSame('/ci4/index.php/test/method', $uri->getPath()); + $this->assertSame(['test', 'method'], $uri->getSegments()); + $this->assertSame('test', $uri->getSegment(1)); + $this->assertSame(2, $uri->getTotalSegments()); + } + + public function testSetPathEmpty() + { + $config = new App(); + + $uri = new SiteURI($config); + + $uri->setPath(''); + + $this->assertSame('http://example.com/index.php/', (string) $uri); + $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('/index.php/', $uri->getPath()); + $this->assertSame([], $uri->getSegments()); + $this->assertSame(0, $uri->getTotalSegments()); + } + + public function testSetSegment() + { + $config = new App(); + + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $uri->setSegment(1, 'one'); + + $this->assertSame('http://example.com/index.php/one/method', (string) $uri); + $this->assertSame('one/method', $uri->getRoutePath()); + $this->assertSame('/index.php/one/method', $uri->getPath()); + $this->assertSame(['one', 'method'], $uri->getSegments()); + $this->assertSame('one', $uri->getSegment(1)); + $this->assertSame(2, $uri->getTotalSegments()); + } + + public function testSetSegmentOutOfRange() + { + $this->expectException(HTTPException::class); + + $config = new App(); + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $uri->setSegment(4, 'four'); + } + + public function testSetSegmentSilentOutOfRange() + { + $config = new App(); + $uri = new SiteURI($config); + $uri->setPath('one/method'); + $uri->setSilent(); + + $uri->setSegment(4, 'four'); + $this->assertSame(['one', 'method'], $uri->getSegments()); + } + + public function testSetSegmentZero() + { + $this->expectException(HTTPException::class); + + $config = new App(); + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $uri->setSegment(0, 'four'); + } + + public function testSetSegmentSubfolder() + { + $config = new App(); + $config->baseURL = 'http://example.com/ci4/'; + + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $uri->setSegment(1, 'one'); + + $this->assertSame('http://example.com/ci4/index.php/one/method', (string) $uri); + $this->assertSame('one/method', $uri->getRoutePath()); + $this->assertSame('/ci4/index.php/one/method', $uri->getPath()); + $this->assertSame(['one', 'method'], $uri->getSegments()); + $this->assertSame('one', $uri->getSegment(1)); + $this->assertSame(2, $uri->getTotalSegments()); + } + + public function testGetRoutePath() + { + $config = new App(); + $uri = new SiteURI($config); + + $this->assertSame('/', $uri->getRoutePath()); + } + + public function testGetSegments() + { + $config = new App(); + $uri = new SiteURI($config); + + $this->assertSame([], $uri->getSegments()); + } + + public function testGetSegmentZero() + { + $this->expectException(HTTPException::class); + + $config = new App(); + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $uri->getSegment(0); + } + + public function testGetSegmentOutOfRange() + { + $this->expectException(HTTPException::class); + + $config = new App(); + $uri = new SiteURI($config); + $uri->setPath('test/method'); + + $this->assertSame('method', $uri->getSegment(2)); + $this->assertSame('', $uri->getSegment(3)); + + $uri->getSegment(4); + } + + public function testGetTotalSegments() + { + $config = new App(); + $uri = new SiteURI($config); + + $this->assertSame(0, $uri->getTotalSegments()); + } + + public function testSetURI() + { + $this->expectException(BadMethodCallException::class); + + $config = new App(); + $uri = new SiteURI($config); + + $uri->setURI('http://another.site.example.jp/'); + } +} From 7eec7bb9e146a648e7fa16f2dbd8d26b1c84d466 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 17:57:52 +0900 Subject: [PATCH 4176/8282] chore: add system/HTTP/SiteURI.php --- .github/workflows/test-phpcpd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml index 31dcdb232749..f08945514386 100644 --- a/.github/workflows/test-phpcpd.yml +++ b/.github/workflows/test-phpcpd.yml @@ -55,4 +55,5 @@ jobs: --exclude system/Database/OCI8/Builder.php --exclude system/Database/Postgre/Builder.php --exclude system/Debug/Exceptions.php + --exclude system/HTTP/SiteURI.php -- app/ public/ system/ From 5593f8a481edc7f7e21950e996b270fd10637387 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 18:48:16 +0900 Subject: [PATCH 4177/8282] docs: add @deprecated --- system/HTTP/URI.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 55c359d17d98..9b525e627fc6 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -34,11 +34,15 @@ class URI * Current URI string * * @var string + * + * @deprecated Not used. */ protected $uriString; /** * The Current baseURL. + * + * @deprecated Use SiteURI instead. */ private ?string $baseURL = null; @@ -773,6 +777,8 @@ public function setPath(string $path) * Sets the current baseURL. * * @interal + * + * @deprecated Use SiteURI instead. */ public function setBaseURL(string $baseURL): void { @@ -783,6 +789,8 @@ public function setBaseURL(string $baseURL): void * Returns the current baseURL. * * @interal + * + * @deprecated Use SiteURI instead. */ public function getBaseURL(): string { From 8a66de596999aa42b649bb48bbec173af068a50b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 Feb 2023 21:14:31 +0900 Subject: [PATCH 4178/8282] test: fix incorrect test One test one assertion. --- tests/system/HTTP/SiteURITest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 3a7c532519f6..d92421e58830 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -219,10 +219,7 @@ public function testGetSegmentOutOfRange() $uri = new SiteURI($config); $uri->setPath('test/method'); - $this->assertSame('method', $uri->getSegment(2)); - $this->assertSame('', $uri->getSegment(3)); - - $uri->getSegment(4); + $uri->getSegment(3); } public function testGetTotalSegments() From 406128f65d535eaf387750d9ec37a27ad77ce0c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 08:18:15 +0900 Subject: [PATCH 4179/8282] refactor: fix typo in method name --- system/HTTP/SiteURI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index bf3e06903188..6de923e66307 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -78,7 +78,7 @@ public function __construct(App $configApp) $this->baseURL = $baseURL; $this->indexPage = $configApp->indexPage; - $this->setBaseSeegments(); + $this->setBaseSegments(); // Check for an index page $indexPage = ''; @@ -105,7 +105,7 @@ public function __construct(App $configApp) /** * Sets baseSegments. */ - private function setBaseSeegments(): void + private function setBaseSegments(): void { $basePath = (new URI($this->baseURL))->getPath(); $this->baseSegments = $this->convertToSegments($basePath); From 7d91c0e9bdb5791c0c718a765cae91058869a8c3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 08:41:37 +0900 Subject: [PATCH 4180/8282] docs: update PHPDocs --- system/HTTP/URI.php | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 9b525e627fc6..4f12b3464260 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -263,6 +263,8 @@ public function __construct(?string $uri = null) * If $silent == true, then will not throw exceptions and will * attempt to continue gracefully. * + * Note: Method not in PSR-7 + * * @return URI */ public function setSilent(bool $silent = true) @@ -276,6 +278,8 @@ public function setSilent(bool $silent = true) * If $raw == true, then will use parseStr() method * instead of native parse_str() function. * + * Note: Method not in PSR-7 + * * @return URI */ public function useRawQueryString(bool $raw = true) @@ -291,6 +295,8 @@ public function useRawQueryString(bool $raw = true) * @return URI * * @throws HTTPException + * + * @deprecated This method will be private. */ public function setURI(?string $uri = null) { @@ -408,6 +414,8 @@ public function getUserInfo() * Temporarily sets the URI to show a password in userInfo. Will * reset itself after the first call to authority(). * + * Note: Method not in PSR-7 + * * @return URI */ public function showPassword(bool $val = true) @@ -567,6 +575,8 @@ public function getSegment(int $number, string $default = ''): string * Set the value of a specific segment of the URI path. * Allows to set only existing segments or add new one. * + * Note: Method not in PSR-7 + * * @param int $number Segment number starting at 1 * @param int|string $value * @@ -598,6 +608,8 @@ public function setSegment(int $number, $value) /** * Returns the total number of segments. + * + * Note: Method not in PSR-7 */ public function getTotalSegments(): int { @@ -665,6 +677,8 @@ private function changeSchemeAndPath(string $scheme, string $path): array /** * Parses the given string and saves the appropriate authority pieces. * + * Note: Method not in PSR-7 + * * @return $this */ public function setAuthority(string $str) @@ -694,6 +708,8 @@ public function setAuthority(string $str) * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml * * @return $this + * + * @TODO PSR-7: Should be `withScheme($scheme)`. */ public function setScheme(string $str) { @@ -710,6 +726,8 @@ public function setScheme(string $str) * @param string $pass The user's password * * @return $this + * + * @TODO PSR-7: Should be `withUserInfo($user, $password = null)`. */ public function setUserInfo(string $user, string $pass) { @@ -723,6 +741,8 @@ public function setUserInfo(string $user, string $pass) * Sets the host name to use. * * @return $this + * + * @TODO PSR-7: Should be `withHost($host)`. */ public function setHost(string $str) { @@ -737,6 +757,8 @@ public function setHost(string $str) * @param int $port * * @return $this + * + * @TODO PSR-7: Should be `withPort($port)`. */ public function setPort(?int $port = null) { @@ -761,6 +783,8 @@ public function setPort(?int $port = null) * Sets the path portion of the URI. * * @return $this + * + * @TODO PSR-7: Should be `withPath($port)`. */ public function setPath(string $path) { @@ -824,6 +848,8 @@ public function refreshPath() * to clean the various parts of the query keys and values. * * @return $this + * + * @TODO PSR-7: Should be `withQuery($query)`. */ public function setQuery(string $query) { @@ -854,6 +880,8 @@ public function setQuery(string $query) * portion of the URI. * * @return URI + * + * @TODO: PSR-7: Should be `withQueryParams(array $query)` */ public function setQueryArray(array $query) { @@ -865,7 +893,9 @@ public function setQueryArray(array $query) /** * Adds a single new element to the query vars. * - * @param int|string $value + * Note: Method not in PSR-7 + * + * @param int|string|null $value * * @return $this */ @@ -879,6 +909,8 @@ public function addQuery(string $key, $value = null) /** * Removes one or more query vars from the URI. * + * Note: Method not in PSR-7 + * * @param string ...$params * * @return $this @@ -896,6 +928,8 @@ public function stripQuery(...$params) * Filters the query variables so that only the keys passed in * are kept. The rest are removed from the object. * + * Note: Method not in PSR-7 + * * @param string ...$params * * @return $this @@ -923,6 +957,8 @@ public function keepQuery(...$params) * @see https://tools.ietf.org/html/rfc3986#section-3.5 * * @return $this + * + * @TODO PSR-7: Should be `withFragment($fragment)`. */ public function setFragment(string $string) { From b728948d91c3eb94a3e6511962f29969871524a0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 13:06:15 +0900 Subject: [PATCH 4181/8282] docs: add @deprecated --- system/HTTP/SiteURI.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 6de923e66307..4cad657ca1f3 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -115,6 +115,9 @@ private function setBaseSegments(): void } } + /** + * @deprecated + */ public function setURI(?string $uri = null) { throw new BadMethodCallException('Cannot use this method.'); From 9af4994bc3bd15ef3436cc9e17b5aaa8f219b8f2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 13:33:22 +0900 Subject: [PATCH 4182/8282] feat: add validation for baseURL --- system/HTTP/SiteURI.php | 8 ++++++++ tests/system/HTTP/SiteURITest.php | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 4cad657ca1f3..11299468fc1c 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -12,6 +12,7 @@ namespace CodeIgniter\HTTP; use BadMethodCallException; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; @@ -75,6 +76,13 @@ public function __construct(App $configApp) // baseURL, so let's help them out. $baseURL = rtrim($configApp->baseURL, '/ ') . '/'; + // Validate baseURL + if (filter_var($baseURL, FILTER_VALIDATE_URL) === false) { + throw new ConfigException( + 'Config\App::$baseURL is invalid.' + ); + } + $this->baseURL = $baseURL; $this->indexPage = $configApp->indexPage; diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index d92421e58830..833e52747ceb 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -12,6 +12,7 @@ namespace CodeIgniter\HTTP; use BadMethodCallException; +use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -68,6 +69,16 @@ public function testConstructorIndexPageEmpty() $this->assertSame('http://example.com/', (string) $uri); } + public function testConstructorInvalidBaseURL() + { + $this->expectException(ConfigException::class); + + $config = new App(); + $config->baseURL = 'invalid'; + + new SiteURI($config); + } + public function testSetPath() { $config = new App(); From 5fa53059ff93fa94cce56ea4272244c7f27472cd Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 13:33:56 +0900 Subject: [PATCH 4183/8282] feat: add getBaseURL() implementation --- system/HTTP/SiteURI.php | 10 ++++++++++ tests/system/HTTP/SiteURITest.php | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 11299468fc1c..4c5e66417158 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -131,6 +131,16 @@ public function setURI(?string $uri = null) throw new BadMethodCallException('Cannot use this method.'); } + /** + * Returns the baseURL. + * + * @interal + */ + public function getBaseURL(): string + { + return $this->baseURL; + } + /** * Returns the URI path relative to baseURL. * diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 833e52747ceb..5d0a3d134024 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -250,4 +250,12 @@ public function testSetURI() $uri->setURI('http://another.site.example.jp/'); } + + public function testGetBaseURL() + { + $config = new App(); + $uri = new SiteURI($config); + + $this->assertSame('http://example.com/', $uri->getBaseURL()); + } } From c8d5eefaf1514e88cd52abf10552681dd43b5bef Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 08:32:43 +0900 Subject: [PATCH 4184/8282] feat: add param $relativePath to constructor Change the condition to add / after index.php. --- system/HTTP/SiteURI.php | 62 ++++++++++++++++++++++--------- tests/system/HTTP/SiteURITest.php | 33 ++++++++++++++++ 2 files changed, 77 insertions(+), 18 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 4c5e66417158..44f819ea8f43 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -70,20 +70,13 @@ class SiteURI extends URI */ private string $routePath; - public function __construct(App $configApp) + /** + * @param string $relativePath URI path relative to baseURL. May include + * queries or fragments. + */ + public function __construct(App $configApp, string $relativePath = '') { - // It's possible the user forgot a trailing slash on their - // baseURL, so let's help them out. - $baseURL = rtrim($configApp->baseURL, '/ ') . '/'; - - // Validate baseURL - if (filter_var($baseURL, FILTER_VALIDATE_URL) === false) { - throw new ConfigException( - 'Config\App::$baseURL is invalid.' - ); - } - - $this->baseURL = $baseURL; + $this->baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; $this->setBaseSegments(); @@ -91,10 +84,17 @@ public function __construct(App $configApp) // Check for an index page $indexPage = ''; if ($configApp->indexPage !== '') { - $indexPage = $configApp->indexPage . '/'; + $indexPage = $configApp->indexPage; + + // Check if we need a separator + if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { + $indexPage .= '/'; + } } - $tempUri = $this->baseURL . $indexPage; + $relativePath = URI::removeDotSegments($relativePath); + + $tempUri = $this->baseURL . $indexPage . $relativePath; $uri = new URI($tempUri); if ($configApp->forceGlobalSecureRequests) { @@ -107,7 +107,25 @@ public function __construct(App $configApp) } $this->applyParts($parts); - $this->setPath('/'); + $parts = explode('?', $relativePath); + $routePath = $parts[0]; + $this->setRoutePath($routePath); + } + + private function normalizeBaseURL(App $configApp): string + { + // It's possible the user forgot a trailing slash on their + // baseURL, so let's help them out. + $baseURL = rtrim($configApp->baseURL, '/ ') . '/'; + + // Validate baseURL + if (filter_var($baseURL, FILTER_VALIDATE_URL) === false) { + throw new ConfigException( + 'Config\App::$baseURL is invalid.' + ); + } + + return $baseURL; } /** @@ -247,14 +265,22 @@ public function __toString(): string * @return $this */ public function setPath(string $path) + { + $this->setRoutePath($path); + + return $this; + } + + /** + * Sets the route path (and segments). + */ + private function setRoutePath(string $path): void { $this->routePath = $this->filterPath($path); $this->segments = $this->convertToSegments($this->routePath); $this->refreshPath(); - - return $this; } /** diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 5d0a3d134024..74e035868196 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -37,6 +37,27 @@ public function testConstructor() $this->assertSame('/index.php/', $uri->getPath()); } + public function testConstructorRelativePath() + { + $config = new App(); + + $uri = new SiteURI($config, 'one/two'); + + $this->assertSame('http://example.com/index.php/one/two', (string) $uri); + $this->assertSame('/index.php/one/two', $uri->getPath()); + } + + public function testConstructorRelativePathWithQuery() + { + $config = new App(); + + $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); + + $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2', (string) $uri); + $this->assertSame('/index.php/one/two', $uri->getPath()); + $this->assertSame('foo=1&bar=2', $uri->getQuery()); + } + public function testConstructorSubfolder() { $config = new App(); @@ -49,6 +70,18 @@ public function testConstructorSubfolder() $this->assertSame('/ci4/index.php/', $uri->getPath()); } + public function testConstructorSubfolderRelativePathWithQuery() + { + $config = new App(); + $config->baseURL = 'http://example.com/ci4/'; + + $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); + + $this->assertSame('http://example.com/ci4/index.php/one/two?foo=1&bar=2', (string) $uri); + $this->assertSame('/ci4/index.php/one/two', $uri->getPath()); + $this->assertSame('foo=1&bar=2', $uri->getQuery()); + } + public function testConstructorForceGlobalSecureRequests() { $config = new App(); From b30035be7390acf50c366a3c7c2ded51c7299f38 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 08:58:14 +0900 Subject: [PATCH 4185/8282] feat: add param $host to constructor --- system/HTTP/SiteURI.php | 16 +++++++++++++++- tests/system/HTTP/SiteURITest.php | 12 ++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 44f819ea8f43..61f9cbbe214d 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -73,8 +73,10 @@ class SiteURI extends URI /** * @param string $relativePath URI path relative to baseURL. May include * queries or fragments. + * @param string $host Hostname. If it is not in $allowedHostnames, + * just be ignored. */ - public function __construct(App $configApp, string $relativePath = '') + public function __construct(App $configApp, string $relativePath = '', string $host = '') { $this->baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; @@ -97,21 +99,33 @@ public function __construct(App $configApp, string $relativePath = '') $tempUri = $this->baseURL . $indexPage . $relativePath; $uri = new URI($tempUri); + // Update scheme if ($configApp->forceGlobalSecureRequests) { $uri->setScheme('https'); } + // Update host + if ($host !== '' && $this->checkHost($host, $configApp->allowedHostnames)) { + $uri->setHost($host); + } + $parts = parse_url((string) $uri); if ($parts === false) { throw HTTPException::forUnableToParseURI($uri); } $this->applyParts($parts); + // Set routePath $parts = explode('?', $relativePath); $routePath = $parts[0]; $this->setRoutePath($routePath); } + private function checkHost(string $host, array $allowedHostnames): bool + { + return in_array($host, $allowedHostnames, true); + } + private function normalizeBaseURL(App $configApp): string { // It's possible the user forgot a trailing slash on their diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 74e035868196..413ab66ee57c 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -58,6 +58,18 @@ public function testConstructorRelativePathWithQuery() $this->assertSame('foo=1&bar=2', $uri->getQuery()); } + public function testConstructorHost() + { + $config = new App(); + $config->allowedHostnames = ['sub.example.com']; + + $uri = new SiteURI($config, '', 'sub.example.com'); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://sub.example.com/index.php/', (string) $uri); + $this->assertSame('/index.php/', $uri->getPath()); + } + public function testConstructorSubfolder() { $config = new App(); From 9d823382ac66d00598417b495bb17150c1b967af Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 09:06:22 +0900 Subject: [PATCH 4186/8282] feat: add param $scheme to constructor --- system/HTTP/SiteURI.php | 10 +++++++--- tests/system/HTTP/SiteURITest.php | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 61f9cbbe214d..ea2bab91078f 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -73,10 +73,12 @@ class SiteURI extends URI /** * @param string $relativePath URI path relative to baseURL. May include * queries or fragments. - * @param string $host Hostname. If it is not in $allowedHostnames, + * @param string $host Optional hostname. If it is not in $allowedHostnames, * just be ignored. + * @param string $scheme Optional scheme. 'http' or 'https'. + * @phpstan-param 'http'|'https'|'' $scheme */ - public function __construct(App $configApp, string $relativePath = '', string $host = '') + public function __construct(App $configApp, string $relativePath = '', string $host = '', string $scheme = '') { $this->baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; @@ -100,7 +102,9 @@ public function __construct(App $configApp, string $relativePath = '', string $h $uri = new URI($tempUri); // Update scheme - if ($configApp->forceGlobalSecureRequests) { + if ($scheme !== '') { + $uri->setScheme($scheme); + } elseif ($configApp->forceGlobalSecureRequests) { $uri->setScheme('https'); } diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 413ab66ee57c..bdc6679bacc1 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -70,6 +70,16 @@ public function testConstructorHost() $this->assertSame('/index.php/', $uri->getPath()); } + public function testConstructorScheme() + { + $config = new App(); + + $uri = new SiteURI($config, '', '', 'https'); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('https://example.com/index.php/', (string) $uri); + } + public function testConstructorSubfolder() { $config = new App(); From b231d1c2838fb37f1ba4bc00cecdaf3877585f0c Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 09:11:23 +0900 Subject: [PATCH 4187/8282] style: break long line --- system/HTTP/SiteURI.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index ea2bab91078f..6b07bca62aa1 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -78,8 +78,12 @@ class SiteURI extends URI * @param string $scheme Optional scheme. 'http' or 'https'. * @phpstan-param 'http'|'https'|'' $scheme */ - public function __construct(App $configApp, string $relativePath = '', string $host = '', string $scheme = '') - { + public function __construct( + App $configApp, + string $relativePath = '', + string $host = '', + string $scheme = '' + ) { $this->baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; From 4932572a5dcd8d968c10c2412799db232f9d512d Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 10:01:03 +0900 Subject: [PATCH 4188/8282] fix: remove unneeded methods getSegment() accepts n+1. --- system/HTTP/SiteURI.php | 64 +++++-------------------------- tests/system/HTTP/SiteURITest.php | 2 +- 2 files changed, 10 insertions(+), 56 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 6b07bca62aa1..6a2d7f594af0 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -192,21 +192,17 @@ public function getRoutePath(): string } /** - * Returns the URI segments of the path as an array. - */ - public function getSegments(): array - { - return $this->segments; - } - - /** - * Returns the value of a specific segment of the URI path relative to baseURL. + * Returns the value of a specific segment of the URI path. + * Allows to get only existing segments or the next one. * - * @param int $number Segment number + * @param int $number Segment number starting at 1 * @param string $default Default value * - * @return string The value of the segment. If no segment is found, - * throws HTTPException + * @return string The value of the segment. If you specify the last +1 + * segment, the $default value. If you specify the last +2 + * or more throws HTTPException. + * + * @TODO remove this method after merging #7267 */ public function getSegment(int $number, string $default = ''): string { @@ -214,7 +210,7 @@ public function getSegment(int $number, string $default = ''): string throw HTTPException::forURISegmentOutOfRange($number); } - if ($number > count($this->segments) && ! $this->silent) { + if ($number > count($this->segments) + 1 && ! $this->silent) { throw HTTPException::forURISegmentOutOfRange($number); } @@ -225,48 +221,6 @@ public function getSegment(int $number, string $default = ''): string return $this->segments[$number] ?? $default; } - /** - * Set the value of a specific segment of the URI path relative to baseURL. - * Allows to set only existing segments or add new one. - * - * @param int $number The segment number. Starting with 1. - * @param string $value The segment value. - * - * @return $this - */ - public function setSegment(int $number, $value) - { - if ($number < 1) { - throw HTTPException::forURISegmentOutOfRange($number); - } - - if ($number > count($this->segments) + 1) { - if ($this->silent) { - return $this; - } - - throw HTTPException::forURISegmentOutOfRange($number); - } - - // The segment should treat the array as 1-based for the user, - // but we still have to deal with a zero-based array. - $number--; - - $this->segments[$number] = $value; - - $this->refreshPath(); - - return $this; - } - - /** - * Returns the total number of segments. - */ - public function getTotalSegments(): int - { - return count($this->segments); - } - /** * Formats the URI as a string. */ diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index bdc6679bacc1..e670e023b9f4 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -285,7 +285,7 @@ public function testGetSegmentOutOfRange() $uri = new SiteURI($config); $uri->setPath('test/method'); - $uri->getSegment(3); + $uri->getSegment(4); } public function testGetTotalSegments() From c3628d14c63a4507927b19fab5327353ddf11f2a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 15:24:36 +0900 Subject: [PATCH 4189/8282] fix: change default values to null For consistency with previous implementations. --- system/HTTP/SiteURI.php | 20 ++++++++++---------- tests/system/HTTP/SiteURITest.php | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 6a2d7f594af0..110d189e9d12 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -71,18 +71,18 @@ class SiteURI extends URI private string $routePath; /** - * @param string $relativePath URI path relative to baseURL. May include - * queries or fragments. - * @param string $host Optional hostname. If it is not in $allowedHostnames, - * just be ignored. - * @param string $scheme Optional scheme. 'http' or 'https'. - * @phpstan-param 'http'|'https'|'' $scheme + * @param string $relativePath URI path relative to baseURL. May include + * queries or fragments. + * @param string|null $host Optional hostname. If it is not in + * $allowedHostnames, just be ignored. + * @param string|null $scheme Optional scheme. 'http' or 'https'. + * @phpstan-param 'http'|'https'|null $scheme */ public function __construct( App $configApp, string $relativePath = '', - string $host = '', - string $scheme = '' + ?string $host = null, + ?string $scheme = null ) { $this->baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; @@ -106,14 +106,14 @@ public function __construct( $uri = new URI($tempUri); // Update scheme - if ($scheme !== '') { + if ($scheme !== null) { $uri->setScheme($scheme); } elseif ($configApp->forceGlobalSecureRequests) { $uri->setScheme('https'); } // Update host - if ($host !== '' && $this->checkHost($host, $configApp->allowedHostnames)) { + if ($host !== null && $this->checkHost($host, $configApp->allowedHostnames)) { $uri->setHost($host); } diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index e670e023b9f4..11153fb9b7fd 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -74,7 +74,7 @@ public function testConstructorScheme() { $config = new App(); - $uri = new SiteURI($config, '', '', 'https'); + $uri = new SiteURI($config, '', null, 'https'); $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('https://example.com/index.php/', (string) $uri); From 57afaf9920465562e17e0a06b795bfde11dd364f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 Feb 2023 18:23:36 +0900 Subject: [PATCH 4190/8282] fix: handling fragment --- system/HTTP/SiteURI.php | 1 + tests/system/HTTP/SiteURITest.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 110d189e9d12..958c503a5cdd 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -125,6 +125,7 @@ public function __construct( // Set routePath $parts = explode('?', $relativePath); + $parts = explode('#', $parts[0]); $routePath = $parts[0]; $this->setRoutePath($routePath); } diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 11153fb9b7fd..e8c2f4365b9c 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -58,6 +58,30 @@ public function testConstructorRelativePathWithQuery() $this->assertSame('foo=1&bar=2', $uri->getQuery()); } + public function testConstructorRelativePathWithFragment() + { + $config = new App(); + + $uri = new SiteURI($config, 'one/two#sec1'); + + $this->assertSame('http://example.com/index.php/one/two#sec1', (string) $uri); + $this->assertSame('/index.php/one/two', $uri->getPath()); + $this->assertSame('', $uri->getQuery()); + $this->assertSame('sec1', $uri->getFragment()); + } + + public function testConstructorRelativePathWithQueryAndFragment() + { + $config = new App(); + + $uri = new SiteURI($config, 'one/two?foo=1&bar=2#sec1'); + + $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2#sec1', (string) $uri); + $this->assertSame('/index.php/one/two', $uri->getPath()); + $this->assertSame('foo=1&bar=2', $uri->getQuery()); + $this->assertSame('sec1', $uri->getFragment()); + } + public function testConstructorHost() { $config = new App(); From 246eea249a526d562f30f45778eaff9e8575fc40 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Feb 2023 13:13:34 +0900 Subject: [PATCH 4191/8282] fix: host in baseURL may be wrong --- system/HTTP/SiteURI.php | 32 +++++++++++++++++++++++-------- tests/system/HTTP/SiteURITest.php | 6 ++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 958c503a5cdd..84488a307bca 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -22,10 +22,18 @@ class SiteURI extends URI { /** - * The baseURL. + * The current baseURL. */ private string $baseURL; + /** + * The path part of baseURL. + * + * The baseURL "http://example.com/" → '/' + * The baseURL "http://localhost:8888/ci431/public/" → '/ci431/public/' + */ + private string $basePathWithoutIndexPage; + /** * The Index File. */ @@ -84,10 +92,10 @@ public function __construct( ?string $host = null, ?string $scheme = null ) { - $this->baseURL = $this->normalizeBaseURL($configApp); + $baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; - $this->setBaseSegments(); + $this->setBasePath($baseURL); // Check for an index page $indexPage = ''; @@ -102,7 +110,7 @@ public function __construct( $relativePath = URI::removeDotSegments($relativePath); - $tempUri = $this->baseURL . $indexPage . $relativePath; + $tempUri = $baseURL . $indexPage . $relativePath; $uri = new URI($tempUri); // Update scheme @@ -128,6 +136,13 @@ public function __construct( $parts = explode('#', $parts[0]); $routePath = $parts[0]; $this->setRoutePath($routePath); + + // Set baseURL + $this->baseURL = URI::createURIString( + $this->getScheme(), + $this->getAuthority(), + $this->basePathWithoutIndexPage, + ); } private function checkHost(string $host, array $allowedHostnames): bool @@ -152,12 +167,13 @@ private function normalizeBaseURL(App $configApp): string } /** - * Sets baseSegments. + * Sets basePathWithoutIndexPage and baseSegments. */ - private function setBaseSegments(): void + private function setBasePath(string $baseURL): void { - $basePath = (new URI($this->baseURL))->getPath(); - $this->baseSegments = $this->convertToSegments($basePath); + $this->basePathWithoutIndexPage = (new URI($baseURL))->getPath(); + + $this->baseSegments = $this->convertToSegments($this->basePathWithoutIndexPage); if ($this->indexPage) { $this->baseSegments[] = $this->indexPage; diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index e8c2f4365b9c..9a8caa3a7d95 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -35,6 +35,7 @@ public function testConstructor() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://example.com/index.php/', (string) $uri); $this->assertSame('/index.php/', $uri->getPath()); + $this->assertSame('http://example.com/', $uri->getBaseURL()); } public function testConstructorRelativePath() @@ -92,6 +93,7 @@ public function testConstructorHost() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://sub.example.com/index.php/', (string) $uri); $this->assertSame('/index.php/', $uri->getPath()); + $this->assertSame('http://sub.example.com/', $uri->getBaseURL()); } public function testConstructorScheme() @@ -102,6 +104,7 @@ public function testConstructorScheme() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('https://example.com/index.php/', (string) $uri); + $this->assertSame('https://example.com/', $uri->getBaseURL()); } public function testConstructorSubfolder() @@ -114,6 +117,7 @@ public function testConstructorSubfolder() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://example.com/ci4/index.php/', (string) $uri); $this->assertSame('/ci4/index.php/', $uri->getPath()); + $this->assertSame('http://example.com/ci4/', $uri->getBaseURL()); } public function testConstructorSubfolderRelativePathWithQuery() @@ -136,6 +140,7 @@ public function testConstructorForceGlobalSecureRequests() $uri = new SiteURI($config); $this->assertSame('https://example.com/index.php/', (string) $uri); + $this->assertSame('https://example.com/', $uri->getBaseURL()); } public function testConstructorIndexPageEmpty() @@ -146,6 +151,7 @@ public function testConstructorIndexPageEmpty() $uri = new SiteURI($config); $this->assertSame('http://example.com/', (string) $uri); + $this->assertSame('http://example.com/', $uri->getBaseURL()); } public function testConstructorInvalidBaseURL() From 08bbc18006b22911c1b6d5c19de851d660ef3295 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 18 Feb 2023 13:14:54 +0900 Subject: [PATCH 4192/8282] fix: disable setBaseURL() method --- system/HTTP/SiteURI.php | 8 ++++++++ tests/system/HTTP/SiteURITest.php | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 84488a307bca..9f5cbb56ba5a 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -180,6 +180,14 @@ private function setBasePath(string $baseURL): void } } + /** + * @deprecated + */ + public function setBaseURL(string $baseURL): void + { + throw new BadMethodCallException('Cannot use this method.'); + } + /** * @deprecated */ diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 9a8caa3a7d95..578074ef5d6f 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -336,6 +336,16 @@ public function testSetURI() $uri->setURI('http://another.site.example.jp/'); } + public function testSetBaseURI() + { + $this->expectException(BadMethodCallException::class); + + $config = new App(); + $uri = new SiteURI($config); + + $uri->setBaseURL('http://another.site.example.jp/'); + } + public function testGetBaseURL() { $config = new App(); From ab6da6186727d74fdcaa261a178c21d3a170a379 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 16:04:14 +0900 Subject: [PATCH 4193/8282] test: add assertions --- tests/system/HTTP/SiteURITest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 578074ef5d6f..807ac03f6ced 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -34,6 +34,7 @@ public function testConstructor() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://example.com/index.php/', (string) $uri); + $this->assertSame('/', $uri->getRoutePath()); $this->assertSame('/index.php/', $uri->getPath()); $this->assertSame('http://example.com/', $uri->getBaseURL()); } @@ -45,6 +46,7 @@ public function testConstructorRelativePath() $uri = new SiteURI($config, 'one/two'); $this->assertSame('http://example.com/index.php/one/two', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); $this->assertSame('/index.php/one/two', $uri->getPath()); } @@ -55,6 +57,7 @@ public function testConstructorRelativePathWithQuery() $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); $this->assertSame('/index.php/one/two', $uri->getPath()); $this->assertSame('foo=1&bar=2', $uri->getQuery()); } @@ -66,6 +69,7 @@ public function testConstructorRelativePathWithFragment() $uri = new SiteURI($config, 'one/two#sec1'); $this->assertSame('http://example.com/index.php/one/two#sec1', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); $this->assertSame('/index.php/one/two', $uri->getPath()); $this->assertSame('', $uri->getQuery()); $this->assertSame('sec1', $uri->getFragment()); @@ -78,6 +82,7 @@ public function testConstructorRelativePathWithQueryAndFragment() $uri = new SiteURI($config, 'one/two?foo=1&bar=2#sec1'); $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2#sec1', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); $this->assertSame('/index.php/one/two', $uri->getPath()); $this->assertSame('foo=1&bar=2', $uri->getQuery()); $this->assertSame('sec1', $uri->getFragment()); @@ -92,6 +97,7 @@ public function testConstructorHost() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://sub.example.com/index.php/', (string) $uri); + $this->assertSame('/', $uri->getRoutePath()); $this->assertSame('/index.php/', $uri->getPath()); $this->assertSame('http://sub.example.com/', $uri->getBaseURL()); } @@ -116,6 +122,7 @@ public function testConstructorSubfolder() $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://example.com/ci4/index.php/', (string) $uri); + $this->assertSame('/', $uri->getRoutePath()); $this->assertSame('/ci4/index.php/', $uri->getPath()); $this->assertSame('http://example.com/ci4/', $uri->getBaseURL()); } @@ -128,6 +135,7 @@ public function testConstructorSubfolderRelativePathWithQuery() $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); $this->assertSame('http://example.com/ci4/index.php/one/two?foo=1&bar=2', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); $this->assertSame('/ci4/index.php/one/two', $uri->getPath()); $this->assertSame('foo=1&bar=2', $uri->getQuery()); } @@ -152,6 +160,8 @@ public function testConstructorIndexPageEmpty() $this->assertSame('http://example.com/', (string) $uri); $this->assertSame('http://example.com/', $uri->getBaseURL()); + $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('/', $uri->getPath()); } public function testConstructorInvalidBaseURL() From 82a567d09c3ba12f9bcddb8e1743aa100aec8c01 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 16:44:14 +0900 Subject: [PATCH 4194/8282] refactor: SiteURI::__construct() --- system/HTTP/SiteURI.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 9f5cbb56ba5a..38e28763743e 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -92,24 +92,23 @@ public function __construct( ?string $host = null, ?string $scheme = null ) { - $baseURL = $this->normalizeBaseURL($configApp); $this->indexPage = $configApp->indexPage; + $baseURL = $this->normalizeBaseURL($configApp); $this->setBasePath($baseURL); + $relativePath = URI::removeDotSegments($relativePath); + // Remove starting slash + if ($relativePath !== '' && $relativePath[0] === '/') { + $relativePath = ltrim($relativePath, '/'); + } + // Check for an index page $indexPage = ''; if ($configApp->indexPage !== '') { - $indexPage = $configApp->indexPage; - - // Check if we need a separator - if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $indexPage .= '/'; - } + $indexPage = $configApp->indexPage . '/'; } - $relativePath = URI::removeDotSegments($relativePath); - $tempUri = $baseURL . $indexPage . $relativePath; $uri = new URI($tempUri); @@ -254,7 +253,7 @@ public function __toString(): string return static::createURIString( $this->getScheme(), $this->getAuthority(), - $this->getPath(), // Absolute URIs should use a "/" for an empty path + $this->getPath(), $this->getQuery(), $this->getFragment() ); From ccfd79db821dcf721d817ea92ce2189b43e768fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 20 Feb 2023 16:46:29 +0900 Subject: [PATCH 4195/8282] test: add test cases for path starting with slash --- tests/system/HTTP/SiteURITest.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 807ac03f6ced..e00c65b0c89e 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -50,6 +50,17 @@ public function testConstructorRelativePath() $this->assertSame('/index.php/one/two', $uri->getPath()); } + public function testConstructorRelativePathStartWithSlash() + { + $config = new App(); + + $uri = new SiteURI($config, '/one/two'); + + $this->assertSame('http://example.com/index.php/one/two', (string) $uri); + $this->assertSame('one/two', $uri->getRoutePath()); + $this->assertSame('/index.php/one/two', $uri->getPath()); + } + public function testConstructorRelativePathWithQuery() { $config = new App(); @@ -190,6 +201,22 @@ public function testSetPath() $this->assertSame(2, $uri->getTotalSegments()); } + public function testSetPathStartWithSlash() + { + $config = new App(); + + $uri = new SiteURI($config); + + $uri->setPath('/test/method'); + + $this->assertSame('http://example.com/index.php/test/method', (string) $uri); + $this->assertSame('test/method', $uri->getRoutePath()); + $this->assertSame('/index.php/test/method', $uri->getPath()); + $this->assertSame(['test', 'method'], $uri->getSegments()); + $this->assertSame('test', $uri->getSegment(1)); + $this->assertSame(2, $uri->getTotalSegments()); + } + public function testSetPathSubfolder() { $config = new App(); From e733417b491a06057fec4b535e438ba5828485d7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Feb 2023 13:38:53 +0900 Subject: [PATCH 4196/8282] fix: change behavior The $routePath never starts with `/`. If the path is `/`, the URI retain the trailing `/`. --- system/HTTP/SiteURI.php | 31 +++++++++------ tests/system/HTTP/SiteURITest.php | 65 +++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 38e28763743e..e444dbb7b66a 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -75,6 +75,8 @@ class SiteURI extends URI * * If the baseURL contains sub folders, this value will be different from * the current URI path. + * + * This value never starts with '/'. */ private string $routePath; @@ -98,18 +100,27 @@ public function __construct( $this->setBasePath($baseURL); $relativePath = URI::removeDotSegments($relativePath); - // Remove starting slash - if ($relativePath !== '' && $relativePath[0] === '/') { + // Remove starting slash unless it is `/`. + if ($relativePath !== '' && $relativePath[0] === '/' && $relativePath !== '/') { $relativePath = ltrim($relativePath, '/'); } + $tempPath = $relativePath; + // Check for an index page $indexPage = ''; if ($configApp->indexPage !== '') { - $indexPage = $configApp->indexPage . '/'; + $indexPage = $configApp->indexPage; + + // Check if we need a separator + if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { + $indexPage .= '/'; + } + } elseif ($relativePath === '/') { + $tempPath = ''; } - $tempUri = $baseURL . $indexPage . $relativePath; + $tempUri = $baseURL . $indexPage . $tempPath; $uri = new URI($tempUri); // Update scheme @@ -305,16 +316,12 @@ public function refreshPath() $allSegments = array_merge($this->baseSegments, $this->segments); $this->path = '/' . $this->filterPath(implode('/', $allSegments)); - $this->routePath = $this->filterPath(implode('/', $this->segments)); - - if ($this->routePath === '') { - $this->routePath = '/'; - - if ($this->indexPage !== '') { - $this->path .= '/'; - } + if ($this->routePath === '/' && $this->path !== '/') { + $this->path .= '/'; } + $this->routePath = $this->filterPath(implode('/', $this->segments)); + return $this; } diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index e00c65b0c89e..0ca227616a2d 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -32,9 +32,22 @@ public function testConstructor() $uri = new SiteURI($config); + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://example.com/index.php', (string) $uri); + $this->assertSame('', $uri->getRoutePath()); + $this->assertSame('/index.php', $uri->getPath()); + $this->assertSame('http://example.com/', $uri->getBaseURL()); + } + + public function testConstructorPathSlash() + { + $config = new App(); + + $uri = new SiteURI($config, '/'); + $this->assertInstanceOf(SiteURI::class, $uri); $this->assertSame('http://example.com/index.php/', (string) $uri); - $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('', $uri->getRoutePath()); $this->assertSame('/index.php/', $uri->getPath()); $this->assertSame('http://example.com/', $uri->getBaseURL()); } @@ -107,9 +120,9 @@ public function testConstructorHost() $uri = new SiteURI($config, '', 'sub.example.com'); $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('http://sub.example.com/index.php/', (string) $uri); - $this->assertSame('/', $uri->getRoutePath()); - $this->assertSame('/index.php/', $uri->getPath()); + $this->assertSame('http://sub.example.com/index.php', (string) $uri); + $this->assertSame('', $uri->getRoutePath()); + $this->assertSame('/index.php', $uri->getPath()); $this->assertSame('http://sub.example.com/', $uri->getBaseURL()); } @@ -120,7 +133,7 @@ public function testConstructorScheme() $uri = new SiteURI($config, '', null, 'https'); $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('https://example.com/index.php/', (string) $uri); + $this->assertSame('https://example.com/index.php', (string) $uri); $this->assertSame('https://example.com/', $uri->getBaseURL()); } @@ -132,9 +145,9 @@ public function testConstructorSubfolder() $uri = new SiteURI($config); $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('http://example.com/ci4/index.php/', (string) $uri); - $this->assertSame('/', $uri->getRoutePath()); - $this->assertSame('/ci4/index.php/', $uri->getPath()); + $this->assertSame('http://example.com/ci4/index.php', (string) $uri); + $this->assertSame('', $uri->getRoutePath()); + $this->assertSame('/ci4/index.php', $uri->getPath()); $this->assertSame('http://example.com/ci4/', $uri->getBaseURL()); } @@ -158,7 +171,7 @@ public function testConstructorForceGlobalSecureRequests() $uri = new SiteURI($config); - $this->assertSame('https://example.com/index.php/', (string) $uri); + $this->assertSame('https://example.com/index.php', (string) $uri); $this->assertSame('https://example.com/', $uri->getBaseURL()); } @@ -171,7 +184,20 @@ public function testConstructorIndexPageEmpty() $this->assertSame('http://example.com/', (string) $uri); $this->assertSame('http://example.com/', $uri->getBaseURL()); - $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('', $uri->getRoutePath()); + $this->assertSame('/', $uri->getPath()); + } + + public function testConstructorIndexPageEmptyWithPathSlash() + { + $config = new App(); + $config->indexPage = ''; + + $uri = new SiteURI($config, '/'); + + $this->assertSame('http://example.com/', (string) $uri); + $this->assertSame('http://example.com/', $uri->getBaseURL()); + $this->assertSame('', $uri->getRoutePath()); $this->assertSame('/', $uri->getPath()); } @@ -242,8 +268,23 @@ public function testSetPathEmpty() $uri->setPath(''); + $this->assertSame('http://example.com/index.php', (string) $uri); + $this->assertSame('', $uri->getRoutePath()); + $this->assertSame('/index.php', $uri->getPath()); + $this->assertSame([], $uri->getSegments()); + $this->assertSame(0, $uri->getTotalSegments()); + } + + public function testSetPathSlash() + { + $config = new App(); + + $uri = new SiteURI($config); + + $uri->setPath('/'); + $this->assertSame('http://example.com/index.php/', (string) $uri); - $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('', $uri->getRoutePath()); $this->assertSame('/index.php/', $uri->getPath()); $this->assertSame([], $uri->getSegments()); $this->assertSame(0, $uri->getTotalSegments()); @@ -322,7 +363,7 @@ public function testGetRoutePath() $config = new App(); $uri = new SiteURI($config); - $this->assertSame('/', $uri->getRoutePath()); + $this->assertSame('', $uri->getRoutePath()); } public function testGetSegments() From 33fc02864f998ab5471bc891bb4756861727fb79 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 21 Feb 2023 14:50:31 +0900 Subject: [PATCH 4197/8282] test: use dataProviders --- tests/system/HTTP/SiteURITest.php | 424 +++++++++++++++--------------- 1 file changed, 219 insertions(+), 205 deletions(-) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 0ca227616a2d..f7595063bd5e 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -26,90 +26,202 @@ */ final class SiteURITest extends CIUnitTestCase { - public function testConstructor() - { - $config = new App(); - - $uri = new SiteURI($config); - - $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('http://example.com/index.php', (string) $uri); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/index.php', $uri->getPath()); - $this->assertSame('http://example.com/', $uri->getBaseURL()); - } - - public function testConstructorPathSlash() - { - $config = new App(); + /** + * @dataProvider provideConstructor + */ + public function testConstructor( + string $baseURL, + string $indexPage, + string $relativePath, + string $expectedURI, + string $expectedRoutePath, + string $expectedPath, + string $expectedQuery, + string $expectedFragment, + array $expectedSegments, + int $expectedTotalSegments + ) { + $config = new App(); + $config->indexPage = $indexPage; + $config->baseURL = $baseURL; - $uri = new SiteURI($config, '/'); + $uri = new SiteURI($config, $relativePath); $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('http://example.com/index.php/', (string) $uri); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/index.php/', $uri->getPath()); - $this->assertSame('http://example.com/', $uri->getBaseURL()); - } - - public function testConstructorRelativePath() - { - $config = new App(); - - $uri = new SiteURI($config, 'one/two'); - - $this->assertSame('http://example.com/index.php/one/two', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/index.php/one/two', $uri->getPath()); - } - - public function testConstructorRelativePathStartWithSlash() - { - $config = new App(); - $uri = new SiteURI($config, '/one/two'); - - $this->assertSame('http://example.com/index.php/one/two', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/index.php/one/two', $uri->getPath()); - } - - public function testConstructorRelativePathWithQuery() - { - $config = new App(); - - $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); - - $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/index.php/one/two', $uri->getPath()); - $this->assertSame('foo=1&bar=2', $uri->getQuery()); - } - - public function testConstructorRelativePathWithFragment() - { - $config = new App(); - - $uri = new SiteURI($config, 'one/two#sec1'); - - $this->assertSame('http://example.com/index.php/one/two#sec1', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/index.php/one/two', $uri->getPath()); - $this->assertSame('', $uri->getQuery()); - $this->assertSame('sec1', $uri->getFragment()); - } - - public function testConstructorRelativePathWithQueryAndFragment() - { - $config = new App(); - - $uri = new SiteURI($config, 'one/two?foo=1&bar=2#sec1'); - - $this->assertSame('http://example.com/index.php/one/two?foo=1&bar=2#sec1', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/index.php/one/two', $uri->getPath()); - $this->assertSame('foo=1&bar=2', $uri->getQuery()); - $this->assertSame('sec1', $uri->getFragment()); + $this->assertSame($expectedURI, (string) $uri); + $this->assertSame($expectedRoutePath, $uri->getRoutePath()); + $this->assertSame($expectedPath, $uri->getPath()); + $this->assertSame($expectedQuery, $uri->getQuery()); + $this->assertSame($expectedFragment, $uri->getFragment()); + $this->assertSame($baseURL, $uri->getBaseURL()); + + $this->assertSame($expectedSegments, $uri->getSegments()); + $this->assertSame($expectedTotalSegments, $uri->getTotalSegments()); + } + + public function provideConstructor() + { + return array_merge($this->provideURIs(), $this->provideRelativePathWithQueryOrFragment()); + } + + public function provideURIs() + { + return [ + // $baseURL, $indexPage, $relativePath, $expectedURI, $expectedRoutePath, + // $expectedPath, $expectedQuery, $expectedFragment + '' => [ + 'http://example.com/', + 'index.php', + '', + 'http://example.com/index.php', + '', + '/index.php', + '', + '', + [], + 0, + ], + '/' => [ + 'http://example.com/', + 'index.php', + '/', + 'http://example.com/index.php/', + '', + '/index.php/', + '', + '', + [], + 0, + ], + 'one/two' => [ + 'http://example.com/', + 'index.php', + 'one/two', + 'http://example.com/index.php/one/two', + 'one/two', + '/index.php/one/two', '', + '', + ['one', 'two'], + 2, + ], + '/one/two' => [ + 'http://example.com/', + 'index.php', + '/one/two', + 'http://example.com/index.php/one/two', + 'one/two', + '/index.php/one/two', + '', + '', + ['one', 'two'], + 2, + ], + 'Subfolder: ' => [ + 'http://example.com/ci4/', + 'index.php', + '', + 'http://example.com/ci4/index.php', + '', + '/ci4/index.php', + '', + '', + [], + 0, + ], + 'Subfolder: one/two' => [ + 'http://example.com/ci4/', + 'index.php', + 'one/two', + 'http://example.com/ci4/index.php/one/two', + 'one/two', + '/ci4/index.php/one/two', + '', + '', + ['one', 'two'], + 2, + ], + 'EmptyIndexPage: ' => [ + 'http://example.com/', + '', + '', + 'http://example.com/', + '', + '/', + '', + '', + [], + 0, + ], + 'EmptyIndexPage: /' => [ + 'http://example.com/', + '', + '/', + 'http://example.com/', + '', + '/', + '', + '', + [], + 0, + ], + ]; + } + + public function provideRelativePathWithQueryOrFragment() + { + return [ + // $baseURL, $indexPage, $relativePath, $expectedURI, $expectedRoutePath, + // $expectedPath, $expectedQuery, $expectedFragment + 'one/two?foo=1&bar=2' => [ + 'http://example.com/', + 'index.php', + 'one/two?foo=1&bar=2', + 'http://example.com/index.php/one/two?foo=1&bar=2', + 'one/two', + '/index.php/one/two', + 'foo=1&bar=2', + '', + ['one', 'two'], + 2, + ], + 'one/two#sec1' => [ + 'http://example.com/', + 'index.php', + 'one/two#sec1', + 'http://example.com/index.php/one/two#sec1', + 'one/two', + '/index.php/one/two', + '', + 'sec1', + ['one', 'two'], + 2, + ], + 'one/two?foo=1&bar=2#sec1' => [ + 'http://example.com/', + 'index.php', + 'one/two?foo=1&bar=2#sec1', + 'http://example.com/index.php/one/two?foo=1&bar=2#sec1', + 'one/two', + '/index.php/one/two', + 'foo=1&bar=2', + 'sec1', + ['one', 'two'], + 2, + ], + 'Subfolder: one/two?foo=1&bar=2' => [ + 'http://example.com/ci4/', + 'index.php', + 'one/two?foo=1&bar=2', + 'http://example.com/ci4/index.php/one/two?foo=1&bar=2', + 'one/two', + '/ci4/index.php/one/two', + 'foo=1&bar=2', + '', + ['one', 'two'], + 2, + ], + ]; } public function testConstructorHost() @@ -137,33 +249,6 @@ public function testConstructorScheme() $this->assertSame('https://example.com/', $uri->getBaseURL()); } - public function testConstructorSubfolder() - { - $config = new App(); - $config->baseURL = 'http://example.com/ci4/'; - - $uri = new SiteURI($config); - - $this->assertInstanceOf(SiteURI::class, $uri); - $this->assertSame('http://example.com/ci4/index.php', (string) $uri); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/ci4/index.php', $uri->getPath()); - $this->assertSame('http://example.com/ci4/', $uri->getBaseURL()); - } - - public function testConstructorSubfolderRelativePathWithQuery() - { - $config = new App(); - $config->baseURL = 'http://example.com/ci4/'; - - $uri = new SiteURI($config, 'one/two?foo=1&bar=2'); - - $this->assertSame('http://example.com/ci4/index.php/one/two?foo=1&bar=2', (string) $uri); - $this->assertSame('one/two', $uri->getRoutePath()); - $this->assertSame('/ci4/index.php/one/two', $uri->getPath()); - $this->assertSame('foo=1&bar=2', $uri->getQuery()); - } - public function testConstructorForceGlobalSecureRequests() { $config = new App(); @@ -175,32 +260,6 @@ public function testConstructorForceGlobalSecureRequests() $this->assertSame('https://example.com/', $uri->getBaseURL()); } - public function testConstructorIndexPageEmpty() - { - $config = new App(); - $config->indexPage = ''; - - $uri = new SiteURI($config); - - $this->assertSame('http://example.com/', (string) $uri); - $this->assertSame('http://example.com/', $uri->getBaseURL()); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/', $uri->getPath()); - } - - public function testConstructorIndexPageEmptyWithPathSlash() - { - $config = new App(); - $config->indexPage = ''; - - $uri = new SiteURI($config, '/'); - - $this->assertSame('http://example.com/', (string) $uri); - $this->assertSame('http://example.com/', $uri->getBaseURL()); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/', $uri->getPath()); - } - public function testConstructorInvalidBaseURL() { $this->expectException(ConfigException::class); @@ -211,83 +270,38 @@ public function testConstructorInvalidBaseURL() new SiteURI($config); } - public function testSetPath() - { - $config = new App(); - - $uri = new SiteURI($config); - - $uri->setPath('test/method'); - - $this->assertSame('http://example.com/index.php/test/method', (string) $uri); - $this->assertSame('test/method', $uri->getRoutePath()); - $this->assertSame('/index.php/test/method', $uri->getPath()); - $this->assertSame(['test', 'method'], $uri->getSegments()); - $this->assertSame('test', $uri->getSegment(1)); - $this->assertSame(2, $uri->getTotalSegments()); - } - - public function testSetPathStartWithSlash() - { - $config = new App(); - - $uri = new SiteURI($config); - - $uri->setPath('/test/method'); - - $this->assertSame('http://example.com/index.php/test/method', (string) $uri); - $this->assertSame('test/method', $uri->getRoutePath()); - $this->assertSame('/index.php/test/method', $uri->getPath()); - $this->assertSame(['test', 'method'], $uri->getSegments()); - $this->assertSame('test', $uri->getSegment(1)); - $this->assertSame(2, $uri->getTotalSegments()); - } - - public function testSetPathSubfolder() - { - $config = new App(); - $config->baseURL = 'http://example.com/ci4/'; - - $uri = new SiteURI($config); - - $uri->setPath('test/method'); - - $this->assertSame('http://example.com/ci4/index.php/test/method', (string) $uri); - $this->assertSame('test/method', $uri->getRoutePath()); - $this->assertSame('/ci4/index.php/test/method', $uri->getPath()); - $this->assertSame(['test', 'method'], $uri->getSegments()); - $this->assertSame('test', $uri->getSegment(1)); - $this->assertSame(2, $uri->getTotalSegments()); - } - - public function testSetPathEmpty() - { - $config = new App(); + /** + * @dataProvider provideURIs + */ + public function testSetPath( + string $baseURL, + string $indexPage, + string $relativePath, + string $expectedURI, + string $expectedRoutePath, + string $expectedPath, + string $expectedQuery, + string $expectedFragment, + array $expectedSegments, + int $expectedTotalSegments + ) { + $config = new App(); + $config->indexPage = $indexPage; + $config->baseURL = $baseURL; $uri = new SiteURI($config); - $uri->setPath(''); + $uri->setPath($relativePath); - $this->assertSame('http://example.com/index.php', (string) $uri); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/index.php', $uri->getPath()); - $this->assertSame([], $uri->getSegments()); - $this->assertSame(0, $uri->getTotalSegments()); - } + $this->assertSame($expectedURI, (string) $uri); + $this->assertSame($expectedRoutePath, $uri->getRoutePath()); + $this->assertSame($expectedPath, $uri->getPath()); + $this->assertSame($expectedQuery, $uri->getQuery()); + $this->assertSame($expectedFragment, $uri->getFragment()); + $this->assertSame($baseURL, $uri->getBaseURL()); - public function testSetPathSlash() - { - $config = new App(); - - $uri = new SiteURI($config); - - $uri->setPath('/'); - - $this->assertSame('http://example.com/index.php/', (string) $uri); - $this->assertSame('', $uri->getRoutePath()); - $this->assertSame('/index.php/', $uri->getPath()); - $this->assertSame([], $uri->getSegments()); - $this->assertSame(0, $uri->getTotalSegments()); + $this->assertSame($expectedSegments, $uri->getSegments()); + $this->assertSame($expectedTotalSegments, $uri->getTotalSegments()); } public function testSetSegment() From ba35e57307be0bff91ac0ffd57416d714deb62cd Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 22 Feb 2023 11:38:34 +0900 Subject: [PATCH 4198/8282] docs: update comments --- tests/system/HTTP/SiteURITest.php | 44 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index f7595063bd5e..4473259581a7 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -68,19 +68,17 @@ public function provideConstructor() public function provideURIs() { return [ - // $baseURL, $indexPage, $relativePath, $expectedURI, $expectedRoutePath, - // $expectedPath, $expectedQuery, $expectedFragment '' => [ - 'http://example.com/', - 'index.php', - '', - 'http://example.com/index.php', - '', - '/index.php', - '', - '', - [], - 0, + 'http://example.com/', // $baseURL + 'index.php', // $indexPage + '', // $relativePath + 'http://example.com/index.php', // $expectedURI + '', // $expectedRoutePath + '/index.php', // $expectedPath + '', // $expectedQuery + '', // $expectedFragment + [], // $expectedSegments + 0, // $expectedTotalSegments ], '/' => [ 'http://example.com/', @@ -171,19 +169,17 @@ public function provideURIs() public function provideRelativePathWithQueryOrFragment() { return [ - // $baseURL, $indexPage, $relativePath, $expectedURI, $expectedRoutePath, - // $expectedPath, $expectedQuery, $expectedFragment 'one/two?foo=1&bar=2' => [ - 'http://example.com/', - 'index.php', - 'one/two?foo=1&bar=2', - 'http://example.com/index.php/one/two?foo=1&bar=2', - 'one/two', - '/index.php/one/two', - 'foo=1&bar=2', - '', - ['one', 'two'], - 2, + 'http://example.com/', // $baseURL + 'index.php', // $indexPage + 'one/two?foo=1&bar=2', // $relativePath + 'http://example.com/index.php/one/two?foo=1&bar=2', // $expectedURI + 'one/two', // $expectedRoutePath + '/index.php/one/two', // $expectedPath + 'foo=1&bar=2', // $expectedQuery + '', // $expectedFragment + ['one', 'two'], // $expectedSegments + 2, // $expectedTotalSegments ], 'one/two#sec1' => [ 'http://example.com/', From fe754f3591fc0799395eacbbfcad2849c1ba5c8d Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 10:51:18 +0900 Subject: [PATCH 4199/8282] fix: change behavior If the path ends with `/`, the URI retain the trailing `/`. --- system/HTTP/SiteURI.php | 122 +++++++++++++++++++----------- tests/system/HTTP/SiteURITest.php | 12 +++ 2 files changed, 91 insertions(+), 43 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index e444dbb7b66a..160a31b4adcb 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -24,7 +24,7 @@ class SiteURI extends URI /** * The current baseURL. */ - private string $baseURL; + private URI $baseURL; /** * The path part of baseURL. @@ -96,32 +96,54 @@ public function __construct( ) { $this->indexPage = $configApp->indexPage; - $baseURL = $this->normalizeBaseURL($configApp); - $this->setBasePath($baseURL); + $this->baseURL = $this->determineBaseURL($configApp, $host, $scheme); - $relativePath = URI::removeDotSegments($relativePath); - // Remove starting slash unless it is `/`. - if ($relativePath !== '' && $relativePath[0] === '/' && $relativePath !== '/') { - $relativePath = ltrim($relativePath, '/'); - } + $this->setBasePath(); - $tempPath = $relativePath; + // Fix routePath, query, fragment + [$routePath, $query, $fragment] = $this->parseRelativePath($relativePath); - // Check for an index page - $indexPage = ''; - if ($configApp->indexPage !== '') { - $indexPage = $configApp->indexPage; + // Fix indexPage and routePath + $indexPageRoutePath = $this->getIndexPageRoutePath($routePath); - // Check if we need a separator - if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') { - $indexPage .= '/'; - } - } elseif ($relativePath === '/') { - $tempPath = ''; + // Fix the current URI + $uri = $this->baseURL . $indexPageRoutePath; + + // applyParts + $parts = parse_url($uri); + if ($parts === false) { + throw HTTPException::forUnableToParseURI($uri); + } + $parts['query'] = $query; + $parts['fragment'] = $fragment; + $this->applyParts($parts); + + $this->setRoutePath($routePath); + } + + private function parseRelativePath(string $relativePath): array + { + $parts = parse_url('http://dummy/' . $relativePath); + if ($parts === false) { + throw HTTPException::forUnableToParseURI($relativePath); } - $tempUri = $baseURL . $indexPage . $tempPath; - $uri = new URI($tempUri); + $routePath = $relativePath === '/' ? '/' : ltrim($parts['path'], '/'); + + $query = $parts['query'] ?? ''; + $fragment = $parts['fragment'] ?? ''; + + return [$routePath, $query, $fragment]; + } + + private function determineBaseURL( + App $configApp, + ?string $host, + ?string $scheme + ): URI { + $baseURL = $this->normalizeBaseURL($configApp); + + $uri = new URI($baseURL); // Update scheme if ($scheme !== null) { @@ -135,24 +157,34 @@ public function __construct( $uri->setHost($host); } - $parts = parse_url((string) $uri); - if ($parts === false) { - throw HTTPException::forUnableToParseURI($uri); + return $uri; + } + + private function getIndexPageRoutePath(string $routePath): string + { + // Remove starting slash unless it is `/`. + if ($routePath !== '' && $routePath[0] === '/' && $routePath !== '/') { + $routePath = ltrim($routePath, '/'); } - $this->applyParts($parts); - // Set routePath - $parts = explode('?', $relativePath); - $parts = explode('#', $parts[0]); - $routePath = $parts[0]; - $this->setRoutePath($routePath); + // Check for an index page + $indexPage = ''; + if ($this->indexPage !== '') { + $indexPage = $this->indexPage; - // Set baseURL - $this->baseURL = URI::createURIString( - $this->getScheme(), - $this->getAuthority(), - $this->basePathWithoutIndexPage, - ); + // Check if we need a separator + if ($routePath !== '' && $routePath[0] !== '/' && $routePath[0] !== '?') { + $indexPage .= '/'; + } + } + + $indexPageRoutePath = $indexPage . $routePath; + + if ($indexPageRoutePath === '/') { + $indexPageRoutePath = ''; + } + + return $indexPageRoutePath; } private function checkHost(string $host, array $allowedHostnames): bool @@ -179,9 +211,9 @@ private function normalizeBaseURL(App $configApp): string /** * Sets basePathWithoutIndexPage and baseSegments. */ - private function setBasePath(string $baseURL): void + private function setBasePath(): void { - $this->basePathWithoutIndexPage = (new URI($baseURL))->getPath(); + $this->basePathWithoutIndexPage = $this->baseURL->getPath(); $this->baseSegments = $this->convertToSegments($this->basePathWithoutIndexPage); @@ -213,7 +245,7 @@ public function setURI(?string $uri = null) */ public function getBaseURL(): string { - return $this->baseURL; + return (string) $this->baseURL; } /** @@ -285,13 +317,17 @@ public function setPath(string $path) /** * Sets the route path (and segments). */ - private function setRoutePath(string $path): void + private function setRoutePath(string $routePath): void { - $this->routePath = $this->filterPath($path); + $routePath = $this->filterPath($routePath); - $this->segments = $this->convertToSegments($this->routePath); + $indexPageRoutePath = $this->getIndexPageRoutePath($routePath); - $this->refreshPath(); + $this->path = $this->basePathWithoutIndexPage . $indexPageRoutePath; + + $this->routePath = ltrim($routePath, '/'); + + $this->segments = $this->convertToSegments($this->routePath); } /** diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 4473259581a7..c9423b6d1da3 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -115,6 +115,18 @@ public function provideURIs() ['one', 'two'], 2, ], + '/one/two/' => [ + 'http://example.com/', + 'index.php', + '/one/two/', + 'http://example.com/index.php/one/two/', + 'one/two/', + '/index.php/one/two/', + '', + '', + ['one', 'two'], + 2, + ], 'Subfolder: ' => [ 'http://example.com/ci4/', 'index.php', From 3f4a9fd94e9a65ca86eaa2e1e441c86fbf4f7cae Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 11:54:35 +0900 Subject: [PATCH 4200/8282] fix: remove $allowedHostnames check SiteURI will check. --- system/HTTP/SiteURI.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 160a31b4adcb..9d4ccef074d6 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -83,8 +83,7 @@ class SiteURI extends URI /** * @param string $relativePath URI path relative to baseURL. May include * queries or fragments. - * @param string|null $host Optional hostname. If it is not in - * $allowedHostnames, just be ignored. + * @param string|null $host Optional current hostname. * @param string|null $scheme Optional scheme. 'http' or 'https'. * @phpstan-param 'http'|'https'|null $scheme */ @@ -153,7 +152,7 @@ private function determineBaseURL( } // Update host - if ($host !== null && $this->checkHost($host, $configApp->allowedHostnames)) { + if ($host !== null) { $uri->setHost($host); } @@ -187,11 +186,6 @@ private function getIndexPageRoutePath(string $routePath): string return $indexPageRoutePath; } - private function checkHost(string $host, array $allowedHostnames): bool - { - return in_array($host, $allowedHostnames, true); - } - private function normalizeBaseURL(App $configApp): string { // It's possible the user forgot a trailing slash on their From ecf96eb21dc6a97fcadeb09931e9beebf1ae6f5e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 13:42:59 +0900 Subject: [PATCH 4201/8282] test: add test cases --- tests/system/HTTP/SiteURITest.php | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index c9423b6d1da3..f2b665b94a38 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -127,6 +127,42 @@ public function provideURIs() ['one', 'two'], 2, ], + '//one/two' => [ + 'http://example.com/', + 'index.php', + '//one/two', + 'http://example.com/index.php/one/two', + 'one/two', + '/index.php/one/two', + '', + '', + ['one', 'two'], + 2, + ], + 'one/two//' => [ + 'http://example.com/', + 'index.php', + 'one/two//', + 'http://example.com/index.php/one/two/', + 'one/two/', + '/index.php/one/two/', + '', + '', + ['one', 'two'], + 2, + ], + '///one///two///' => [ + 'http://example.com/', + 'index.php', + '///one///two///', + 'http://example.com/index.php/one/two/', + 'one/two/', + '/index.php/one/two/', + '', + '', + ['one', 'two'], + 2, + ], 'Subfolder: ' => [ 'http://example.com/ci4/', 'index.php', From 5193414accf0f8411f7d3a5a675c5a22170c76f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 Feb 2023 09:09:57 +0900 Subject: [PATCH 4202/8282] refactor: remove unneeded override The parent method is fixed. --- system/HTTP/SiteURI.php | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index 9d4ccef074d6..fc1071647462 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -252,36 +252,6 @@ public function getRoutePath(): string return $this->routePath; } - /** - * Returns the value of a specific segment of the URI path. - * Allows to get only existing segments or the next one. - * - * @param int $number Segment number starting at 1 - * @param string $default Default value - * - * @return string The value of the segment. If you specify the last +1 - * segment, the $default value. If you specify the last +2 - * or more throws HTTPException. - * - * @TODO remove this method after merging #7267 - */ - public function getSegment(int $number, string $default = ''): string - { - if ($number < 1) { - throw HTTPException::forURISegmentOutOfRange($number); - } - - if ($number > count($this->segments) + 1 && ! $this->silent) { - throw HTTPException::forURISegmentOutOfRange($number); - } - - // The segment should treat the array as 1-based for the user - // but we still have to deal with a zero-based array. - $number--; - - return $this->segments[$number] ?? $default; - } - /** * Formats the URI as a string. */ From bc2c9539e90c6e3febef5453f9b584d22a4dbdab Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sat, 8 Jul 2023 22:35:06 +0800 Subject: [PATCH 4203/8282] refactor: [Redis Cache] fix phpstan baseline error --- phpstan-baseline.neon.dist | 5 ----- system/Cache/Handlers/RedisHandler.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 892f28ffa1c6..5fd27c7bbabd 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -10,11 +10,6 @@ parameters: count: 1 path: system/Autoloader/Autoloader.php - - - message: "#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$redis \\(Redis\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: system/Cache/Handlers/RedisHandler.php - - message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#" count: 1 diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php index 6874a86c8f2c..acb024ca0839 100644 --- a/system/Cache/Handlers/RedisHandler.php +++ b/system/Cache/Handlers/RedisHandler.php @@ -38,7 +38,7 @@ class RedisHandler extends BaseHandler /** * Redis connection * - * @var Redis + * @var Redis|null */ protected $redis; From 14171bf7036336f5b1bb8c2668859ea09d07e493 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 9 Jul 2023 19:01:26 +0700 Subject: [PATCH 4204/8282] [Rector] Remove findParentType() on RemoveErrorSuppressInTryCatchStmtsRector --- ...moveErrorSuppressInTryCatchStmtsRector.php | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php index d1b660b037aa..06c8ca39de4d 100644 --- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php +++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php @@ -15,7 +15,10 @@ use PhpParser\Node; use PhpParser\Node\Expr\ErrorSuppress; +use PhpParser\Node\Stmt\Class_; +use PhpParser\Node\Stmt\Function_; use PhpParser\Node\Stmt\TryCatch; +use PhpParser\NodeTraverser; use Rector\Core\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -45,29 +48,37 @@ public function getRuleDefinition(): RuleDefinition */ public function getNodeTypes(): array { - return [ErrorSuppress::class]; + return [TryCatch::class]; } /** - * @param ErrorSuppress $node + * @param TryCatch $node */ public function refactor(Node $node): ?Node { - $tryCatch = $this->betterNodeFinder->findParentType($node, TryCatch::class); + $hasChanged = false; - // not in try catch - if (! $tryCatch instanceof TryCatch) { - return null; - } + $this->traverseNodesWithCallable( + $node->stmts, + static function (Node $subNode) use (&$hasChanged) { + if ($subNode instanceof Class_ || $subNode instanceof Function_) { + return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN; + } + + if ($subNode instanceof ErrorSuppress) { + $hasChanged = true; + + return $subNode->expr; + } - $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static fn (Node $n): bool => $n === $node); + return null; + } + ); - // not in stmts, means it in catch or finally - if (! $inStmts) { - return null; + if ($hasChanged) { + return $node; } - // in try { ... } stmts - return $node->expr; + return null; } } From 416312e22d1bf6deddd50e4389830365ea359aeb Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 9 Jul 2023 19:56:13 +0700 Subject: [PATCH 4205/8282] [Rector] Remove findParentType() on UnderscoreToCamelCaseVariableNameRector --- ...nderscoreToCamelCaseVariableNameRector.php | 75 +++++++++++++++---- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php index 31834cfc4e88..ea945e84a2df 100644 --- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -15,10 +15,14 @@ use PhpParser\Comment\Doc; use PhpParser\Node; +use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\Variable; +use PhpParser\Node\FunctionLike; use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Function_; +use PhpParser\Node\Stmt\Namespace_; use Rector\Core\Php\ReservedKeywordAnalyzer; +use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace; use Rector\Core\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; @@ -35,6 +39,7 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector private const PARAM_NAME_REGEX = '#(?@param\s.*\s+\$)(?%s)#ms'; private ReservedKeywordAnalyzer $reservedKeywordAnalyzer; + private bool $hasChanged = false; public function __construct( ReservedKeywordAnalyzer $reservedKeywordAnalyzer @@ -74,14 +79,59 @@ public function run($aB) */ public function getNodeTypes(): array { - return [Variable::class]; + return [FileWithoutNamespace::class, Namespace_::class]; } /** - * @param Variable $node + * @param ClassMethod|Closure|FileWithoutNamespace|Function_|Namespace_ $node */ public function refactor(Node $node): ?Node { + if ($node->stmts === null) { + return null; + } + + $this->hasChanged = false; + + $this->traverseNodesWithCallable( + $node->stmts, + function (Node $subNode) { + if ($subNode instanceof Variable || $subNode instanceof ClassMethod || $subNode instanceof Function_ || $subNode instanceof Closure) { + $this->processRenameVariable($subNode); + } + + return null; + } + ); + + if ($this->hasChanged) { + return $node; + } + + return null; + } + + private function processRenameVariable(FunctionLike|Variable $node): ?Variable + { + if ($node instanceof FunctionLike) { + if ($node instanceof Closure) { + foreach ($node->uses as $closureUse) { + $this->processRenameVariable($closureUse->var); + } + } + + foreach ($node->params as $key => $param) { + $originalVariableName = $param->var->name; + $variable = $this->processRenameVariable($param->var); + if ($variable instanceof Variable) { + $node->params[$key]->var = $variable; + $this->updateDocblock($originalVariableName, $variable->name, $node); + } + } + + return null; + } + $nodeName = $this->getName($node); if ($nodeName === null) { return null; @@ -105,24 +155,19 @@ public function refactor(Node $node): ?Node return null; } - $node->name = $camelCaseName; - $this->updateDocblock($node, $nodeName, $camelCaseName); + $node->name = $camelCaseName; + $this->hasChanged = true; return $node; } - private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void + private function updateDocblock(string $variableName, string $camelCaseName, ?FunctionLike $functionLike): void { - $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, ClassMethod::class); - - if ($parentFunctionLike === null) { - $parentFunctionLike = $this->betterNodeFinder->findParentType($variable, Function_::class); - if ($parentFunctionLike === null) { - return; - } + if ($functionLike === null) { + return; } - $docComment = $parentFunctionLike->getDocComment(); + $docComment = $functionLike->getDocComment(); if ($docComment === null) { return; } @@ -136,7 +181,7 @@ private function updateDocblock(Variable $variable, string $variableName, string return; } - $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentFunctionLike); + $phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike); $paramTagValueNodes = $phpDocInfo->getParamTagValueNodes(); foreach ($paramTagValueNodes as $paramTagValueNode) { @@ -146,6 +191,6 @@ private function updateDocblock(Variable $variable, string $variableName, string } } - $parentFunctionLike->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString())); + $functionLike->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString())); } } From 3dc315f7cb951c7bc77c61c3d992537b5ebf0f2b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 9 Jul 2023 19:58:39 +0700 Subject: [PATCH 4206/8282] Fix php syntax on php 7.4 compat --- utils/Rector/UnderscoreToCamelCaseVariableNameRector.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php index ea945e84a2df..3cadde86d3f7 100644 --- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php +++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php @@ -111,7 +111,10 @@ function (Node $subNode) { return null; } - private function processRenameVariable(FunctionLike|Variable $node): ?Variable + /** + * @param FunctionLike|Variable $node + */ + private function processRenameVariable(Node $node): ?Variable { if ($node instanceof FunctionLike) { if ($node instanceof Closure) { From c72fa247c75f2f059ff44c8887cf325f952a5367 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 13:00:27 +0900 Subject: [PATCH 4207/8282] fix: setValidationRule() cannot use with ruleGroup --- system/BaseModel.php | 19 +- system/Validation/Validation.php | 4 +- tests/_support/Config/Validation.php | 32 ++ tests/_support/Models/ValidModelRuleGroup.php | 27 + .../Models/ValidationModelRuleGroupTest.php | 476 ++++++++++++++++++ 5 files changed, 553 insertions(+), 5 deletions(-) create mode 100644 tests/_support/Config/Validation.php create mode 100644 tests/_support/Models/ValidModelRuleGroup.php create mode 100644 tests/system/Models/ValidationModelRuleGroupTest.php diff --git a/system/BaseModel.php b/system/BaseModel.php index 06b8190f037f..0f316e6ffa3f 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -1345,7 +1345,7 @@ public function skipValidation(bool $skip = true) } /** - * Allows to set validation messages. + * Allows to set (and reset) validation messages. * It could be used when you have to change default or override current validate messages. * * @param array $validationMessages Value @@ -1376,7 +1376,7 @@ public function setValidationMessage(string $field, array $fieldMessages) } /** - * Allows to set validation rules. + * Allows to set (and reset) validation rules. * It could be used when you have to change default or override current validate rules. * * @param array $validationRules Value @@ -1401,6 +1401,17 @@ public function setValidationRules(array $validationRules) */ public function setValidationRule(string $field, $fieldRules) { + $rules = $this->validationRules; + + // ValidationRules can be either a string, which is the group name, + // or an array of rules. + if (is_string($rules)) { + [$rules, $customErrors] = $this->validation->loadRuleGroup($rules); + + $this->validationRules = $rules; + $this->validationMessages = $this->validationMessages + $customErrors; + } + $this->validationRules[$field] = $fieldRules; return $this; @@ -1466,7 +1477,9 @@ public function getValidationRules(array $options = []): array // ValidationRules can be either a string, which is the group name, // or an array of rules. if (is_string($rules)) { - $rules = $this->validation->loadRuleGroup($rules); + [$rules, $customErrors] = $this->validation->loadRuleGroup($rules); + + $this->validationMessages = $this->validationMessages + $customErrors; } if (isset($options['except'])) { diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index cbfd396f325f..91e441356112 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -665,7 +665,7 @@ protected function loadRuleSets() * same format used with setRules(). Additionally, check * for {group}_errors for an array of custom error messages. * - * @return array + * @return array [rules, customErrors] * * @throws ValidationException */ @@ -693,7 +693,7 @@ public function loadRuleGroup(?string $group = null) $this->customErrors = $this->config->{$errorName}; } - return $this->rules; + return [$this->rules, $this->customErrors]; } /** diff --git a/tests/_support/Config/Validation.php b/tests/_support/Config/Validation.php new file mode 100644 index 000000000000..48be09084502 --- /dev/null +++ b/tests/_support/Config/Validation.php @@ -0,0 +1,32 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Tests\Support\Config; + +use Config\Validation as ValidationConfig; + +class Validation extends ValidationConfig +{ + public $signup = [ + 'id' => 'permit_empty|is_natural_no_zero', + 'name' => [ + 'required', + 'min_length[3]', + ], + 'token' => 'permit_empty|in_list[{id}]', + ]; + public $signup_errors = [ + 'name' => [ + 'required' => 'You forgot to name the baby.', + 'min_length' => 'Too short, man!', + ], + ]; +} diff --git a/tests/_support/Models/ValidModelRuleGroup.php b/tests/_support/Models/ValidModelRuleGroup.php new file mode 100644 index 000000000000..8b751b5f2409 --- /dev/null +++ b/tests/_support/Models/ValidModelRuleGroup.php @@ -0,0 +1,27 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Tests\Support\Models; + +use CodeIgniter\Model; + +class ValidModelRuleGroup extends Model +{ + protected $table = 'job'; + protected $returnType = 'object'; + protected $useSoftDeletes = false; + protected $dateFormat = 'int'; + protected $allowedFields = [ + 'name', + 'description', + ]; + protected $validationRules = 'signup'; +} diff --git a/tests/system/Models/ValidationModelRuleGroupTest.php b/tests/system/Models/ValidationModelRuleGroupTest.php new file mode 100644 index 000000000000..f25dfbbf9735 --- /dev/null +++ b/tests/system/Models/ValidationModelRuleGroupTest.php @@ -0,0 +1,476 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Models; + +use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Model; +use Config\Services; +use stdClass; +use Tests\Support\Config\Validation; +use Tests\Support\Models\JobModel; +use Tests\Support\Models\SimpleEntity; +use Tests\Support\Models\ValidErrorsModel; +use Tests\Support\Models\ValidModelRuleGroup; + +/** + * @group DatabaseLive + * + * @internal + */ +final class ValidationModelRuleGroupTest extends LiveModelTestCase +{ + protected function setUp(): void + { + parent::setUp(); + + $this->createModel(ValidModelRuleGroup::class); + } + + protected function createModel(string $modelName, ?BaseConnection $db = null): Model + { + $config = new Validation(); + $validation = new \CodeIgniter\Validation\Validation($config, Services::renderer()); + + $this->db = $db ?? $this->db; + $this->model = new $modelName($this->db, $validation); + + return $this->model; + } + + public function testValid(): void + { + $data = [ + 'name' => 'some name', + 'description' => 'some great marketing stuff', + ]; + + $this->assertIsInt($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame([], $errors); + } + + public function testValidationBasics(): void + { + $data = [ + 'name' => null, + 'description' => 'some great marketing stuff', + ]; + + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('You forgot to name the baby.', $errors['name']); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/5859 + */ + public function testValidationTwice(): void + { + $data = [ + 'name' => null, + 'description' => 'some great marketing stuff', + ]; + + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('You forgot to name the baby.', $errors['name']); + + $data = [ + 'name' => 'some name', + 'description' => 'some great marketing stuff', + ]; + + $this->assertIsInt($this->model->insert($data)); + } + + public function testValidationWithSetValidationRule(): void + { + $data = [ + 'name' => 'some name', + 'description' => 'some great marketing stuff', + ]; + + $this->model->setValidationRule('description', [ + 'rules' => 'required|min_length[50]', + 'errors' => [ + 'min_length' => 'Description is too short baby.', + ], + ]); + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('Description is too short baby.', $errors['description']); + } + + public function testValidationWithSetValidationRules(): void + { + $data = [ + 'name' => '', + 'description' => 'some great marketing stuff', + ]; + + $this->model->setValidationRules([ + 'name' => [ + 'rules' => 'required', + 'errors' => [ + 'required' => 'Give me a name baby.', + ], + ], + 'description' => [ + 'rules' => 'required|min_length[50]', + 'errors' => [ + 'min_length' => 'Description is too short baby.', + ], + ], + ]); + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('Give me a name baby.', $errors['name']); + $this->assertSame('Description is too short baby.', $errors['description']); + } + + public function testValidationWithSetValidationMessage(): void + { + $data = [ + 'name' => null, + 'description' => 'some great marketing stuff', + ]; + + $this->model->setValidationMessage('name', [ + 'required' => 'Your baby name is missing.', + 'min_length' => 'Too short, man!', + ]); + $this->assertFalse($this->model->insert($data)); + + $errors = $this->model->errors(); + $this->assertSame('Your baby name is missing.', $errors['name']); + } + + public function testValidationPlaceholdersSuccess(): void + { + $data = [ + 'name' => 'abc', + 'id' => 13, + 'token' => 13, + ]; + + $this->assertTrue($this->model->validate($data)); + } + + public function testValidationPlaceholdersFail(): void + { + $data = [ + 'name' => 'abc', + 'id' => 13, + 'token' => 12, + ]; + + $this->assertFalse($this->model->validate($data)); + } + + public function testSkipValidation(): void + { + $data = [ + 'name' => '2', + 'description' => 'some great marketing stuff', + ]; + + $this->assertIsNumeric($this->model->skipValidation(true)->insert($data)); + } + + public function testCleanValidationRemovesAllWhenNoDataProvided(): void + { + $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules'); + + $rules = [ + 'name' => 'required', + 'foo' => 'bar', + ]; + + $rules = $cleaner($rules, null); + $this->assertEmpty($rules); + } + + public function testCleanValidationRemovesOnlyForFieldsNotProvided(): void + { + $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules'); + + $rules = [ + 'name' => 'required', + 'foo' => 'required', + ]; + + $data = [ + 'foo' => 'bar', + ]; + + $rules = $cleaner($rules, $data); + $this->assertArrayHasKey('foo', $rules); + $this->assertArrayNotHasKey('name', $rules); + } + + public function testCleanValidationReturnsAllWhenAllExist(): void + { + $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules'); + + $rules = [ + 'name' => 'required', + 'foo' => 'required', + ]; + + $data = [ + 'foo' => 'bar', + 'name' => null, + ]; + + $rules = $cleaner($rules, $data); + $this->assertArrayHasKey('foo', $rules); + $this->assertArrayHasKey('name', $rules); + } + + public function testValidationPassesWithMissingFields(): void + { + $data = [ + 'foo' => 'bar', + ]; + + $result = $this->model->validate($data); + $this->assertTrue($result); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/1584 + */ + public function testUpdateWithValidation(): void + { + $data = [ + 'description' => 'This is a first test!', + 'name' => 'valid', + 'id' => 42, + 'token' => 42, + ]; + + $id = $this->model->insert($data); + $this->assertTrue((bool) $id); + + $data['description'] = 'This is a second test!'; + unset($data['name']); + + $result = $this->model->update($id, $data); + $this->assertTrue($result); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717 + */ + public function testRequiredWithValidationEmptyString(): void + { + $this->assertFalse($this->model->insert(['name' => ''])); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717 + */ + public function testRequiredWithValidationNull(): void + { + $this->assertFalse($this->model->insert(['name' => null])); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717 + */ + public function testRequiredWithValidationTrue(): void + { + $data = [ + 'name' => 'foobar', + 'description' => 'just because we have to', + ]; + + $this->assertNotFalse($this->model->insert($data)); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/1574 + */ + public function testValidationIncludingErrors(): void + { + $data = [ + 'description' => 'This is a first test!', + 'name' => 'valid', + 'id' => 42, + 'token' => 42, + ]; + + $this->createModel(ValidErrorsModel::class); + + $id = $this->model->insert($data); + $this->assertFalse((bool) $id); + $this->assertSame('Minimum Length Error', $this->model->errors()['name']); + } + + public function testValidationByObject(): void + { + $data = new stdClass(); + + $data->name = 'abc'; + $data->id = '13'; + $data->token = '13'; + + $this->assertTrue($this->model->validate($data)); + } + + public function testGetValidationRules(): void + { + $this->createModel(JobModel::class); + $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']); + + $rules = $this->model->getValidationRules(); + $this->assertSame('required', $rules['description']); + } + + public function testGetValidationMessages(): void + { + $jobData = [ + [ + 'name' => 'Comedian', + 'description' => null, + ], + ]; + + $this->createModel(JobModel::class); + $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']); + $this->setPrivateProperty($this->model, 'validationMessages', ['description' => 'Description field is required.']); + + $this->assertFalse($this->model->insertBatch($jobData)); + + $error = $this->model->getValidationMessages(); + $this->assertSame('Description field is required.', $error['description']); + } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/6577 + */ + public function testUpdateEntityWithPropertyCleanValidationRulesTrueAndCallingCleanRulesFalse() + { + $model = new class () extends Model { + protected $table = 'test'; + protected $allowedFields = ['field1', 'field2', 'field3', 'field4']; + protected $returnType = SimpleEntity::class; + protected $validationRules = [ + 'field1' => 'required_with[field2,field3,field4]', + 'field2' => 'permit_empty', + 'field3' => 'permit_empty', + 'field4' => 'permit_empty', + ]; + }; + + // Simulate to get the entity from the database. + $entity = new SimpleEntity(); + $entity->setAttributes([ + 'id' => '1', + 'field1' => 'value1', + 'field2' => 'value2', + 'field3' => '', + 'field4' => '', + ]); + + // Change field1 value. + $entity->field1 = ''; + + // Set $cleanValidationRules to false by cleanRules() + $model->cleanRules(false)->save($entity); + + $errors = $model->errors(); + $this->assertCount(1, $errors); + $this->assertSame( + $errors['field1'], + 'The field1 field is required when field2,field3,field4 is present.' + ); + } + + public function testUpdateEntityWithPropertyCleanValidationRulesFalse() + { + $model = new class () extends Model { + protected $table = 'test'; + protected $allowedFields = ['field1', 'field2', 'field3', 'field4']; + protected $returnType = SimpleEntity::class; + protected $validationRules = [ + 'field1' => 'required_with[field2,field3,field4]', + 'field2' => 'permit_empty', + 'field3' => 'permit_empty', + 'field4' => 'permit_empty', + ]; + + // Set to false. + protected $cleanValidationRules = false; + }; + + // Simulate to get the entity from the database. + $entity = new SimpleEntity(); + $entity->setAttributes([ + 'id' => '1', + 'field1' => 'value1', + 'field2' => 'value2', + 'field3' => '', + 'field4' => '', + ]); + + // Change field1 value. + $entity->field1 = ''; + + $model->save($entity); + + $errors = $model->errors(); + $this->assertCount(1, $errors); + $this->assertSame( + $errors['field1'], + 'The field1 field is required when field2,field3,field4 is present.' + ); + } + + public function testInsertEntityValidateEntireRules() + { + $model = new class () extends Model { + protected $table = 'test'; + protected $allowedFields = ['field1', 'field2', 'field3', 'field4']; + protected $returnType = SimpleEntity::class; + protected $validationRules = [ + 'field1' => 'required', + 'field2' => 'required', + 'field3' => 'permit_empty', + 'field4' => 'permit_empty', + ]; + }; + + $entity = new SimpleEntity(); + $entity->setAttributes([ + 'field1' => 'value1', + // field2 is missing + 'field3' => '', + 'field4' => '', + ]); + + // Insert ignores $cleanValidationRules value. + $model->insert($entity); + + $errors = $model->errors(); + $this->assertCount(1, $errors); + $this->assertSame( + $errors['field2'], + 'The field2 field is required.' + ); + } +} From 919206896da970774abc2ec5c36e6c704f9a19d5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 13:22:05 +0900 Subject: [PATCH 4208/8282] docs: add changelog and upgrade guide --- user_guide_src/source/changelogs/v4.3.7.rst | 3 +++ user_guide_src/source/installation/upgrade_437.rst | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.7.rst b/user_guide_src/source/changelogs/v4.3.7.rst index 47fc19f161d1..7bb8ba84b9e2 100644 --- a/user_guide_src/source/changelogs/v4.3.7.rst +++ b/user_guide_src/source/changelogs/v4.3.7.rst @@ -15,6 +15,9 @@ BREAKING - **FeatureTestTrait:** When using :ref:`withBodyFormat() `, the priority of the request body has been changed. See :ref:`Upgrading Guide ` for details. +- **Validation:** The return value of ``Validation::loadRuleGroup()`` has been + changed from "**rules array**" to "**array** of **rules array** and **customErrors array**" + (``[rules, customErrors]``). Message Changes *************** diff --git a/user_guide_src/source/installation/upgrade_437.rst b/user_guide_src/source/installation/upgrade_437.rst index 389c145f4109..cc3e38fd030d 100644 --- a/user_guide_src/source/installation/upgrade_437.rst +++ b/user_guide_src/source/installation/upgrade_437.rst @@ -39,6 +39,19 @@ is not used:: Previously, the ``$body`` was used for the request body. +Return value of Validation::loadRuleGroup() +=========================================== + +The return value of ``Validation::loadRuleGroup()`` has been changed from +"**rules array**" to "**array** of **rules array** and **customErrors array**" +(``[rules, customErrors]``). + +If you use the method, update the code like the following:: + + $rules = $this->validation->loadRuleGroup($rules); + ↓ + [$rules, $customErrors] = $this->validation->loadRuleGroup($rules); + Breaking Enhancements ********************* From b24c01c51287b31f9da18ed2a67628e39e616939 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 14:03:24 +0900 Subject: [PATCH 4209/8282] docs: fix typo in comments --- system/HTTP/SiteURI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index fc1071647462..e64080974940 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -43,7 +43,7 @@ class SiteURI extends URI * List of URI segments in baseURL and indexPage. * * If the URI is "http://localhost:8888/ci431/public/index.php/test?a=b", - * and the baseUR is "http://localhost:8888/ci431/public/", then: + * and the baseURL is "http://localhost:8888/ci431/public/", then: * $baseSegments = [ * 0 => 'ci431', * 1 => 'public', @@ -59,7 +59,7 @@ class SiteURI extends URI * to the baseURL. * * If the URI is "http://localhost:8888/ci431/public/index.php/test?a=b", - * and the baseUR is "http://localhost:8888/ci431/public/", then: + * and the baseURL is "http://localhost:8888/ci431/public/", then: * $segments = [ * 0 => 'test', * ]; From 3e349e18774ae6b45f5e9b91e60ba11d5feb72ae Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 14:11:24 +0900 Subject: [PATCH 4210/8282] docs: make URI::setSilent() deprecated --- system/HTTP/URI.php | 2 +- user_guide_src/source/changelogs/v4.4.0.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 4f12b3464260..0201f0680ce0 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -263,7 +263,7 @@ public function __construct(?string $uri = null) * If $silent == true, then will not throw exceptions and will * attempt to continue gracefully. * - * Note: Method not in PSR-7 + * @deprecated 4.4.0 Method not in PSR-7 * * @return URI */ diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 87712aff5bb6..085489277c7e 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -216,6 +216,7 @@ Deprecations ``$tokenName``, ``$headerName``, ``$expires``, ``$regenerate``, and ``$redirect`` in ``Security`` are deprecated, and no longer used. Use ``$config`` instead. +- **URI:** ``URI::setSilent()`` is deprecated. Bugs Fixed ********** From e529291339008883b6a8dec16a076a35b7d4079a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 14:30:47 +0900 Subject: [PATCH 4211/8282] feat: add URI::withScheme() and deprecate URI::setScheme() --- system/HTTP/URI.php | 31 ++++++++++++++++- tests/system/HTTP/URITest.php | 38 +++++++++++++++++++++ user_guide_src/source/changelogs/v4.4.0.rst | 4 ++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 0201f0680ce0..d27598b6bfb1 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -14,6 +14,7 @@ use BadMethodCallException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; +use InvalidArgumentException; /** * Abstraction for a uniform resource identifier (URI). @@ -709,7 +710,7 @@ public function setAuthority(string $str) * * @return $this * - * @TODO PSR-7: Should be `withScheme($scheme)`. + * @deprecated Use `withScheme()` instead. */ public function setScheme(string $str) { @@ -719,6 +720,34 @@ public function setScheme(string $str) return $this; } + /** + * Return an instance with the specified scheme. + * + * This method MUST retain the state of the current instance, and return + * an instance that contains the specified scheme. + * + * Implementations MUST support the schemes "http" and "https" case + * insensitively, and MAY accommodate other schemes if required. + * + * An empty scheme is equivalent to removing the scheme. + * + * @param string $scheme The scheme to use with the new instance. + * + * @return static A new instance with the specified scheme. + * + * @throws InvalidArgumentException for invalid or unsupported schemes. + */ + public function withScheme(string $scheme) + { + $uri = clone $this; + + $scheme = strtolower($scheme); + + $uri->scheme = preg_replace('#:(//)?$#', '', $scheme); + + return $uri; + } + /** * Sets the userInfo/Authority portion of the URI. * diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index fa5caafa1a49..ec3443fdf278 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -240,6 +240,44 @@ public function testSetSchemeSetsValue() $this->assertSame($expected, (string) $uri); } + public function testWithScheme() + { + $url = 'example.com'; + $uri = new URI('http://' . $url); + + $new = $uri->withScheme('x'); + + $this->assertSame('x://' . $url, (string) $new); + $this->assertSame('http://' . $url, (string) $uri); + } + + public function testWithSchemeSetsHttps() + { + $url = 'http://example.com/path'; + $uri = new URI($url); + + $new = $uri->withScheme('https'); + + $this->assertSame('https', $new->getScheme()); + $this->assertSame('http', $uri->getScheme()); + + $expected = 'https://example.com/path'; + $this->assertSame($expected, (string) $new); + $expected = 'http://example.com/path'; + $this->assertSame($expected, (string) $uri); + } + + public function testWithSchemeSetsEmpty() + { + $url = 'example.com'; + $uri = new URI('http://' . $url); + + $new = $uri->withScheme(''); + + $this->assertSame($url, (string) $new); + $this->assertSame('http://' . $url, (string) $uri); + } + public function testSetUserInfoSetsValue() { $url = 'http://example.com/path'; diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 085489277c7e..475d08e9eaea 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -216,7 +216,9 @@ Deprecations ``$tokenName``, ``$headerName``, ``$expires``, ``$regenerate``, and ``$redirect`` in ``Security`` are deprecated, and no longer used. Use ``$config`` instead. -- **URI:** ``URI::setSilent()`` is deprecated. +- **URI:** + - ``URI::setSilent()`` is deprecated. + - ``URI::setScheme()`` is deprecated. Use ``withScheme()`` instead. Bugs Fixed ********** From f45d036a032589647027810a84a11cd9be5e4ec4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 14:49:13 +0900 Subject: [PATCH 4212/8282] docs: fix sample code of Config\Validation --- user_guide_src/source/libraries/validation/003.php | 4 +++- user_guide_src/source/libraries/validation/013.php | 8 ++++++-- user_guide_src/source/libraries/validation/015.php | 10 +++++++--- user_guide_src/source/libraries/validation/016.php | 9 +++++++-- user_guide_src/source/libraries/validation/032.php | 8 ++++++-- user_guide_src/source/libraries/validation/033.php | 3 ++- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php index fbd3ee57980a..e83233803e7c 100644 --- a/user_guide_src/source/libraries/validation/003.php +++ b/user_guide_src/source/libraries/validation/003.php @@ -2,7 +2,9 @@ namespace Config; -class Validation +// ... + +class Validation extends BaseConfig { // ... diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php index 383eb8153574..b43a32f97d4e 100644 --- a/user_guide_src/source/libraries/validation/013.php +++ b/user_guide_src/source/libraries/validation/013.php @@ -2,9 +2,13 @@ namespace Config; -class Validation +// ... + +class Validation extends BaseConfig { - public $signup = [ + // ... + + public array $signup = [ 'username' => 'required|max_length[30]', 'password' => 'required|max_length[255]', 'pass_confirm' => 'required|max_length[255]|matches[password]', diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php index 91f9ac1c1c31..6e666e41c35d 100644 --- a/user_guide_src/source/libraries/validation/015.php +++ b/user_guide_src/source/libraries/validation/015.php @@ -2,16 +2,20 @@ namespace Config; -class Validation +// ... + +class Validation extends BaseConfig { - public $signup = [ + // ... + + public array $signup = [ 'username' => 'required|max_length[30]', 'password' => 'required|max_length[255]', 'pass_confirm' => 'required|max_length[255]|matches[password]', 'email' => 'required|max_length[254]|valid_email', ]; - public $signup_errors = [ + public array $signup_errors = [ 'username' => [ 'required' => 'You must choose a username.', ], diff --git a/user_guide_src/source/libraries/validation/016.php b/user_guide_src/source/libraries/validation/016.php index c11237a9cf09..1eb72bc8c62f 100644 --- a/user_guide_src/source/libraries/validation/016.php +++ b/user_guide_src/source/libraries/validation/016.php @@ -2,9 +2,13 @@ namespace Config; -class Validation +// ... + +class Validation extends BaseConfig { - public $signup = [ + // ... + + public array $signup = [ 'username' => [ 'rules' => 'required|max_length[30]', 'errors' => [ @@ -18,5 +22,6 @@ class Validation ], ], ]; + // ... } diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php index acec3cfc6ba2..cf8bcf8b9bdc 100644 --- a/user_guide_src/source/libraries/validation/032.php +++ b/user_guide_src/source/libraries/validation/032.php @@ -2,9 +2,13 @@ namespace Config; -class Validation +// ... + +class Validation extends BaseConfig { - public $templates = [ + // ... + + public array $templates = [ 'list' => 'CodeIgniter\Validation\Views\list', 'single' => 'CodeIgniter\Validation\Views\single', 'my_list' => '_errors_list', diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php index fe61b137f7e5..aa67529ba959 100644 --- a/user_guide_src/source/libraries/validation/033.php +++ b/user_guide_src/source/libraries/validation/033.php @@ -2,12 +2,13 @@ namespace Config; +use CodeIgniter\Config\BaseConfig; use CodeIgniter\Validation\CreditCardRules; use CodeIgniter\Validation\FileRules; use CodeIgniter\Validation\FormatRules; use CodeIgniter\Validation\Rules; -class Validation +class Validation extends BaseConfig { // ... From a6571c3a1f529ebd0af7a4c62a1d94f34a28e9f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:26:01 +0000 Subject: [PATCH 4213/8282] build(deps-dev): update rector/rector requirement from 0.17.2 to 0.17.3 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.17.2...0.17.3) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c7da41b6b216..5eb5760d6142 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.2", + "rector/rector": "0.17.3", "vimeo/psalm": "^5.0" }, "suggest": { From b35216056e487e3d64334f8f64f3261c59226141 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:18:24 +0900 Subject: [PATCH 4214/8282] docs: fix Section Headings marks --- .../source/installation/running.rst | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 0b974180f7e7..ce17b8a0aa46 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -1,3 +1,4 @@ +################ Running Your App ################ @@ -20,8 +21,9 @@ section of the User Guide to begin learning how to build dynamic PHP application .. _initial-configuration: +********************* Initial Configuration -===================== +********************* #. Open the **app/Config/App.php** file with a text editor and set your base URL to ``$baseURL``. If you need more flexibility, the baseURL may @@ -49,11 +51,12 @@ Initial Configuration your project, so that it is writable by the user or account used by your web server. +************************ Local Development Server -======================== +************************ CodeIgniter 4 comes with a local development server, leveraging PHP's built-in web server -with CodeIgniter routing. You can launch it, with the following command line +with CodeIgniter routing. You can launch it, with the following command line in the main directory:: > php spark serve @@ -83,8 +86,9 @@ The local development server can be customized with three command line options: > php spark serve --php /usr/bin/php7.6.5.4 +******************* Hosting with Apache -=================== +******************* A CodeIgniter4 webapp is normally hosted on a web server. Apache HTTP Server is the "standard" platform, and assumed in much of our documentation. @@ -93,7 +97,7 @@ Apache is bundled with many platforms, but can also be downloaded in a bundle with a database engine and PHP from `Bitnami `_. .htaccess ---------- +========= The "mod_rewrite" module enables URLs without "index.php" in them, and is assumed in our user guide. @@ -113,12 +117,12 @@ in the ``AllowOverride`` setting:: Removing the index.php ----------------------- +====================== See :ref:`CodeIgniter URLs `. Virtual Hosting ---------------- +=============== We recommend using "virtual hosting" to run your apps. You can set up different aliases for each of the apps you work on, @@ -148,7 +152,7 @@ If your project folder is not a subfolder of the Apache document root, then your ```` element may need a nested ```` element to grant the web server access to the files. With mod_userdir (Shared Hosts) --------------------------------- +=============================== A common practice in shared hosting environments is to use the Apache module "mod_userdir" to enable per-user Virtual Hosts automatically. Additional configuration is required to allow CodeIgniter4 to be run from these per-user directories. @@ -214,25 +218,26 @@ Be sure to specify options and permissions for the CodeIgniter public directory Setting Environment -------------------- +=================== See :ref:`Handling Multiple Environments `. Testing -------- +======= With the above configuration, your webapp would be accessed with the URL **http://myproject.local/** in your browser. Apache needs to be restarted whenever you change its configuration. +****************** Hosting with Nginx -================== +****************** Nginx is the second most widely used HTTP server for web hosting. Here you can find an example configuration using PHP 8.1 FPM (unix sockets) under Ubuntu Server. default.conf ------------- +============ This configuration enables URLs without "index.php" in them and using CodeIgniter's "404 - File Not Found" for URLs ending with ".php". @@ -269,12 +274,13 @@ This configuration enables URLs without "index.php" in them and using CodeIgnite } Setting Environment -------------------- +=================== See :ref:`Handling Multiple Environments `. +********************* Bootstrapping the App -===================== +********************* In some scenarios you will want to load the framework without actually running the whole application. This is particularly useful for unit testing your project, but may also be From 35e5342899564e21ceb5f6b627752c7901b751bf Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:32:10 +0900 Subject: [PATCH 4215/8282] docs: indent config values in sample --- user_guide_src/source/installation/running.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index ce17b8a0aa46..4161233c0d94 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -143,9 +143,9 @@ e.g., **apache2/conf/extra/httpd-vhost.conf**:: DocumentRoot "/opt/lamp/apache2/htdocs/myproject/public" - ServerName myproject.local - ErrorLog "logs/myproject-error_log" - CustomLog "logs/myproject-access_log" common + ServerName myproject.local + ErrorLog "logs/myproject-error_log" + CustomLog "logs/myproject-access_log" common If your project folder is not a subfolder of the Apache document root, then your From 92e5a8fd1e5b11bf931506253b0962ccf0ed8fea Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:31:46 +0900 Subject: [PATCH 4216/8282] docs: add sub section titles and fix --- .../source/installation/running.rst | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 4161233c0d94..c7a5e7e5c4b8 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -96,8 +96,11 @@ Apache HTTP Server is the "standard" platform, and assumed in much of our docume Apache is bundled with many platforms, but can also be downloaded in a bundle with a database engine and PHP from `Bitnami `_. -.htaccess -========= +Configure Main Config File +========================== + +Enabling mod_rewrite +-------------------- The "mod_rewrite" module enables URLs without "index.php" in them, and is assumed in our user guide. @@ -107,6 +110,9 @@ configuration file, e.g., **apache2/conf/httpd.conf**:: LoadModule rewrite_module modules/mod_rewrite.so +Setting Document Root +--------------------- + Also make sure that the default document root's ```` element enables this too, in the ``AllowOverride`` setting:: @@ -127,17 +133,26 @@ Virtual Hosting We recommend using "virtual hosting" to run your apps. You can set up different aliases for each of the apps you work on, +Enabling vhost_alias_module +--------------------------- + Make sure that the virtual hosting module is enabled (uncommented) in the main configuration file, e.g., **apache2/conf/httpd.conf**:: LoadModule vhost_alias_module modules/mod_vhost_alias.so +Adding Host Alias +----------------- + Add a host alias in your "hosts" file, typically **/etc/hosts** on unix-type platforms, or **c:/Windows/System32/drivers/etc/hosts** on Windows. Add a line to the file. This could be ``myproject.local`` or ``myproject.test``, for instance:: 127.0.0.1 myproject.local +Setting VirtualHost +------------------- + Add a ```` element for your webapp inside the virtual hosting configuration, e.g., **apache2/conf/extra/httpd-vhost.conf**:: From 0a1e43ad09f58459a35c06b1ee209c6936d76f13 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:51:25 +0900 Subject: [PATCH 4217/8282] docs: add new line --- user_guide_src/source/installation/running.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index c7a5e7e5c4b8..080235aeb19e 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -146,7 +146,9 @@ Adding Host Alias Add a host alias in your "hosts" file, typically **/etc/hosts** on unix-type platforms, or **c:/Windows/System32/drivers/etc/hosts** on Windows. -Add a line to the file. This could be ``myproject.local`` or ``myproject.test``, for instance:: +Add a line to the file. + +This could be ``myproject.local`` or ``myproject.test``, for instance:: 127.0.0.1 myproject.local From c917982843ab55b3b492a715ee1516dbeb75a3f4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:51:44 +0900 Subject: [PATCH 4218/8282] docs: change sub section order --- .../source/installation/running.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 080235aeb19e..ce19325ec6ef 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -122,11 +122,6 @@ in the ``AllowOverride`` setting:: Require all granted -Removing the index.php -====================== - -See :ref:`CodeIgniter URLs `. - Virtual Hosting =============== @@ -168,6 +163,13 @@ e.g., **apache2/conf/extra/httpd-vhost.conf**:: If your project folder is not a subfolder of the Apache document root, then your ```` element may need a nested ```` element to grant the web server access to the files. +Testing +======= + +With the above configuration, your webapp would be accessed with the URL **http://myproject.local/** in your browser. + +Apache needs to be restarted whenever you change its configuration. + With mod_userdir (Shared Hosts) =============================== @@ -234,18 +236,16 @@ Be sure to specify options and permissions for the CodeIgniter public directory +Removing the index.php +====================== + +See :ref:`CodeIgniter URLs `. + Setting Environment =================== See :ref:`Handling Multiple Environments `. -Testing -======= - -With the above configuration, your webapp would be accessed with the URL **http://myproject.local/** in your browser. - -Apache needs to be restarted whenever you change its configuration. - ****************** Hosting with Nginx ****************** From fdf3252d2503f15a28041df436fd8a81fe78a969 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:57:23 +0900 Subject: [PATCH 4219/8282] docs: change sub section titles and level --- user_guide_src/source/installation/running.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index ce19325ec6ef..4b99f2179258 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -122,8 +122,8 @@ in the ``AllowOverride`` setting:: Require all granted -Virtual Hosting -=============== +Hosting with VirtualHost +======================== We recommend using "virtual hosting" to run your apps. You can set up different aliases for each of the apps you work on, @@ -164,14 +164,14 @@ If your project folder is not a subfolder of the Apache document root, then your ```` element may need a nested ```` element to grant the web server access to the files. Testing -======= +------- With the above configuration, your webapp would be accessed with the URL **http://myproject.local/** in your browser. Apache needs to be restarted whenever you change its configuration. -With mod_userdir (Shared Hosts) -=============================== +Hosting with mod_userdir (Shared Hosts) +======================================= A common practice in shared hosting environments is to use the Apache module "mod_userdir" to enable per-user Virtual Hosts automatically. Additional configuration is required to allow CodeIgniter4 to be run from these per-user directories. From 18d5cf40091f314a24400338daf07b00c5f4eaee Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 09:59:20 +0900 Subject: [PATCH 4220/8282] docs: change TOC depth to 3 --- user_guide_src/source/installation/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 4b99f2179258..2c1a3dfdf2d0 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -4,7 +4,7 @@ Running Your App .. contents:: :local: - :depth: 2 + :depth: 3 A CodeIgniter 4 app can be run in a number of different ways: hosted on a web server, using virtualization, or using CodeIgniter's command line tool for testing. From eb465d945caffdaea55c2d087855c8e82ac1047a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 11:01:31 +0900 Subject: [PATCH 4221/8282] docs: add ".. code-block:: apache" --- .../source/installation/running.rst | 100 ++++++++++-------- 1 file changed, 57 insertions(+), 43 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 2c1a3dfdf2d0..7b763c5ae616 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -106,7 +106,9 @@ The "mod_rewrite" module enables URLs without "index.php" in them, and is assume in our user guide. Make sure that the rewrite module is enabled (uncommented) in the main -configuration file, e.g., **apache2/conf/httpd.conf**:: +configuration file, e.g., **apache2/conf/httpd.conf**: + +.. code-block:: apache LoadModule rewrite_module modules/mod_rewrite.so @@ -114,7 +116,9 @@ Setting Document Root --------------------- Also make sure that the default document root's ```` element enables this too, -in the ``AllowOverride`` setting:: +in the ``AllowOverride`` setting: + +.. code-block:: apache Options Indexes FollowSymLinks @@ -132,7 +136,9 @@ Enabling vhost_alias_module --------------------------- Make sure that the virtual hosting module is enabled (uncommented) in the main -configuration file, e.g., **apache2/conf/httpd.conf**:: +configuration file, e.g., **apache2/conf/httpd.conf**: + +.. code-block:: apache LoadModule vhost_alias_module modules/mod_vhost_alias.so @@ -151,7 +157,9 @@ Setting VirtualHost ------------------- Add a ```` element for your webapp inside the virtual hosting configuration, -e.g., **apache2/conf/extra/httpd-vhost.conf**:: +e.g., **apache2/conf/extra/httpd-vhost.conf**: + +.. code-block:: apache DocumentRoot "/opt/lamp/apache2/htdocs/myproject/public" @@ -179,60 +187,66 @@ The following assumes that the server is already configured for mod_userdir. A g Because CodeIgniter4 expects the server to find the framework front controller at **public/index.php** by default, you must specify this location as an alternative to search for the request (even if CodeIgniter4 is installed within the per-user web directory). -The default user web directory **~/public_html** is specified by the ``UserDir`` directive, typically in **apache2/mods-available/userdir.conf** or **apache2/conf/extra/httpd-userdir.conf**:: +The default user web directory **~/public_html** is specified by the ``UserDir`` directive, typically in **apache2/mods-available/userdir.conf** or **apache2/conf/extra/httpd-userdir.conf**: + +.. code-block:: apache UserDir public_html -So you will need to configure Apache to look for CodeIgniter's public directory first before trying to serve the default:: +So you will need to configure Apache to look for CodeIgniter's public directory first before trying to serve the default: + +.. code-block:: apache UserDir "public_html/public" "public_html" -Be sure to specify options and permissions for the CodeIgniter public directory as well. A **userdir.conf** might look like:: +Be sure to specify options and permissions for the CodeIgniter public directory as well. A **userdir.conf** might look like: + +.. code-block:: apache UserDir "public_html/public" "public_html" UserDir disabled root - AllowOverride All - Options MultiViews Indexes FollowSymLinks - - # Apache <= 2.2: - # Order allow,deny - # Allow from all - - # Apache >= 2.4: - Require all granted - - - # Apache <= 2.2: - # Order deny,allow - # Deny from all - - # Apache >= 2.4: - Require all denied - + AllowOverride All + Options MultiViews Indexes FollowSymLinks + + # Apache <= 2.2: + # Order allow,deny + # Allow from all + + # Apache >= 2.4: + Require all granted + + + # Apache <= 2.2: + # Order deny,allow + # Deny from all + + # Apache >= 2.4: + Require all denied + - AllowOverride All - Options MultiViews Indexes FollowSymLinks - - # Apache <= 2.2: - # Order allow,deny - # Allow from all - - # Apache >= 2.4: - Require all granted - - - # Apache <= 2.2: - # Order deny,allow - # Deny from all - - # Apache >= 2.4: - Require all denied - + AllowOverride All + Options MultiViews Indexes FollowSymLinks + + # Apache <= 2.2: + # Order allow,deny + # Allow from all + + # Apache >= 2.4: + Require all granted + + + # Apache <= 2.2: + # Order deny,allow + # Deny from all + + # Apache >= 2.4: + Require all denied + From 9afea6f090622e8fa58fa034591c6fa6a09b8ce2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 13:32:36 +0900 Subject: [PATCH 4222/8282] docs: add new line --- user_guide_src/source/installation/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 7b763c5ae616..1aa88e9b8e64 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -147,8 +147,8 @@ Adding Host Alias Add a host alias in your "hosts" file, typically **/etc/hosts** on unix-type platforms, or **c:/Windows/System32/drivers/etc/hosts** on Windows. -Add a line to the file. +Add a line to the file. This could be ``myproject.local`` or ``myproject.test``, for instance:: 127.0.0.1 myproject.local From d98ec38e635981ff025bed2b3a4252145e6fefb5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 13:32:52 +0900 Subject: [PATCH 4223/8282] docs: change location of project folder and explanin folder structure --- user_guide_src/source/installation/running.rst | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 1aa88e9b8e64..52b7281bf283 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -162,14 +162,25 @@ e.g., **apache2/conf/extra/httpd-vhost.conf**: .. code-block:: apache - DocumentRoot "/opt/lamp/apache2/htdocs/myproject/public" + DocumentRoot "/opt/lamp/apache2/myproject/public" ServerName myproject.local ErrorLog "logs/myproject-error_log" CustomLog "logs/myproject-access_log" common + + + AllowOverride All + Require all granted + -If your project folder is not a subfolder of the Apache document root, then your -```` element may need a nested ```` element to grant the web server access to the files. +The above configuration assumes the project folder is located as follows: + +.. code-block:: text + + apache2/ + ├── myproject/ (Project Folder) + │ └── public/ (DocumentRoot for myproject.local) + └── htdocs/ Testing ------- From 45165e101c239902a59b7805bdeae29e7d08a0e0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 06:36:24 +0900 Subject: [PATCH 4224/8282] docs: fix directory separator for Windows --- user_guide_src/source/installation/running.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index 52b7281bf283..eda284684642 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -146,7 +146,7 @@ Adding Host Alias ----------------- Add a host alias in your "hosts" file, typically **/etc/hosts** on unix-type platforms, -or **c:/Windows/System32/drivers/etc/hosts** on Windows. +or **c:\Windows\System32\drivers\etc\hosts** on Windows. Add a line to the file. This could be ``myproject.local`` or ``myproject.test``, for instance:: From d2511e5efb9d93d384605b3ae33ba0c5487823ae Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 8 Jul 2023 11:06:42 +0900 Subject: [PATCH 4225/8282] docs: add "Hosting with Subfolder" --- .../source/installation/running.rst | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst index eda284684642..c75d4a24120c 100644 --- a/user_guide_src/source/installation/running.rst +++ b/user_guide_src/source/installation/running.rst @@ -182,6 +182,8 @@ The above configuration assumes the project folder is located as follows: │ └── public/ (DocumentRoot for myproject.local) └── htdocs/ +Restart Apache. + Testing ------- @@ -189,6 +191,77 @@ With the above configuration, your webapp would be accessed with the URL **http: Apache needs to be restarted whenever you change its configuration. +Hosting with Subfolder +====================== + +If you want a baseURL like **http://localhost/myproject/** with a subfolder, +there are three ways. + +Making Symlink +-------------- + +Place your project folder as follows, where **htdocs** is the Apache document root:: + + ├── myproject/ (project folder) + │ └── public/ + └── htdocs/ + +Navigate to the **htdocs** folder and create a symbolic link as follows:: + + > cd htdocs/ + > ln -s ../myproject/public/ myproject + +Using Alias +----------- + +Place your project folder as follows, where **htdocs** is the Apache document root:: + + ├── myproject/ (project folder) + │ └── public/ + └── htdocs/ + +Add the following in the main configuration file, e.g., **apache2/conf/httpd.conf**: + +.. code-block:: apache + + Alias /myproject /opt/lamp/apache2/myproject/public + + AllowOverride All + Require all granted + + +Restart Apache. + +Adding .htaccess +---------------- + +The last resort is to add **.htaccess** to the project root. + +It is not recommended that you place the project folder in the document root. +However, if you have no other choice, like on a shared server, you can use this. + +Place your project folder as follows, where **htdocs** is the Apache document root, +and create the **.htaccess** file:: + + └── htdocs/ + └── myproject/ (project folder) + ├── .htaccess + └── public/ + +And edit **.htaccess** as follows: + +.. code-block:: apache + + + RewriteEngine On + RewriteRule ^(.*)$ public/$1 [L] + + + + Require all denied + Satisfy All + + Hosting with mod_userdir (Shared Hosts) ======================================= From 00661b9cc288c0355e656a45e12225f8512e3d63 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 12:15:01 +0900 Subject: [PATCH 4226/8282] docs: add comments --- system/Cache/Handlers/FileHandler.php | 2 ++ system/Cache/Handlers/MemcachedHandler.php | 3 +++ system/Cache/Handlers/PredisHandler.php | 3 +++ system/Cache/Handlers/RedisHandler.php | 3 +++ system/Cache/Handlers/WincacheHandler.php | 3 +++ 5 files changed, 14 insertions(+) diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php index 9d1179feb82a..524ee8e47720 100644 --- a/system/Cache/Handlers/FileHandler.php +++ b/system/Cache/Handlers/FileHandler.php @@ -44,6 +44,8 @@ class FileHandler extends BaseHandler protected $mode; /** + * Note: Use `CacheFactory::getHandler()` to instantiate. + * * @throws CacheException */ public function __construct(Cache $config) diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php index 5053b1a6752a..f38a541113a1 100644 --- a/system/Cache/Handlers/MemcachedHandler.php +++ b/system/Cache/Handlers/MemcachedHandler.php @@ -42,6 +42,9 @@ class MemcachedHandler extends BaseHandler 'raw' => false, ]; + /** + * Note: Use `CacheFactory::getHandler()` to instantiate. + */ public function __construct(Cache $config) { $this->prefix = $config->prefix; diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php index cf44f634e86b..ab4fb1ff0a46 100644 --- a/system/Cache/Handlers/PredisHandler.php +++ b/system/Cache/Handlers/PredisHandler.php @@ -43,6 +43,9 @@ class PredisHandler extends BaseHandler */ protected $redis; + /** + * Note: Use `CacheFactory::getHandler()` to instantiate. + */ public function __construct(Cache $config) { $this->prefix = $config->prefix; diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php index acb024ca0839..adb9a581a75a 100644 --- a/system/Cache/Handlers/RedisHandler.php +++ b/system/Cache/Handlers/RedisHandler.php @@ -42,6 +42,9 @@ class RedisHandler extends BaseHandler */ protected $redis; + /** + * Note: Use `CacheFactory::getHandler()` to instantiate. + */ public function __construct(Cache $config) { $this->prefix = $config->prefix; diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php index e422dc1fad00..c5f0f08467e9 100644 --- a/system/Cache/Handlers/WincacheHandler.php +++ b/system/Cache/Handlers/WincacheHandler.php @@ -22,6 +22,9 @@ */ class WincacheHandler extends BaseHandler { + /** + * Note: Use `CacheFactory::getHandler()` to instantiate. + */ public function __construct(Cache $config) { $this->prefix = $config->prefix; From c95912e11a71dec3f47416ee675ee4e86f606b79 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 09:31:43 +0900 Subject: [PATCH 4227/8282] fix: auto-routing legacy with $routes->add() behavior If you $routes->add(), the controller was inaccessible with auto-routing legacy. --- phpstan-baseline.neon.dist | 7 +----- system/Router/AutoRouter.php | 45 +++++++++++++++++++++--------------- system/Router/Router.php | 3 ++- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist index 5fd27c7bbabd..639b6dc79f5a 100644 --- a/phpstan-baseline.neon.dist +++ b/phpstan-baseline.neon.dist @@ -197,16 +197,11 @@ parameters: - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(.*\\)\\.$#" - count: 2 - path: system/Router/Router.php - - - - message: "#^Expression on left side of \\?\\? is not nullable\\.$#" count: 1 path: system/Router/Router.php - - message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#" + message: "#^Expression on left side of \\?\\? is not nullable\\.$#" count: 1 path: system/Router/Router.php diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php index 3096b3bbd6f9..fb50f5a438fe 100644 --- a/system/Router/AutoRouter.php +++ b/system/Router/AutoRouter.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Router; +use Closure; use CodeIgniter\Exceptions\PageNotFoundException; /** @@ -19,11 +20,11 @@ final class AutoRouter implements AutoRouterInterface { /** - * List of controllers registered for the CLI verb that should not be accessed in the web. + * List of CLI routes. * - * @var class-string[] + * @var array [routeKey => handler] */ - private array $protectedControllers; + private array $cliRoutes; /** * Sub-directory that contains the requested controller class. @@ -58,17 +59,17 @@ final class AutoRouter implements AutoRouterInterface private string $defaultNamespace; public function __construct( - array $protectedControllers, + array $cliRoutes, string $defaultNamespace, string $defaultController, string $defaultMethod, bool $translateURIDashes, string $httpVerb ) { - $this->protectedControllers = $protectedControllers; - $this->defaultNamespace = $defaultNamespace; - $this->translateURIDashes = $translateURIDashes; - $this->httpVerb = $httpVerb; + $this->cliRoutes = $cliRoutes; + $this->defaultNamespace = $defaultNamespace; + $this->translateURIDashes = $translateURIDashes; + $this->httpVerb = $httpVerb; $this->controller = $defaultController; $this->method = $defaultMethod; @@ -126,18 +127,24 @@ public function getRoute(string $uri, string $httpVerb): array $controller .= $controllerName; $controller = strtolower($controller); - - foreach ($this->protectedControllers as $controllerInRoute) { - if (! is_string($controllerInRoute)) { - continue; - } - if (strtolower($controllerInRoute) !== $controller) { - continue; + $methodName = strtolower($this->methodName()); + + foreach ($this->cliRoutes as $handler) { + if (is_string($handler)) { + $handler = strtolower($handler); + + if (strpos($handler, $controller . '::' . $methodName) === 0) { + throw new PageNotFoundException( + 'Cannot access CLI Route: ' . $uri + ); + } + + if ($handler === $controller) { + throw new PageNotFoundException( + 'Cannot access CLI Route: ' . $uri + ); + } } - - throw new PageNotFoundException( - 'Cannot access the controller in a CLI Route. Controller: ' . $controllerInRoute - ); } } diff --git a/system/Router/Router.php b/system/Router/Router.php index be698003cbe5..6d01de217e20 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -145,7 +145,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request ); } else { $this->autoRouter = new AutoRouter( - $this->collection->getRegisteredControllers('cli'), + $this->collection->getRoutes('cli'), // @phpstan-ignore-line $this->collection->getDefaultNamespace(), $this->collection->getDefaultController(), $this->collection->getDefaultMethod(), @@ -393,6 +393,7 @@ public function getLocale() */ protected function checkRoutes(string $uri): bool { + // @phpstan-ignore-next-line $routes = $this->collection->getRoutes($this->collection->getHTTPVerb()); // Don't waste any time From 7493f07d63d9496abcc16d620160d9d34235d6be Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 09:34:53 +0900 Subject: [PATCH 4228/8282] docs: change order of sentences --- user_guide_src/source/incoming/routing.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index a5d195f53e46..f1f4253b3c41 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -324,10 +324,12 @@ Command-Line Only Routes .. note:: It is recommended to use Spark Commands for CLI scripts instead of calling controllers via CLI. See the :doc:`../cli/cli_commands` page for detailed information. -You can create routes that work only from the command-line, and are inaccessible from the web browser, with the -``cli()`` method. Any route created by any of the HTTP-verb-based +Any route created by any of the HTTP-verb-based route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be -available from the command line: +available from the command line. + +You can create routes that work only from the command-line, and are inaccessible from the web browser, with the +``cli()`` method: .. literalinclude:: routing/032.php From 2f16b45da33b0feef17d0da5c867de1fd3ae0f81 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 10:25:27 +0900 Subject: [PATCH 4229/8282] test: update test --- tests/system/Test/FeatureTestTraitTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 33a29d522f47..6cebdae1a50a 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -325,7 +325,7 @@ public function provideRoutesData() public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet) { $this->expectException(PageNotFoundException::class); - $this->expectExceptionMessage('Cannot access the controller in a CLI Route.'); + $this->expectExceptionMessage('Cannot access CLI Route: '); $collection = Services::routes(); $collection->setAutoRoute(true); From f96e13200e3c290862c6fb89f5c6e0454b1cc189 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 10:38:05 +0900 Subject: [PATCH 4230/8282] fix: prohibit CLI route with parameterized method --- system/Router/AutoRouter.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php index fb50f5a438fe..80af8b8d5347 100644 --- a/system/Router/AutoRouter.php +++ b/system/Router/AutoRouter.php @@ -133,6 +133,13 @@ public function getRoute(string $uri, string $httpVerb): array if (is_string($handler)) { $handler = strtolower($handler); + // Like $routes->cli('hello/(:segment)', 'Home::$1') + if (strpos($handler, '::$') !== false) { + throw new PageNotFoundException( + 'Cannot access CLI Route: ' . $uri + ); + } + if (strpos($handler, $controller . '::' . $methodName) === 0) { throw new PageNotFoundException( 'Cannot access CLI Route: ' . $uri From 6d2cefc60c01f52dbc86807ddd72692225295de6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 11:40:00 +0900 Subject: [PATCH 4231/8282] fix: $cliRoutes contains only CLI routes, not '*' routes --- system/Router/AutoRouter.php | 2 +- system/Router/RouteCollection.php | 10 ++++++++-- system/Router/Router.php | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php index 80af8b8d5347..1475def4fb53 100644 --- a/system/Router/AutoRouter.php +++ b/system/Router/AutoRouter.php @@ -20,7 +20,7 @@ final class AutoRouter implements AutoRouterInterface { /** - * List of CLI routes. + * List of CLI routes that do not contain '*' routes. * * @var array [routeKey => handler] */ diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 3f728da77ce3..4daf43cabb3f 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -484,8 +484,10 @@ public function shouldAutoRoute(): bool /** * Returns the raw array of available routes. + * + * @param bool $only Whether to return without '*' routes. */ - public function getRoutes(?string $verb = null): array + public function getRoutes(?string $verb = null, bool $only = false): array { if (empty($verb)) { $verb = $this->getHTTPVerb(); @@ -501,7 +503,11 @@ public function getRoutes(?string $verb = null): array if (isset($this->routes[$verb])) { // Keep current verb's routes at the beginning, so they're matched // before any of the generic, "add" routes. - $collection = $this->routes[$verb] + ($this->routes['*'] ?? []); + if (! $only) { + $collection = $this->routes[$verb] + ($this->routes['*'] ?? []); + } else { + $collection = $this->routes[$verb]; + } foreach ($collection as $r) { $key = key($r['route']); diff --git a/system/Router/Router.php b/system/Router/Router.php index 6d01de217e20..6c024e61f28f 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -145,7 +145,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request ); } else { $this->autoRouter = new AutoRouter( - $this->collection->getRoutes('cli'), // @phpstan-ignore-line + $this->collection->getRoutes('cli', true), // @phpstan-ignore-line $this->collection->getDefaultNamespace(), $this->collection->getDefaultController(), $this->collection->getDefaultMethod(), From 9c62817dca2d379e5f95e8567590acbec3bcd312 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 13:32:53 +0900 Subject: [PATCH 4232/8282] refactor: remove `if` --- system/Router/RouteCollection.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 4daf43cabb3f..440f23cc0269 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -503,11 +503,7 @@ public function getRoutes(?string $verb = null, bool $only = false): array if (isset($this->routes[$verb])) { // Keep current verb's routes at the beginning, so they're matched // before any of the generic, "add" routes. - if (! $only) { - $collection = $this->routes[$verb] + ($this->routes['*'] ?? []); - } else { - $collection = $this->routes[$verb]; - } + $collection = ! $only ? $this->routes[$verb] + ($this->routes['*'] ?? []) : $this->routes[$verb]; foreach ($collection as $r) { $key = key($r['route']); From a70eafb4caf794f1dd3a667595d55ef0091c817c Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 10 Jul 2023 09:41:31 +0900 Subject: [PATCH 4233/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.3.7.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.7.rst b/user_guide_src/source/changelogs/v4.3.7.rst index 47fc19f161d1..c35d8e4e6182 100644 --- a/user_guide_src/source/changelogs/v4.3.7.rst +++ b/user_guide_src/source/changelogs/v4.3.7.rst @@ -12,6 +12,10 @@ Release Date: Unreleased BREAKING ******** +- **RouteCollection:** The second parameter ``bool $only = false`` has been added + to the ``RouteCollection::getRoutes()`` method. +- **AutoRouting Legacy:** The first parameter of the ``AutoRouter::__construct()`` + has been changed from ``$protectedControllers`` to ``$cliRoutes``. - **FeatureTestTrait:** When using :ref:`withBodyFormat() `, the priority of the request body has been changed. See :ref:`Upgrading Guide ` for details. @@ -28,6 +32,10 @@ Deprecations Bugs Fixed ********** +- **AutoRouting Legacy:** Fixed a bug that when you added a route with + ``$routes->add()``, the controller's other methods were inaccessible from the + web browser. + See the repo's `CHANGELOG.md `_ for a complete list of bugs fixed. From bed018a6742bf129bfb199ae1404a00410b044df Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 13:19:01 +0900 Subject: [PATCH 4234/8282] refactor: improve parameter name --- system/Router/RouteCollection.php | 6 +++--- system/Router/Router.php | 2 +- user_guide_src/source/changelogs/v4.3.7.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 440f23cc0269..488315193454 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -485,9 +485,9 @@ public function shouldAutoRoute(): bool /** * Returns the raw array of available routes. * - * @param bool $only Whether to return without '*' routes. + * @param bool $includeWildcard Whether to include '*' routes. */ - public function getRoutes(?string $verb = null, bool $only = false): array + public function getRoutes(?string $verb = null, bool $includeWildcard = true): array { if (empty($verb)) { $verb = $this->getHTTPVerb(); @@ -503,7 +503,7 @@ public function getRoutes(?string $verb = null, bool $only = false): array if (isset($this->routes[$verb])) { // Keep current verb's routes at the beginning, so they're matched // before any of the generic, "add" routes. - $collection = ! $only ? $this->routes[$verb] + ($this->routes['*'] ?? []) : $this->routes[$verb]; + $collection = $includeWildcard ? $this->routes[$verb] + ($this->routes['*'] ?? []) : $this->routes[$verb]; foreach ($collection as $r) { $key = key($r['route']); diff --git a/system/Router/Router.php b/system/Router/Router.php index 6c024e61f28f..f0b9d2c9aab5 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -145,7 +145,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request ); } else { $this->autoRouter = new AutoRouter( - $this->collection->getRoutes('cli', true), // @phpstan-ignore-line + $this->collection->getRoutes('cli', false), // @phpstan-ignore-line $this->collection->getDefaultNamespace(), $this->collection->getDefaultController(), $this->collection->getDefaultMethod(), diff --git a/user_guide_src/source/changelogs/v4.3.7.rst b/user_guide_src/source/changelogs/v4.3.7.rst index c35d8e4e6182..01ffae52ab5d 100644 --- a/user_guide_src/source/changelogs/v4.3.7.rst +++ b/user_guide_src/source/changelogs/v4.3.7.rst @@ -12,8 +12,8 @@ Release Date: Unreleased BREAKING ******** -- **RouteCollection:** The second parameter ``bool $only = false`` has been added - to the ``RouteCollection::getRoutes()`` method. +- **RouteCollection:** The second parameter ``bool $includeWildcard = true`` has + been added to the ``RouteCollection::getRoutes()`` method. - **AutoRouting Legacy:** The first parameter of the ``AutoRouter::__construct()`` has been changed from ``$protectedControllers`` to ``$cliRoutes``. - **FeatureTestTrait:** When using :ref:`withBodyFormat() `, From 03cbbdb59fbc25eba5f0dadb2054fc1cbb319b40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 15:38:21 +0000 Subject: [PATCH 4235/8282] build(deps-dev): update rector/rector requirement from 0.17.3 to 0.17.5 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.17.3...0.17.5) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5eb5760d6142..ad742c57ec99 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.3", + "rector/rector": "0.17.5", "vimeo/psalm": "^5.0" }, "suggest": { From 998eb53916d6d985a2452e7daec934956bc11bdd Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 10:55:50 +0900 Subject: [PATCH 4236/8282] docs: remove Migrate controller sample It is not recommended to use a controller for migration. Using CLI is recommended. --- user_guide_src/source/dbmgmt/migration.rst | 17 ++++------------ .../source/dbmgmt/migration/005.php | 20 ------------------- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 user_guide_src/source/dbmgmt/migration/005.php diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 616f782dce01..197e42d4a557 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -9,9 +9,9 @@ need to go and run them. You would also have to keep track of which changes need to be run against the production machines next time you deploy. The database table **migrations** tracks which migrations have already been -run so all you have to do is make sure your migrations are in place and -call ``$migration->latest()`` to bring the database up to the most recent -state. You can also use ``$migration->setNamespace(null)->latest()`` to +run, so all you have to do is make sure your migrations are in place and +run the ``spark migrate`` command to bring the database up to the most recent +state. You can also use ``spark migrate --all`` to include migrations from all namespaces. .. contents:: @@ -94,15 +94,6 @@ This will look for any migrations located at both **APPPATH/Database/Migrations* **ROOTPATH/MyCompany/Database/Migrations**. This makes it simple to include migrations in your re-usable, modular code suites. -************* -Usage Example -************* - -In this example some simple code is placed in **app/Controllers/Migrate.php** -to update the schema: - -.. literalinclude:: migration/005.php - .. _command-line-tools: ******************* @@ -110,7 +101,7 @@ Command-Line Tools ******************* CodeIgniter ships with several :doc:`commands ` that are available from the command line to help -you work with migrations. These tools are not required to use migrations but might make things easier for those of you +you work with migrations. These tools make things easier for those of you that wish to use them. The tools primarily provide access to the same methods that are available within the MigrationRunner class. migrate diff --git a/user_guide_src/source/dbmgmt/migration/005.php b/user_guide_src/source/dbmgmt/migration/005.php deleted file mode 100644 index e9b4c2ad37fe..000000000000 --- a/user_guide_src/source/dbmgmt/migration/005.php +++ /dev/null @@ -1,20 +0,0 @@ -latest(); - } catch (Throwable $e) { - // Do something with the error here... - } - } -} From f203918d7776777d8b8c44e19ad7c95aa9de41c1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 10:58:57 +0900 Subject: [PATCH 4237/8282] docs: add "..." to command output --- user_guide_src/source/dbmgmt/migration.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 197e42d4a557..59fad21b2415 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -162,6 +162,9 @@ status Displays a list of all migrations and the date and time they ran, or '--' if they have not been run:: > php spark migrate:status + + ... + +----------------------+-------------------+-----------------------+---------+---------------------+-------+ | Namespace | Version | Filename | Group | Migrated On | Batch | +----------------------+-------------------+-----------------------+---------+---------------------+-------+ From 5624e4bf37df08eec87817127cfd48a123a29d43 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 10:59:15 +0900 Subject: [PATCH 4238/8282] docs: separate options for database sessions --- user_guide_src/source/dbmgmt/migration.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 59fad21b2415..4a2f6229335f 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -188,13 +188,17 @@ creates is the Pascal case version of the filename. > php spark make:migration [options] -You can use (make:migration) with the following options: +You can use (``make:migration``) with the following options: + +- ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``. +- ``--suffix`` - Append the component title to the class name. + +The following options are also available to generate the migration file for +database sessions: - ``--session`` - Generates the migration file for database sessions. - ``--table`` - Table name to use for database sessions. Default: ``ci_sessions``. - ``--dbgroup`` - Database group to use for database sessions. Default: ``default``. -- ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``. -- ``--suffix`` - Append the component title to the class name. ********************* Migration Preferences From a634472b22298023cefe1a45016849d76514bc75 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 11:01:35 +0900 Subject: [PATCH 4239/8282] docs: fix text decoration --- user_guide_src/source/dbmgmt/migration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 4a2f6229335f..ccb2827e9947 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -227,7 +227,7 @@ Class Reference :returns: An array of migration files :rtype: array - An array of migration filenames are returned that are found in the **path** property. + An array of migration filenames are returned that are found in the ``path`` property. .. php:method:: latest($group) @@ -257,7 +257,7 @@ Class Reference :returns: ``true`` on success, ``false`` on failure :rtype: bool - This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated. + This forces a single file to migrate regardless of order or batches. Method ``up()`` or ``down()`` is detected based on whether it has already been migrated. .. note:: This method is recommended only for testing and could cause data consistency issues. From 46a2703e6115fd7506c22df2649afecd8550701e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 16:03:34 +0900 Subject: [PATCH 4240/8282] refactor: use new Paths() instead of config() `new Paths()` is faster than config(), and Paths is immutable. --- app/Config/Paths.php | 2 ++ system/Config/Services.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Config/Paths.php b/app/Config/Paths.php index e419477a51ec..01d5a8132db5 100644 --- a/app/Config/Paths.php +++ b/app/Config/Paths.php @@ -12,6 +12,8 @@ * share a system folder between multiple applications, and more. * * All paths are relative to the project's root folder. + * + * @immutable */ class Paths { diff --git a/system/Config/Services.php b/system/Config/Services.php index a47faf9c53ed..66d0532e5e47 100644 --- a/system/Config/Services.php +++ b/system/Config/Services.php @@ -461,7 +461,7 @@ public static function parser(?string $viewPath = null, ?ViewConfig $config = nu return static::getSharedInstance('parser', $viewPath, $config); } - $viewPath = $viewPath ?: config(Paths::class)->viewDirectory; + $viewPath = $viewPath ?: (new Paths())->viewDirectory; $config ??= config(ViewConfig::class); return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger()); @@ -480,7 +480,7 @@ public static function renderer(?string $viewPath = null, ?ViewConfig $config = return static::getSharedInstance('renderer', $viewPath, $config); } - $viewPath = $viewPath ?: config(Paths::class)->viewDirectory; + $viewPath = $viewPath ?: (new Paths())->viewDirectory; $config ??= config(ViewConfig::class); return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger()); From cdf6b225f4ec426342ff184b97f98048b2d6ac35 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Thu, 13 Jul 2023 09:12:38 +0200 Subject: [PATCH 4241/8282] Update number_helper.php --- system/Helpers/number_helper.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 5f0e59232fb3..0b7c22b0c959 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -69,7 +69,9 @@ function number_to_size($num, int $precision = 1, ?string $locale = null) * * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers * - * @param int|string $num + * @param int|string $num Will be cast as int + * @param int $precision [optional] The optional number of decimal digits to round to. + * @param string $locale [optional] * * @return bool|string */ @@ -91,19 +93,19 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) $generalLocale = substr($locale, 0, $underscorePos); } - if ($num > 1_000_000_000_000_000) { + if ($num >= 1_000_000_000_000_000) { $suffix = lang('Number.quadrillion', [], $generalLocale); $num = round(($num / 1_000_000_000_000_000), $precision); - } elseif ($num > 1_000_000_000_000) { + } elseif ($num >= 1_000_000_000_000) { $suffix = lang('Number.trillion', [], $generalLocale); $num = round(($num / 1_000_000_000_000), $precision); - } elseif ($num > 1_000_000_000) { + } elseif ($num >= 1_000_000_000) { $suffix = lang('Number.billion', [], $generalLocale); $num = round(($num / 1_000_000_000), $precision); - } elseif ($num > 1_000_000) { + } elseif ($num >= 1_000_000) { $suffix = lang('Number.million', [], $generalLocale); $num = round(($num / 1_000_000), $precision); - } elseif ($num > 1000) { + } elseif ($num >= 1000) { $suffix = lang('Number.thousand', [], $generalLocale); $num = round(($num / 1000), $precision); } From 0af3f73a33b8c4f14b5a16a55b2f8d7a04263c3a Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Thu, 13 Jul 2023 09:13:47 +0200 Subject: [PATCH 4242/8282] Update NumberHelperTest.php --- tests/system/Helpers/NumberHelperTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php index 84f05607d4a3..b9faed213888 100755 --- a/tests/system/Helpers/NumberHelperTest.php +++ b/tests/system/Helpers/NumberHelperTest.php @@ -101,26 +101,45 @@ public function testTbFormat() public function testThousands() { $this->assertSame('123 thousand', number_to_amount('123,000', 0, 'en_US')); + $this->assertSame('1 thousand', number_to_amount('1000', 0, 'en_US')); + $this->assertSame('999 thousand', number_to_amount('999499', 0, 'en_US')); + $this->assertSame('1,000 thousand', number_to_amount('999500', 0, 'en_US')); + $this->assertSame('1,000 thousand', number_to_amount('999999', 0, 'en_US')); } public function testMillions() { $this->assertSame('123.4 million', number_to_amount('123,400,000', 1, 'en_US')); + $this->assertSame('1 million', number_to_amount('1,000,000', 1, 'en_US')); + $this->assertSame('1.5 million', number_to_amount('1,499,999', 1, 'en_US')); + $this->assertSame('1.5 million', number_to_amount('1,500,000', 1, 'en_US')); + $this->assertSame('1.5 million', number_to_amount('1,549,999', 1, 'en_US')); + $this->assertSame('1.6 million', number_to_amount('1,550,000', 1, 'en_US')); + $this->assertSame('999.5 million', number_to_amount('999,500,000', 1, 'en_US')); + $this->assertSame('1,000 million', number_to_amount('999,500,000', 0, 'en_US')); + $this->assertSame('1,000 million', number_to_amount('999,999,999', 1, 'en_US')); } public function testBillions() { $this->assertSame('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US')); + $this->assertSame('1 billion', number_to_amount('1,000,000,000', 2, 'en_US')); + $this->assertSame('1,000 billion', number_to_amount('999,999,999,999', 2, 'en_US')); } public function testTrillions() { $this->assertSame('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US')); + $this->assertSame('1 trillion', number_to_amount('1,000,000,000,000', 3, 'en_US')); + $this->assertSame('1,000 trillion', number_to_amount('999,999,999,999,999', 3, 'en_US')); } public function testQuadrillions() { $this->assertSame('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US')); + $this->assertSame('1 quadrillion', number_to_amount('1,000,000,000,000,000', 0, 'en_US')); + $this->assertSame('1,000 quadrillion', number_to_amount('999,999,999,999,999,999', 0, 'en_US')); + $this->assertSame('1,000 quadrillion', number_to_amount('1,000,000,000,000,000,000', 0, 'en_US')); } public function testCurrencyCurrentLocale() From 254435e8eb20466f93c1a589496f47cc4b53c218 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 16:14:59 +0900 Subject: [PATCH 4243/8282] docs: add notes --- app/Config/Autoload.php | 5 ++++- app/Config/Modules.php | 5 +++++ app/Config/Paths.php | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php index abd9df9dfd72..e9ee6613d22b 100644 --- a/app/Config/Autoload.php +++ b/app/Config/Autoload.php @@ -13,7 +13,10 @@ * can find the files as needed. * * NOTE: If you use an identical key in $psr4 or $classmap, then - * the values in this file will overwrite the framework's values. + * the values in this file will overwrite the framework's values. + * + * NOTE: This class is required prior to Autoloader instantiation, + * and does not extend BaseConfig. */ class Autoload extends AutoloadConfig { diff --git a/app/Config/Modules.php b/app/Config/Modules.php index 5b6a639b3957..7e4916dd8f5b 100644 --- a/app/Config/Modules.php +++ b/app/Config/Modules.php @@ -4,6 +4,11 @@ use CodeIgniter\Modules\Modules as BaseModules; +/** + * Modules Configuration. + * + * NOTE: This class is required prior to Autoloader instantiation. + */ class Modules extends BaseModules { /** diff --git a/app/Config/Paths.php b/app/Config/Paths.php index 01d5a8132db5..262c745ffa95 100644 --- a/app/Config/Paths.php +++ b/app/Config/Paths.php @@ -13,6 +13,9 @@ * * All paths are relative to the project's root folder. * + * NOTE: This class is required prior to Autoloader instantiation, + * and does not extend BaseConfig. + * * @immutable */ class Paths From e25fe3d1963c9cc54b3f2552d726abf5374d6208 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Thu, 13 Jul 2023 09:16:01 +0200 Subject: [PATCH 4244/8282] Update v4.3.7.rst --- user_guide_src/source/changelogs/v4.3.7.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.3.7.rst b/user_guide_src/source/changelogs/v4.3.7.rst index 47fc19f161d1..59939bc8ec3b 100644 --- a/user_guide_src/source/changelogs/v4.3.7.rst +++ b/user_guide_src/source/changelogs/v4.3.7.rst @@ -22,6 +22,10 @@ Message Changes Changes ******* +- The number helper function :php:func:`number_to_amount()`, which previously + returned "1000", has been corrected to return "1 thousand" when the number + is exactly 1000, for example. + Deprecations ************ From a2fed684946a02ce0df7e59d832ed62db7d5292c Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 16:15:36 +0900 Subject: [PATCH 4245/8282] docs: replace Note: with NOTE: For concisytency. --- app/Config/Cache.php | 3 ++- app/Config/ContentSecurityPolicy.php | 2 +- app/Config/Logger.php | 2 +- app/Config/Migrations.php | 2 +- app/Config/Modules.php | 3 ++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/Config/Cache.php b/app/Config/Cache.php index c19358ce8449..5ba93328110f 100644 --- a/app/Config/Cache.php +++ b/app/Config/Cache.php @@ -95,7 +95,8 @@ class Cache extends BaseConfig * A string of reserved characters that will not be allowed in keys or tags. * Strings that violate this restriction will cause handlers to throw. * Default: {}()/\@: - * Note: The default set is required for PSR-6 compliance. + * + * NOTE: The default set is required for PSR-6 compliance. */ public string $reservedCharacters = '{}()/\@:'; diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php index 18612e15cc37..7799c476f078 100644 --- a/app/Config/ContentSecurityPolicy.php +++ b/app/Config/ContentSecurityPolicy.php @@ -39,7 +39,7 @@ class ContentSecurityPolicy extends BaseConfig // ------------------------------------------------------------------------- // Sources allowed - // Note: once you set a policy to 'none', it cannot be further restricted + // NOTE: once you set a policy to 'none', it cannot be further restricted // ------------------------------------------------------------------------- /** diff --git a/app/Config/Logger.php b/app/Config/Logger.php index 7c7414d47228..3fb341c6c04f 100644 --- a/app/Config/Logger.php +++ b/app/Config/Logger.php @@ -99,7 +99,7 @@ class Logger extends BaseConfig * An extension of 'php' allows for protecting the log files via basic * scripting, when they are to be stored under a publicly accessible directory. * - * Note: Leaving it blank will default to 'log'. + * NOTE: Leaving it blank will default to 'log'. */ 'fileExtension' => '', diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php index af28e8ef508a..3c825667cf69 100644 --- a/app/Config/Migrations.php +++ b/app/Config/Migrations.php @@ -40,7 +40,7 @@ class Migrations extends BaseConfig * using the CLI command: * > php spark make:migration * - * Note: if you set an unsupported format, migration runner will not find + * NOTE: if you set an unsupported format, migration runner will not find * your migration files. * * Supported formats: diff --git a/app/Config/Modules.php b/app/Config/Modules.php index 7e4916dd8f5b..54079e771f29 100644 --- a/app/Config/Modules.php +++ b/app/Config/Modules.php @@ -7,7 +7,8 @@ /** * Modules Configuration. * - * NOTE: This class is required prior to Autoloader instantiation. + * NOTE: This class is required prior to Autoloader instantiation, + * and does not extend BaseConfig. */ class Modules extends BaseModules { From 60b76e8834cfcfcc0a5014a22a2be211df8f6697 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Thu, 13 Jul 2023 11:11:55 +0200 Subject: [PATCH 4246/8282] Update number_helper.php Optional nullable parameter in PHPDoc --- system/Helpers/number_helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 0b7c22b0c959..07d3be942cf5 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -69,9 +69,9 @@ function number_to_size($num, int $precision = 1, ?string $locale = null) * * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers * - * @param int|string $num Will be cast as int - * @param int $precision [optional] The optional number of decimal digits to round to. - * @param string $locale [optional] + * @param int|string $num Will be cast as int + * @param int $precision [optional] The optional number of decimal digits to round to. + * @param string|null $locale [optional] * * @return bool|string */ From 137f6d6607327e5606b2d77e3ed98595a377e176 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 13 Jul 2023 22:06:16 +0900 Subject: [PATCH 4247/8282] docs: update 404 links --- user_guide_src/source/testing/overview.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst index 41ececd1b2d4..653150c28d7c 100644 --- a/user_guide_src/source/testing/overview.rst +++ b/user_guide_src/source/testing/overview.rst @@ -150,7 +150,7 @@ Ensure that a header or cookie was actually emitted: .. literalinclude:: overview/009.php .. note:: the test case with this should be `run as a separate process - in PHPunit `_. + in PHPunit `_. assertHeaderNotEmitted($header, $ignoreCase = false) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -160,7 +160,7 @@ Ensure that a header or cookie was not emitted: .. literalinclude:: overview/010.php .. note:: the test case with this should be `run as a separate process - in PHPunit `_. + in PHPunit `_. assertCloseEnough($expected, $actual, $message = '', $tolerance = 1) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From eaf0cffd8dc7c946e3f5355c38fa4fe2c553478f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 14 Jul 2023 15:40:40 +0900 Subject: [PATCH 4248/8282] docs: improve warning --- user_guide_src/source/general/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index f6214e6397c3..2e666c8245c8 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -122,7 +122,7 @@ The loaded environment variables are accessed using any of the following: .. literalinclude:: configuration/005.php -.. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**. +.. warning:: Note that your settings from the **.env** file are added to ``$_SERVER`` and ``$_ENV``. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons), or a detailed error report in the ``development`` environment is shown, **your secure credentials are publicly exposed**. Nesting Variables ----------------- From 38a6c977dbde8096457159b39b8bfdcb7acdfb13 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 14 Jul 2023 15:41:10 +0900 Subject: [PATCH 4249/8282] docs: improve description --- user_guide_src/source/general/errors.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 6d6ddeb51e77..6273038bd0b1 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -3,9 +3,11 @@ Error Handling ############## CodeIgniter builds error reporting into your system through Exceptions, both the `SPL collection `_, as -well as a few custom exceptions that are provided by the framework. Depending on your environment's setup, +well as a few exceptions that are provided by the framework. + +Depending on your environment's setup, the default action when an error or exception is thrown is to display a detailed error report unless the application -is running under the ``production`` environment. In this case, a more generic message is displayed to +is running under the ``production`` environment. In the ``production`` environment, a more generic message is displayed to keep the best user experience for your users. .. contents:: From 5381d501525036aedbe84e135f81e405199efa59 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 14 Jul 2023 15:41:34 +0900 Subject: [PATCH 4250/8282] docs: add sub section title and improve description --- user_guide_src/source/general/errors.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 6273038bd0b1..609b2109dae3 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -45,7 +45,10 @@ the error handler to function as normal, you can throw a new exception within th Configuration ============= -By default, CodeIgniter will display all errors in the ``development`` and ``testing`` environments, and will not +Error Reporting +--------------- + +By default, CodeIgniter will display a detailed error report with all errors in the ``development`` and ``testing`` environments, and will not display any errors in the ``production`` environment. You can change this by setting the ``CI_ENVIRONMENT`` variable in the **.env** file. From b924bf4dd5d4d8e742a7eeaae5ed6efa91cf3d20 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 14 Jul 2023 15:42:11 +0900 Subject: [PATCH 4251/8282] docs: add warning --- user_guide_src/source/general/errors.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 609b2109dae3..8a75871343b8 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -54,6 +54,10 @@ in the **.env** file. .. important:: Disabling error reporting DOES NOT stop logs from being written if there are errors. +.. warning:: Note that your settings from the **.env** file are added to ``$_SERVER`` + and ``$_ENV``. As a side effect, this means that if the detailed error report + is displayed, **your secure credentials are publicly exposed**. + Logging Exceptions ------------------ From 69dad6e3c01d2571f9cc5bf1599399987bc44b12 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 14 Jul 2023 15:43:56 +0900 Subject: [PATCH 4252/8282] docs: add link to other page --- user_guide_src/source/general/errors.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 8a75871343b8..73f737671243 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -50,7 +50,7 @@ Error Reporting By default, CodeIgniter will display a detailed error report with all errors in the ``development`` and ``testing`` environments, and will not display any errors in the ``production`` environment. You can change this by setting the ``CI_ENVIRONMENT`` variable -in the **.env** file. +in the :ref:`.env ` file. .. important:: Disabling error reporting DOES NOT stop logs from being written if there are errors. From f4225d20fe1ba72c72265ccbf200497e77e56f3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:27:02 +0000 Subject: [PATCH 4253/8282] build(deps-dev): update rector/rector requirement from 0.17.5 to 0.17.6 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.17.5...0.17.6) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ad742c57ec99..996b6d9ed5b5 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.5", + "rector/rector": "0.17.6", "vimeo/psalm": "^5.0" }, "suggest": { From eb39818489a04ef375533683661c11026ec37db0 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Tue, 18 Jul 2023 05:02:40 +0700 Subject: [PATCH 4254/8282] [Rector] Enable skipped GetMockBuilderGetMockToCreateMockRector on EmailTest.php --- rector.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rector.php b/rector.php index df51a9b43b5a..c8e18dfd2096 100644 --- a/rector.php +++ b/rector.php @@ -39,7 +39,6 @@ use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector; use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector; use Rector\PHPUnit\Rector\MethodCall\AssertPropertyExistsRector; -use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector; use Rector\PHPUnit\Set\PHPUnitSetList; use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector; use Rector\Set\ValueObject\LevelSetList; @@ -108,11 +107,6 @@ // use mt_rand instead of random_int on purpose on non-cryptographically random RandomFunctionRector::class, - // @TODO remove if https://github.com/rectorphp/rector-phpunit/issues/86 is fixed - GetMockBuilderGetMockToCreateMockRector::class => [ - __DIR__ . '/tests/system/Email/EmailTest.php', - ], - SimplifyRegexPatternRector::class, ]); From 00c7086d7d380d9be31c5f808df5cc37ab793218 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 18 Jul 2023 17:25:10 +0800 Subject: [PATCH 4255/8282] Adjust registering of custom fixers for PHP 8.0+ only --- .php-cs-fixer.dist.php | 21 ++++++++++++++------- .php-cs-fixer.no-header.php | 21 ++++++++++++++------- .php-cs-fixer.user-guide.php | 21 ++++++++++++++------- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index b2f86c686252..3653cf1349c2 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -46,16 +46,23 @@ $overrides = []; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.cache', - 'finder' => $finder, - 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), - 'customRules' => [ - NoCodeSeparatorCommentFixer::name() => true, - ], + 'cacheFile' => 'build/.php-cs-fixer.cache', + 'finder' => $finder, ]; -return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( +$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( 'CodeIgniter 4 framework', 'CodeIgniter Foundation', 'admin@codeigniter.com' ); + +// @TODO: remove this check when support for PHP 7.4 is dropped +if (PHP_VERSION_ID >= 80000) { + $config + ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) + ->setRules(array_merge($config->getRules(), [ + NoCodeSeparatorCommentFixer::name() => true, + ])); +} + +return $config; diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index cd10717aa5a2..7c9ae1e80737 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -32,12 +32,19 @@ $overrides = []; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', - 'finder' => $finder, - 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), - 'customRules' => [ - NoCodeSeparatorCommentFixer::name() => true, - ], + 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', + 'finder' => $finder, ]; -return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); +$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); + +// @TODO: remove this check when support for PHP 7.4 is dropped +if (PHP_VERSION_ID >= 80000) { + $config + ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) + ->setRules(array_merge($config->getRules(), [ + NoCodeSeparatorCommentFixer::name() => true, + ])); +} + +return $config; diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 1fa41bc4fb42..a3ae78a48232 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -36,12 +36,19 @@ ]; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.user-guide.cache', - 'finder' => $finder, - 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), - 'customRules' => [ - NoCodeSeparatorCommentFixer::name() => true, - ], + 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', + 'finder' => $finder, ]; -return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); +$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); + +// @TODO: remove this check when support for PHP 7.4 is dropped +if (PHP_VERSION_ID >= 80000) { + $config + ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) + ->setRules(array_merge($config->getRules(), [ + NoCodeSeparatorCommentFixer::name() => true, + ])); +} + +return $config; From ac87a1e094028f56f9dfa378173a9f50af94bf00 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Mon, 17 Jul 2023 16:30:13 +0800 Subject: [PATCH 4256/8282] Configure `php_unit_data_provider_return_type` fixer --- .php-cs-fixer.dist.php | 4 +- .php-cs-fixer.no-header.php | 4 +- .php-cs-fixer.user-guide.php | 9 ++-- tests/system/CLI/CLITest.php | 2 +- .../system/Cache/Handlers/BaseHandlerTest.php | 2 +- .../system/Cache/Handlers/FileHandlerTest.php | 2 +- tests/system/CodeIgniterTest.php | 2 +- tests/system/Commands/CommandTest.php | 2 +- .../Routes/SampleURIGeneratorTest.php | 3 +- tests/system/CommonFunctionsTest.php | 2 +- tests/system/Config/MimesTest.php | 4 +- tests/system/Cookie/CookieTest.php | 3 +- tests/system/Database/BaseConnectionTest.php | 3 +- tests/system/Database/BaseQueryTest.php | 4 +- tests/system/Database/Builder/WhereTest.php | 4 +- tests/system/Database/ConfigTest.php | 3 +- tests/system/Email/EmailTest.php | 2 +- tests/system/Filters/FiltersTest.php | 2 +- tests/system/Filters/InvalidCharsTest.php | 4 +- tests/system/Format/XMLFormatterTest.php | 2 +- tests/system/HTTP/CLIRequestTest.php | 2 +- tests/system/HTTP/IncomingRequestTest.php | 7 ++-- tests/system/HTTP/MessageTest.php | 2 +- tests/system/HTTP/RequestTest.php | 2 +- tests/system/HTTP/ResponseTest.php | 4 +- tests/system/HTTP/URITest.php | 14 +++---- tests/system/Helpers/ArrayHelperTest.php | 4 +- tests/system/Helpers/InflectorHelperTest.php | 2 +- .../Helpers/URLHelper/CurrentUrlTest.php | 2 +- .../system/Helpers/URLHelper/MiscUrlTest.php | 28 ++++++------- .../system/Helpers/URLHelper/SiteUrlTest.php | 2 +- tests/system/I18n/TimeLegacyTest.php | 3 +- tests/system/I18n/TimeTest.php | 3 +- tests/system/Language/LanguageTest.php | 2 +- tests/system/Models/UpdateModelTest.php | 3 +- .../Publisher/PublisherRestrictionsTest.php | 4 +- .../RouteCollectionReverseRouteTest.php | 3 +- tests/system/Router/RouteCollectionTest.php | 6 +-- tests/system/Router/RouterTest.php | 2 +- tests/system/Test/DOMParserTest.php | 2 +- tests/system/Test/FeatureTestTraitTest.php | 2 +- tests/system/Test/TestResponseTest.php | 2 +- tests/system/Throttle/ThrottleTest.php | 2 +- .../system/Validation/CreditCardRulesTest.php | 3 +- tests/system/Validation/FormatRulesTest.php | 42 +++++++++---------- tests/system/Validation/RulesTest.php | 39 +++++++++-------- .../StrictRules/CreditCardRulesTest.php | 3 +- .../Validation/StrictRules/RulesTest.php | 11 +++-- tests/system/Validation/ValidationTest.php | 11 +++-- tests/system/View/ParserTest.php | 2 +- 50 files changed, 134 insertions(+), 143 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 3653cf1349c2..928f5b801071 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -43,7 +43,9 @@ __DIR__ . '/spark', ]); -$overrides = []; +$overrides = [ + 'php_unit_data_provider_return_type' => true, +]; $options = [ 'cacheFile' => 'build/.php-cs-fixer.cache', diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index 7c9ae1e80737..954a06ec0230 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -29,7 +29,9 @@ __DIR__ . '/admin/starter/builds', ]); -$overrides = []; +$overrides = [ + 'php_unit_data_provider_return_type' => true, +]; $options = [ 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index a3ae78a48232..c15d0dcca006 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -29,10 +29,11 @@ ]); $overrides = [ - 'echo_tag_syntax' => false, - 'php_unit_internal_class' => false, - 'no_unused_imports' => false, - 'class_attributes_separation' => false, + 'echo_tag_syntax' => false, + 'php_unit_internal_class' => false, + 'no_unused_imports' => false, + 'class_attributes_separation' => false, + 'php_unit_data_provider_return_type' => true, ]; $options = [ diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 0e8ed4db73a3..3068328aa9a8 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -463,7 +463,7 @@ public function testTable($tbody, $thead, $expected) $this->assertSame($this->getStreamFilterBuffer(), $expected); } - public function tableProvider() + public function tableProvider(): iterable { $head = [ 'ID', diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php index 9ece2ba2ddaf..ba1dd0b2491f 100644 --- a/tests/system/Cache/Handlers/BaseHandlerTest.php +++ b/tests/system/Cache/Handlers/BaseHandlerTest.php @@ -35,7 +35,7 @@ public function testValidateKeyInvalidType($input) BaseHandler::validateKey($input); } - public function invalidTypeProvider(): array + public function invalidTypeProvider(): iterable { return [ [true], diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index 4f354495c81a..6f5e6b82f8c5 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -296,7 +296,7 @@ public function testSaveMode(int $int, string $string): void $this->assertSame($string, $mode); } - public function modeProvider() + public function modeProvider(): iterable { return [ [ diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 9d3343bfbaa1..ae88e6f2f3a1 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -789,7 +789,7 @@ public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $e CITestStreamFilter::removeErrorFilter(); } - public function cacheQueryStringProvider(): array + public function cacheQueryStringProvider(): iterable { $testingUrls = [ 'test', // URL #1 diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php index 23323933e5c9..1101e08ef5b6 100644 --- a/tests/system/Commands/CommandTest.php +++ b/tests/system/Commands/CommandTest.php @@ -138,7 +138,7 @@ public function testCommandParsesArgsCorrectly(string $input, array $expected) $this->assertSame($expected, ParamsReveal::$args); } - public function commandArgsProvider(): array + public function commandArgsProvider(): iterable { return [ [ diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php index 4b7b8fa3e814..fe7bf12613a7 100644 --- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php +++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php @@ -13,7 +13,6 @@ use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; -use Generator; /** * @internal @@ -34,7 +33,7 @@ public function testGet(string $routeKey, string $expected) $this->assertSame($expected, $uri); } - public function routeKeyProvider(): Generator + public function routeKeyProvider(): iterable { yield from [ 'root' => ['/', '/'], diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index a0b5280ec6bc..b304eeab69eb 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -604,7 +604,7 @@ public function testCleanPathActuallyCleaningThePaths($input, $expected) $this->assertSame($expected, clean_path($input)); } - public function dirtyPathsProvider() + public function dirtyPathsProvider(): iterable { $ds = DIRECTORY_SEPARATOR; diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php index 4cbd09958238..1ff85dffefec 100644 --- a/tests/system/Config/MimesTest.php +++ b/tests/system/Config/MimesTest.php @@ -21,7 +21,7 @@ */ final class MimesTest extends CIUnitTestCase { - public function extensionsList() + public function extensionsList(): iterable { return [ 'null' => [ @@ -55,7 +55,7 @@ public function testGuessExtensionFromType(?string $expected, string $mime) $this->assertSame($expected, Mimes::guessExtensionFromType($mime)); } - public function mimesList() + public function mimesList(): iterable { return [ 'null' => [ diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index 86d01305d696..c69fb1b806d2 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -16,7 +16,6 @@ use Config\Cookie as CookieConfig; use DateTimeImmutable; use DateTimeZone; -use Generator; use LogicException; /** @@ -99,7 +98,7 @@ public function testConfigPrefix(string $configPrefix, string $optionPrefix, str $this->assertSame($expected, $cookie->getPrefixedName()); } - public function prefixProvider(): Generator + public function prefixProvider(): iterable { yield from [ ['prefix_', '', 'prefix_test'], diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php index 300e7f7fe5e0..ee59f55d6f2a 100644 --- a/tests/system/Database/BaseConnectionTest.php +++ b/tests/system/Database/BaseConnectionTest.php @@ -14,7 +14,6 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; -use Generator; use Throwable; /** @@ -184,7 +183,7 @@ public function testProtectIdentifiers( $this->assertSame($expected, $return); } - public function identifiersProvider(): Generator + public function identifiersProvider(): iterable { yield from [ // $prefixSingle, $protectIdentifiers, $fieldExists, $item, $expected diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php index 273c52491c15..c25d1cefec69 100644 --- a/tests/system/Database/BaseQueryTest.php +++ b/tests/system/Database/BaseQueryTest.php @@ -104,7 +104,7 @@ public function testSwapPrefix() $this->assertSame($newSQL, $query->getQuery()); } - public function queryTypes() + public function queryTypes(): iterable { return [ 'select' => [ @@ -577,7 +577,7 @@ public function testSwapPrefixAfterGetQuery() $this->assertSame($expected, $query->getQuery()); } - public function queryKeywords() + public function queryKeywords(): iterable { return [ 'highlightKeyWords' => [ diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index b4a1b90a59f4..df0a778f3c39 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -392,7 +392,7 @@ public function testWhereInSubQuery() $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); } - public function provideInvalidKeys() + public function provideInvalidKeys(): iterable { return [ 'null' => [null], @@ -413,7 +413,7 @@ public function testWhereInvalidKeyThrowInvalidArgumentException($key) $builder->whereIn($key, ['Politician', 'Accountant']); } - public function provideInvalidValues() + public function provideInvalidValues(): iterable { return [ 'null' => [null], diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php index 3e963749dd57..31d2e54a8e9c 100644 --- a/tests/system/Database/ConfigTest.php +++ b/tests/system/Database/ConfigTest.php @@ -13,7 +13,6 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; -use Generator; /** * @internal @@ -209,7 +208,7 @@ public function testConvertDSN(string $input, string $expected) $this->assertSame($expected, $this->getPrivateProperty($conn, 'DSN')); } - public function convertDSNProvider(): Generator + public function convertDSNProvider(): iterable { yield from [ [ diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php index d329e60103d2..cff60c7f9e0b 100644 --- a/tests/system/Email/EmailTest.php +++ b/tests/system/Email/EmailTest.php @@ -32,7 +32,7 @@ public function testEmailValidation() $this->assertStringContainsString('Invalid email address: "invalid"', $email->printDebugger()); } - public function autoClearProvider() + public function autoClearProvider(): iterable { return [ 'autoclear' => [true], diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index f111f4b957f6..80bd9cbbf0ca 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -208,7 +208,7 @@ public function testProcessMethodProcessGlobals() $this->assertSame($expected, $filters->initialize()->getFilters()); } - public function provideExcept() + public function provideExcept(): iterable { return [ [ diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php index becc601d816a..705d3bb70f0e 100644 --- a/tests/system/Filters/InvalidCharsTest.php +++ b/tests/system/Filters/InvalidCharsTest.php @@ -124,7 +124,7 @@ public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string $this->invalidChars->before($this->request); } - public function stringWithLineBreakAndTabProvider() + public function stringWithLineBreakAndTabProvider(): iterable { yield from [ ["String contains \n line break."], @@ -148,7 +148,7 @@ public function testCheckControlStringWithControlCharsCausesException(string $in $this->invalidChars->before($this->request); } - public function stringWithControlCharsProvider() + public function stringWithControlCharsProvider(): iterable { yield from [ ["String contains null char.\0"], diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php index c642d7e77eca..a97b108b088d 100644 --- a/tests/system/Format/XMLFormatterTest.php +++ b/tests/system/Format/XMLFormatterTest.php @@ -115,7 +115,7 @@ public function testValidatingInvalidTags(string $expected, array $input) $this->assertSame($expectedXML, $this->xmlFormatter->format($input)); } - public function invalidTagsProvider() + public function invalidTagsProvider(): iterable { return [ [ diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php index 574a9f48c26d..69106adf2219 100644 --- a/tests/system/HTTP/CLIRequestTest.php +++ b/tests/system/HTTP/CLIRequestTest.php @@ -517,7 +517,7 @@ public function testFetchGlobalWithEmptyNotation() $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]')); } - public function ipAddressChecks() + public function ipAddressChecks(): iterable { return [ 'empty' => [ diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index f6994f722ce9..b4ab3606ed8b 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -16,7 +16,6 @@ use CodeIgniter\HTTP\Files\UploadedFile; use CodeIgniter\Test\CIUnitTestCase; use Config\App; -use Generator; use InvalidArgumentException; use TypeError; @@ -519,7 +518,7 @@ public function testCanGrabGetRawInput() $this->assertSame($expected, $request->getRawInput()); } - public function provideRawInputVarChecks() + public function provideRawInputVarChecks(): iterable { return [ [ @@ -627,7 +626,7 @@ public function testIsHTTPMethodLowerCase(string $value) $this->assertTrue($request->is(strtolower($value))); } - public function provideIsHTTPMethods(): Generator + public function provideIsHTTPMethods(): iterable { yield from [ ['GET'], @@ -840,7 +839,7 @@ public function testGetPostIndexNotExists() $this->assertNull($this->request->getGetPost('gc')); } - public function providePathChecks() + public function providePathChecks(): iterable { return [ 'not /index.php' => [ diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index 8f96b267ad1e..86e870d3b073 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -185,7 +185,7 @@ public function testSetHeaderArrayValues() $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept')); } - public function provideArrayHeaderValue() + public function provideArrayHeaderValue(): iterable { return [ 'existing for next not append' => [ diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index 17cf45078fe0..ab19f05adfac 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -532,7 +532,7 @@ public function testFetchGlobalFiltersWithArrayChildElement() $this->assertSame($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT)); } - public function ipAddressChecks() + public function ipAddressChecks(): iterable { return [ 'empty' => [ diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index eb95ab3a33cc..ce320417748c 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -291,7 +291,7 @@ public function testRedirect( $this->assertSame($expectedCode, $response->getStatusCode()); } - public function provideForRedirect() + public function provideForRedirect(): iterable { yield from [ ['Apache/2.4.17', 'HTTP/1.1', 'GET', null, 302], @@ -337,7 +337,7 @@ public function testRedirectWithIIS( unset($_SERVER['SERVER_SOFTWARE']); } - public function provideForRedirectWithIIS() + public function provideForRedirectWithIIS(): iterable { yield from [ ['HTTP/1.1', 'GET', null, 302], diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index c9d6bb97f5d9..c65a363ac21e 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -136,7 +136,7 @@ public function testSimpleUri(string $url, string $expectedURL, string $expected $this->assertSame($expectedPath, $uri->getPath()); } - public function provideURLs(): array + public function provideURLs(): iterable { return [ '' => [ @@ -375,7 +375,7 @@ public function testSetPath(string $path, string $expectedURL, string $expectedP $this->assertSame($expectedPath, $uri->getPath()); } - public function providePaths(): array + public function providePaths(): iterable { return [ '' => [ @@ -431,7 +431,7 @@ public function providePaths(): array ]; } - public function invalidPaths() + public function invalidPaths(): iterable { return [ 'dot-segment' => [ @@ -555,7 +555,7 @@ public function testSetQueryThrowsErrorWhenFragmentPresentSilent() $this->assertSame('', $uri->getQuery()); } - public function authorityInfo() + public function authorityInfo(): iterable { return [ 'host-only' => [ @@ -590,7 +590,7 @@ public function testAuthorityReturnsExceptedValues($url, $expected) $this->assertSame($expected, $uri->getAuthority()); } - public function defaultPorts() + public function defaultPorts(): iterable { return [ 'http' => [ @@ -629,7 +629,7 @@ public function testSetAuthorityReconstitutes() $this->assertSame($authority, $uri->getAuthority()); } - public function defaultDots() + public function defaultDots(): iterable { return [ [ @@ -738,7 +738,7 @@ public function testRemoveDotSegments($path, $expected) $this->assertSame($expected, URI::removeDotSegments($path)); } - public function defaultResolutions() + public function defaultResolutions(): iterable { return [ [ diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php index a2db5b06e7d7..0202c8c8bf3c 100644 --- a/tests/system/Helpers/ArrayHelperTest.php +++ b/tests/system/Helpers/ArrayHelperTest.php @@ -320,7 +320,7 @@ public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data) array_sort_by_multiple_keys($data, $sortColumns); } - public static function deepSearchProvider() + public static function deepSearchProvider(): iterable { return [ [ @@ -346,7 +346,7 @@ public static function deepSearchProvider() ]; } - public static function sortByMultipleKeysProvider() + public static function sortByMultipleKeysProvider(): iterable { $seed = [ 0 => [ diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php index 42b55b661787..53f4ecfb5e80 100755 --- a/tests/system/Helpers/InflectorHelperTest.php +++ b/tests/system/Helpers/InflectorHelperTest.php @@ -243,7 +243,7 @@ public function testDasherize() } } - public function provideOrdinal() + public function provideOrdinal(): iterable { return [ ['st', 1], diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php index faee0608b54f..204a684aa857 100644 --- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php +++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php @@ -235,7 +235,7 @@ public function testUriStringSubfolderRelative() $this->assertSame('assets/image.jpg', uri_string()); } - public function urlIsProvider() + public function urlIsProvider(): iterable { return [ [ diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index b943722d3908..af3869dcafee 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -112,7 +112,7 @@ public function testIndexPageAlt() // Test anchor - public function anchorNormalPatterns() + public function anchorNormalPatterns(): iterable { return [ 'normal01' => [ @@ -171,7 +171,7 @@ public function testAnchor($expected = '', $uri = '', $title = '', $attributes = $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config)); } - public function anchorNoindexPatterns() + public function anchorNoindexPatterns(): iterable { return [ 'noindex01' => [ @@ -238,7 +238,7 @@ public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attri $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config)); } - public function anchorSubpagePatterns() + public function anchorSubpagePatterns(): iterable { return [ 'subpage01' => [ @@ -295,7 +295,7 @@ public function testAnchorTargetted($expected = '', $uri = '', $title = '', $att $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config)); } - public function anchorExamplePatterns() + public function anchorExamplePatterns(): iterable { return [ 'egpage01' => [ @@ -341,7 +341,7 @@ public function testAnchorExamples($expected = '', $uri = '', $title = '', $attr // Test anchor_popup - public function anchorPopupPatterns() + public function anchorPopupPatterns(): iterable { return [ 'normal01' => [ @@ -399,7 +399,7 @@ public function testAnchorPopup($expected = '', $uri = '', $title = '', $attribu // Test mailto - public function mailtoPatterns() + public function mailtoPatterns(): iterable { return [ 'page01' => [ @@ -438,7 +438,7 @@ public function testMailto($expected = '', $email = '', $title = '', $attributes // Test safe_mailto - public function safeMailtoPatterns() + public function safeMailtoPatterns(): iterable { return [ 'page01' => [ @@ -487,7 +487,7 @@ public function testSafeMailtoWithCsp() // Test auto_link - public function autolinkUrls() + public function autolinkUrls(): iterable { return [ 'test01' => [ @@ -536,7 +536,7 @@ public function testAutoLinkUrl($in, $out) $this->assertSame($out, auto_link($in, 'url')); } - public function autolinkEmails() + public function autolinkEmails(): iterable { return [ 'test01' => [ @@ -585,7 +585,7 @@ public function testAutoLinkEmail($in, $out) $this->assertSame($out, auto_link($in, 'email')); } - public function autolinkBoth() + public function autolinkBoth(): iterable { return [ 'test01' => [ @@ -634,7 +634,7 @@ public function testAutolinkBoth($in, $out) $this->assertSame($out, auto_link($in)); } - public function autolinkPopup() + public function autolinkPopup(): iterable { return [ 'test01' => [ @@ -685,7 +685,7 @@ public function testAutoLinkPopup($in, $out) // Test prep_url - public function prepUrlProvider() + public function prepUrlProvider(): iterable { // input, expected, secure return [ @@ -854,7 +854,7 @@ public function testUrlToThrowsOnEmptyOrMissingRoute(string $route) url_to($route); } - public function urlToProvider() + public function urlToProvider(): iterable { $page = config('App')->indexPage !== '' ? config('App')->indexPage . '/' : ''; @@ -874,7 +874,7 @@ public function urlToProvider() ]; } - public function urlToMissingRoutesProvider() + public function urlToMissingRoutesProvider(): iterable { return [ [ diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index acc2643b75ab..6017f3047790 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -81,7 +81,7 @@ public function testUrls( $this->assertSame($expectedBaseUrl, base_url($path, $scheme)); } - public function configProvider() + public function configProvider(): iterable { // baseURL, indexPage, scheme, secure, path, expectedSiteUrl, expectedBaseUrl return [ diff --git a/tests/system/I18n/TimeLegacyTest.php b/tests/system/I18n/TimeLegacyTest.php index 8fb19f6582ce..281970a8aa9d 100644 --- a/tests/system/I18n/TimeLegacyTest.php +++ b/tests/system/I18n/TimeLegacyTest.php @@ -17,7 +17,6 @@ use Config\App; use DateTime; use DateTimeZone; -use Generator; use IntlDateFormatter; use Locale; @@ -1159,7 +1158,7 @@ public function testToStringDoesNotDependOnLocale(string $locale) $this->assertSame('2017-03-10 12:00:00', (string) $time); } - public function provideLocales(): Generator + public function provideLocales(): iterable { yield from [ ['en'], diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index 8db1edd4207b..0b619600d550 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -17,7 +17,6 @@ use Config\App; use DateTime; use DateTimeZone; -use Generator; use IntlDateFormatter; use Locale; @@ -1171,7 +1170,7 @@ public function testToStringDoesNotDependOnLocale(string $locale) $this->assertSame('2017-03-10 12:00:00', (string) $time); } - public function provideLocales(): Generator + public function provideLocales(): iterable { yield from [ ['en'], diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index 8006ad6cf133..7f89baaa37b8 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -213,7 +213,7 @@ public function testPrioritizedLocator() $this->assertSame('billions and billions', lang('Core.bazillion', [], 'en')); } - public function MessageBundles() + public function MessageBundles(): iterable { return [ ['CLI'], diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php index 7a32626aeb42..bd57025dc87f 100644 --- a/tests/system/Models/UpdateModelTest.php +++ b/tests/system/Models/UpdateModelTest.php @@ -14,7 +14,6 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; -use Generator; use InvalidArgumentException; use stdClass; use Tests\Support\Models\EventModel; @@ -398,7 +397,7 @@ public function testUpdateThrowDatabaseExceptionWithoutWhereClause($id, string $ $this->model->update($id, ['name' => 'Foo Bar']); } - public function provideInvalidIds(): Generator + public function provideInvalidIds(): iterable { yield from [ [ diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php index 7c6c9788768b..f351a1791a73 100644 --- a/tests/system/Publisher/PublisherRestrictionsTest.php +++ b/tests/system/Publisher/PublisherRestrictionsTest.php @@ -69,7 +69,7 @@ public function testDefaultPublicRestrictions(string $path) $this->assertSame($expected, $errors[$file]->getMessage()); } - public function fileProvider() + public function fileProvider(): iterable { yield from [ 'php' => ['index.php'], @@ -99,7 +99,7 @@ public function testDestinations(string $destination, bool $allowed) $this->assertInstanceOf(Publisher::class, $publisher); } - public function destinationProvider() + public function destinationProvider(): iterable { return [ 'explicit' => [ diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php index 2e6de5aacdf7..4f0e37c94c82 100644 --- a/tests/system/Router/RouteCollectionReverseRouteTest.php +++ b/tests/system/Router/RouteCollectionReverseRouteTest.php @@ -15,7 +15,6 @@ use CodeIgniter\Router\Exceptions\RouterException; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; -use Generator; /** * @internal @@ -121,7 +120,7 @@ public function testReverseRoutingWithLocale() $this->assertSame('/en/contact', $routes->reverseRoute('myController::goto')); } - public function reverseRoutingHandlerProvider(): Generator + public function reverseRoutingHandlerProvider(): iterable { return yield from [ 'Omit namespace' => ['Galleries::showUserGallery'], diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 40c5da39b091..734420f73733 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -405,7 +405,7 @@ static function ($routes) { $this->assertSame($expected, $routes->getRoutes()); } - public function groupProvider() + public function groupProvider(): iterable { yield from [ ['admin', '/', [ @@ -1242,7 +1242,7 @@ static function () {}, $this->assertSame($options, $options1); } - public function optionsProvider() + public function optionsProvider(): iterable { yield from [ [ @@ -1657,7 +1657,7 @@ public function testZeroAsURIPath() $this->assertSame($expects, $router->handle('/0')); } - public function provideRouteDefaultNamespace() + public function provideRouteDefaultNamespace(): iterable { return [ 'with \\ prefix' => ['\App\Controllers'], diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index 5be01a47bfc6..1ba0ee9ed798 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -870,7 +870,7 @@ public function testRedirectRoute( $router->handle($url); } - public function provideRedirectCase(): array + public function provideRedirectCase(): iterable { // [$route, $redirectFrom, $redirectTo, $url, $expectedPath, $alias] return [ diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php index c1ca8194f4b7..49d5e4b5d955 100644 --- a/tests/system/Test/DOMParserTest.php +++ b/tests/system/Test/DOMParserTest.php @@ -79,7 +79,7 @@ public function testParseSelectorWithAttribute() $this->assertSame(['href' => 'http://example.com'], $selector['attr']); } - public function provideText() + public function provideText(): iterable { return [ 'en' => ['Hello World'], diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index 6cebdae1a50a..e26776d1fb29 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -284,7 +284,7 @@ public function testCallZeroAsPathGot404() $this->get('0'); } - public function provideRoutesData() + public function provideRoutesData(): iterable { return [ 'non parameterized cli' => [ diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php index 8abc71c6d9ed..63b7d9c7aa94 100644 --- a/tests/system/Test/TestResponseTest.php +++ b/tests/system/Test/TestResponseTest.php @@ -46,7 +46,7 @@ public function testIsOK(int $code, bool $isOk) /** * Provides status codes and their expected "OK" */ - public function statusCodeProvider(): array + public function statusCodeProvider(): iterable { return [ [ diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 2121636baefa..3bdd2e661224 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -208,7 +208,7 @@ public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $ } } - public function tokenTimeUsecases(): array + public function tokenTimeUsecases(): iterable { return [ '2 capacity / 200 seconds (100s refresh, 0.01 tokens/s) -> 5 checks, 1 cost each' => [ diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php index 13168eed2f5b..6ef13c5ecee5 100644 --- a/tests/system/Validation/CreditCardRulesTest.php +++ b/tests/system/Validation/CreditCardRulesTest.php @@ -13,7 +13,6 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Services; -use Generator; use Tests\Support\Validation\TestRules; /** @@ -64,7 +63,7 @@ public function testValidCCNumber(string $type, ?string $number, bool $expected) * * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm */ - public function creditCardProvider(): Generator + public function creditCardProvider(): iterable { yield from [ 'null_test' => [ diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php index 8e78750e494e..7f1de6439345 100644 --- a/tests/system/Validation/FormatRulesTest.php +++ b/tests/system/Validation/FormatRulesTest.php @@ -129,7 +129,7 @@ public function testValidURLStrictWithSchema() $this->assertFalse($this->validation->run($data)); } - public function urlProvider(): Generator + public function urlProvider(): iterable { yield from [ [ @@ -260,7 +260,7 @@ public function testValidEmails(?string $email, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function emailProviderSingle(): Generator + public function emailProviderSingle(): iterable { yield from [ [ @@ -278,7 +278,7 @@ public function emailProviderSingle(): Generator ]; } - public function emailsProvider(): Generator + public function emailsProvider(): iterable { yield from [ [ @@ -324,7 +324,7 @@ public function testValidIP(?string $ip, ?string $which, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function ipProvider(): Generator + public function ipProvider(): iterable { yield from [ [ @@ -393,7 +393,7 @@ public function testString($str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function stringProvider(): Generator + public function stringProvider(): iterable { yield from [ [ @@ -427,7 +427,7 @@ public function testAlpha(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function alphaProvider(): Generator + public function alphaProvider(): iterable { yield from [ [ @@ -469,7 +469,7 @@ public function testAlphaSpace(?string $value, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function alphaSpaceProvider(): Generator + public function alphaSpaceProvider(): iterable { yield from [ [ @@ -515,7 +515,7 @@ public function testAlphaNumeric(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function alphaNumericProvider(): Generator + public function alphaNumericProvider(): iterable { yield from [ [ @@ -553,7 +553,7 @@ public function testAlphaNumericPunct(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function alphaNumericPunctProvider(): Generator + public function alphaNumericPunctProvider(): iterable { yield from [ [ @@ -685,7 +685,7 @@ public function testAlphaDash(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function alphaDashProvider(): Generator + public function alphaDashProvider(): iterable { yield from [ [ @@ -723,7 +723,7 @@ public function testHex(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function hexProvider(): Generator + public function hexProvider(): iterable { yield from [ [ @@ -761,7 +761,7 @@ public function testNumeric(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function numericProvider(): Generator + public function numericProvider(): iterable { yield from [ [ @@ -837,7 +837,7 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void $this->assertsame($expected, $this->validation->run($data)); } - public function integerInvalidTypeDataProvider(): Generator + public function integerInvalidTypeDataProvider(): iterable { // TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given // yield 'array with int' => [ @@ -883,7 +883,7 @@ public function testInteger(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function integerProvider(): Generator + public function integerProvider(): iterable { yield from [ [ @@ -937,7 +937,7 @@ public function testDecimal(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function decimalProvider(): Generator + public function decimalProvider(): iterable { yield from [ [ @@ -995,7 +995,7 @@ public function testNatural(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function naturalProvider(): Generator + public function naturalProvider(): iterable { yield from [ [ @@ -1037,7 +1037,7 @@ public function testNaturalNoZero(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function naturalZeroProvider(): Generator + public function naturalZeroProvider(): iterable { yield from [ [ @@ -1079,7 +1079,7 @@ public function testBase64(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function base64Provider(): Generator + public function base64Provider(): iterable { yield from [ [ @@ -1113,7 +1113,7 @@ public function testJson(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function jsonProvider(): Generator + public function jsonProvider(): iterable { yield from [ [ @@ -1171,7 +1171,7 @@ public function testTimeZone(?string $str, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function timezoneProvider(): Generator + public function timezoneProvider(): iterable { yield from [ [ @@ -1209,7 +1209,7 @@ public function testValidDate(?string $str, ?string $format, bool $expected): vo $this->assertSame($expected, $this->validation->run($data)); } - public function validDateProvider(): Generator + public function validDateProvider(): iterable { yield from [ [ diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php index 7760401655d6..fe10358e20ce 100644 --- a/tests/system/Validation/RulesTest.php +++ b/tests/system/Validation/RulesTest.php @@ -13,7 +13,6 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Services; -use Generator; use stdClass; use Tests\Support\Validation\TestRules; @@ -61,7 +60,7 @@ public function testRequired(array $data, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function provideRequiredCases(): Generator + public function provideRequiredCases(): iterable { yield from [ [['foo' => null], false], @@ -82,7 +81,7 @@ public function testIfExist(array $rules, array $data, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function ifExistProvider(): Generator + public function ifExistProvider(): iterable { yield from [ [ @@ -135,7 +134,7 @@ public function testPermitEmpty(array $rules, array $data, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function providePermitEmptyCases(): Generator + public function providePermitEmptyCases(): iterable { yield from [ // If the rule is only `permit_empty`, any value will pass. @@ -299,7 +298,7 @@ public function testMatches(array $data, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function provideMatchesCases(): Generator + public function provideMatchesCases(): iterable { yield from [ [['foo' => null, 'bar' => null], true], @@ -317,7 +316,7 @@ public function testMatchesNested(array $data, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function provideMatchesNestedCases(): Generator + public function provideMatchesNestedCases(): iterable { yield from [ [['nested' => ['foo' => 'match', 'bar' => 'match']], true], @@ -352,7 +351,7 @@ public function testEquals(array $data, string $param, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function provideEqualsCases(): Generator + public function provideEqualsCases(): iterable { yield from [ 'null' => [['foo' => null], '', false], @@ -372,7 +371,7 @@ public function testMinLength(?string $data, string $length, bool $expected): vo $this->assertSame($expected, $this->validation->run(['foo' => $data])); } - public function provideMinLengthCases(): Generator + public function provideMinLengthCases(): iterable { yield from [ 'null' => [null, '2', false], @@ -406,7 +405,7 @@ public function testExactLength(?string $data, bool $expected): void $this->assertSame($expected, $this->validation->run(['foo' => $data])); } - public function provideExactLengthCases(): Generator + public function provideExactLengthCases(): iterable { yield from [ 'null' => [null, false], @@ -433,7 +432,7 @@ public function testGreaterThan(?string $first, ?string $second, bool $expected) $this->assertSame($expected, $this->validation->run($data)); } - public function greaterThanProvider(): Generator + public function greaterThanProvider(): iterable { yield from [ ['-10', '-11', true], @@ -458,7 +457,7 @@ public function testGreaterThanEqual(?string $first, ?string $second, bool $expe $this->assertSame($expected, $this->validation->run($data)); } - public function greaterThanEqualProvider(): Generator + public function greaterThanEqualProvider(): iterable { yield from [ ['0', '0', true], @@ -484,7 +483,7 @@ public function testLessThan(?string $first, ?string $second, bool $expected): v $this->assertSame($expected, $this->validation->run($data)); } - public function lessThanProvider(): Generator + public function lessThanProvider(): iterable { yield from [ ['-10', '-11', false], @@ -510,7 +509,7 @@ public function testLessThanEqual(?string $first, ?string $second, bool $expecte $this->assertSame($expected, $this->validation->run($data)); } - public function lessThanEqualProvider(): Generator + public function lessThanEqualProvider(): iterable { yield from [ ['0', '0', true], @@ -546,7 +545,7 @@ public function testNotInList(?string $first, ?string $second, bool $expected): $this->assertSame(! $expected, $this->validation->run($data)); } - public function inListProvider(): Generator + public function inListProvider(): iterable { yield from [ ['red', 'red,Blue,123', true], @@ -582,7 +581,7 @@ public function testRequiredWith(?string $field, ?string $check, bool $expected) $this->assertSame($expected, $this->validation->run($data)); } - public function requiredWithProvider(): Generator + public function requiredWithProvider(): iterable { yield from [ ['nope', 'bar', false], @@ -630,7 +629,7 @@ public function testRequiredWithAndOtherRules(bool $expected, array $data): void $this->assertSame($expected, $result); } - public function RequiredWithAndOtherRulesProvider(): Generator + public function RequiredWithAndOtherRulesProvider(): iterable { yield from [ // `otherField` and `mustBeADate` do not exist @@ -667,7 +666,7 @@ public function testRequiredWithAndOtherRuleWithValueZero(bool $expected, array $this->assertSame($expected, $result); } - public function RequiredWithAndOtherRuleWithValueZeroProvider(): Generator + public function RequiredWithAndOtherRuleWithValueZeroProvider(): iterable { yield from [ [true, ['married' => '0', 'partner_name' => '']], @@ -697,7 +696,7 @@ public function testRequiredWithout(?string $field, ?string $check, bool $expect $this->assertSame($expected, $this->validation->run($data)); } - public function requiredWithoutProvider(): Generator + public function requiredWithoutProvider(): iterable { yield from [ ['nope', 'bars', false], @@ -743,7 +742,7 @@ public function testRequiredWithoutMultiple(string $foo, string $bar, string $ba $this->assertSame($result, $this->validation->run($data)); } - public function requiredWithoutMultipleProvider(): Generator + public function requiredWithoutMultipleProvider(): iterable { yield from [ 'all empty' => [ @@ -789,7 +788,7 @@ public function testRequiredWithoutMultipleWithoutFields(array $data, bool $resu $this->assertSame($result, $this->validation->run($data)); } - public function requiredWithoutMultipleWithoutFieldsProvider(): Generator + public function requiredWithoutMultipleWithoutFieldsProvider(): iterable { yield from [ 'baz is missing' => [ diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php index a0619df06cc0..f6441c70b7fd 100644 --- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php +++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php @@ -14,7 +14,6 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; -use Generator; use Tests\Support\Validation\TestRules; /** @@ -65,7 +64,7 @@ public function testValidCCNumber(string $type, ?string $number, bool $expected) * * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm */ - public function creditCardProvider(): Generator + public function creditCardProvider(): iterable { yield from [ 'null_test' => [ diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php index 4389a48b0ff1..2bbddad70561 100644 --- a/tests/system/Validation/StrictRules/RulesTest.php +++ b/tests/system/Validation/StrictRules/RulesTest.php @@ -13,7 +13,6 @@ use CodeIgniter\Validation\RulesTest as TraditionalRulesTest; use CodeIgniter\Validation\Validation; -use Generator; use Tests\Support\Validation\TestRules; /** @@ -51,7 +50,7 @@ public function testPermitEmptyStrict(array $rules, array $data, bool $expected) $this->assertSame($expected, $this->validation->run($data)); } - public function providePermitEmptyCasesStrict(): Generator + public function providePermitEmptyCasesStrict(): iterable { yield from [ [ @@ -106,7 +105,7 @@ public function testGreaterThanEqualStrict($value, string $param, bool $expected $this->assertSame($expected, $this->validation->run($data)); } - public function provideGreaterThanEqualStrict(): Generator + public function provideGreaterThanEqualStrict(): iterable { yield from [ [0, '0', true], @@ -132,7 +131,7 @@ public function testGreaterThanStrict($value, string $param, bool $expected): vo $this->assertSame($expected, $this->validation->run($data)); } - public function provideGreaterThanStrict(): Generator + public function provideGreaterThanStrict(): iterable { yield from [ [-10, '-11', true], @@ -159,7 +158,7 @@ public function testLessThanStrict($value, string $param, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function provideLessThanStrict(): Generator + public function provideLessThanStrict(): iterable { yield from [ [-10, '-11', false], @@ -187,7 +186,7 @@ public function testLessEqualThanStrict($value, ?string $param, bool $expected): $this->assertSame($expected, $this->validation->run($data)); } - public function provideLessThanEqualStrict(): Generator + public function provideLessThanEqualStrict(): iterable { yield from [ [0, '0', true], diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index efc00290ebd4..638dd56e26d2 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -18,7 +18,6 @@ use CodeIgniter\Validation\Exceptions\ValidationException; use Config\App; use Config\Services; -use Generator; use PHPUnit\Framework\ExpectationFailedException; use Tests\Support\Validation\TestRules; use TypeError; @@ -339,7 +338,7 @@ public function testCanValidatetArrayData($value, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function arrayDataProvider(): Generator + public function arrayDataProvider(): iterable { yield 'list array' => [ [1, 2, 3, 4, 5], @@ -391,7 +390,7 @@ public function testIsIntWithInvalidTypeData($value, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - public function isIntInvalidTypeDataProvider(): Generator + public function isIntInvalidTypeDataProvider(): iterable { yield 'array with int' => [ [555], @@ -623,7 +622,7 @@ public function testRulesSetup($rules, $expected, array $errors = []) $this->assertSame($expected, $this->validation->getError('foo')); } - public function rulesSetupProvider(): Generator + public function rulesSetupProvider(): iterable { yield from [ [ @@ -971,7 +970,7 @@ public function testRulesForArrayField(array $body, array $rules, array $results $this->assertSame($results, $this->validation->getErrors()); } - public function arrayFieldDataProvider(): Generator + public function arrayFieldDataProvider(): iterable { yield from [ 'all_rules_should_pass' => [ @@ -1206,7 +1205,7 @@ public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $this->assertSame($expected, $actual); } - public function dotNotationForIfExistProvider(): Generator + public function dotNotationForIfExistProvider(): iterable { yield 'dot-on-end-fail' => [ false, diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index cfa2ab1e81e8..d1bd13620470 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -418,7 +418,7 @@ public function testMismatchedVarPair() $this->assertSame($result, $this->parser->renderString($template)); } - public function escValueTypes() + public function escValueTypes(): iterable { return [ 'scalar' => [42], From 150583c47cda3048e751b1bfd79c788f6962a7fa Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Mon, 17 Jul 2023 16:46:27 +0800 Subject: [PATCH 4257/8282] Bump to phpstan level 6 --- phpstan.neon.dist | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index b196b90397f5..4381202385b9 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -14,14 +14,13 @@ includes: parameters: phpVersion: 80100 tmpDir: build/phpstan - level: 5 + level: 6 + bootstrapFiles: + - phpstan-bootstrap.php paths: - app - system - utils/PHPStan - treatPhpDocTypesAsCertain: false - bootstrapFiles: - - phpstan-bootstrap.php excludePaths: - app/Views/errors/cli/* - app/Views/errors/html/* @@ -38,3 +37,7 @@ parameters: - APP_NAMESPACE - CI_DEBUG - ENVIRONMENT + checkMissingIterableValueType: false + checkGenericClassInNonGenericObjectType: false + checkMissingCallableSignature: true + treatPhpDocTypesAsCertain: false From 6c70392b05c20d535479d82a7c67efdaa172a9b2 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Mon, 17 Jul 2023 16:58:59 +0800 Subject: [PATCH 4258/8282] Dump existing 613 errors to PHP baseline --- composer.json | 2 +- phpstan-baseline.neon.dist | 271 ---- phpstan-baseline.php | 2920 ++++++++++++++++++++++++++++++++++++ phpstan.neon.dist | 2 +- 4 files changed, 2922 insertions(+), 273 deletions(-) delete mode 100644 phpstan-baseline.neon.dist create mode 100644 phpstan-baseline.php diff --git a/composer.json b/composer.json index 996b6d9ed5b5..b565963937fc 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "nexusphp/cs-config": "^3.6", "nexusphp/tachycardia": "^1.0", "php-coveralls/php-coveralls": "^2.5", - "phpstan/phpstan": "^1.7.1", + "phpstan/phpstan": "^1.10.2", "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist deleted file mode 100644 index 639b6dc79f5a..000000000000 --- a/phpstan-baseline.neon.dist +++ /dev/null @@ -1,271 +0,0 @@ -parameters: - ignoreErrors: - - - message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#" - count: 1 - path: system/Autoloader/Autoloader.php - - - - message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#" - count: 1 - path: system/Autoloader/Autoloader.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#" - count: 1 - path: system/CodeIgniter.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:setLocale\\(\\)\\.$#" - count: 1 - path: system/CodeIgniter.php - - - - message: "#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: system/Database/BaseBuilder.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#" - count: 1 - path: system/Database/BaseConnection.php - - - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$DBDriver\\.$#" - count: 2 - path: system/Database/Database.php - - - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$connID\\.$#" - count: 2 - path: system/Database/Database.php - - - - message: "#^Property CodeIgniter\\\\Database\\\\Migration\\:\\:\\$DBGroup \\(string\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Database/Migration.php - - - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$mysqli\\.$#" - count: 3 - path: system/Database/MySQLi/PreparedQuery.php - - - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#" - count: 2 - path: system/Database/SQLSRV/Builder.php - - - - message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#" - count: 13 - path: system/Database/SQLSRV/Forge.php - - - - message: "#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Debug/Toolbar/Collectors/Logs.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getData\\(\\)\\.$#" - count: 1 - path: system/Debug/Toolbar/Collectors/Views.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#" - count: 2 - path: system/Debug/Toolbar/Collectors/Views.php - - - - message: "#^Static property CodeIgniter\\\\Email\\\\Email\\:\\:\\$func_overload \\(bool\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: system/Email/Email.php - - - - message: "#^Property CodeIgniter\\\\Files\\\\File\\:\\:\\$size \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Files/File.php - - - - message: "#^Expression on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Filters/Filters.php - - - - message: "#^Expression on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/HTTP/Files/UploadedFile.php - - - - message: "#^Property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$error \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 2 - path: system/HTTP/Files/UploadedFile.php - - - - message: "#^Return type \\(bool\\) of method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:move\\(\\) should be compatible with return type \\(CodeIgniter\\\\Files\\\\File\\) of method CodeIgniter\\\\Files\\\\File\\:\\:move\\(\\)$#" - count: 1 - path: system/HTTP/Files/UploadedFile.php - - - - message: "#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/HTTP/Message.php - - - - message: "#^Variable \\$_GET on left side of \\?\\? always exists and is not nullable\\.$#" - count: 1 - path: system/HTTP/RedirectResponse.php - - - - message: "#^Variable \\$_POST on left side of \\?\\? always exists and is not nullable\\.$#" - count: 1 - path: system/HTTP/RedirectResponse.php - - - - message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/HTTP/URI.php - - - - message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$host \\(string\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/HTTP/URI.php - - - - message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/HTTP/URI.php - - - - message: "#^Right side of && is always true\\.$#" - count: 1 - path: system/Helpers/filesystem_helper.php - - - - message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#" - count: 1 - path: system/Images/Handlers/BaseHandler.php - - - - message: "#^Comparison operation \"\\>\\=\" between \\(array\\|float\\|int\\) and 0 results in an error\\.$#" - count: 2 - path: system/Images/Handlers/ImageMagickHandler.php - - - - message: "#^PHPDoc type string\\|null of property CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:\\$resource is not covariant with PHPDoc type resource\\|null of overridden property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$resource\\.$#" - count: 1 - path: system/Images/Handlers/ImageMagickHandler.php - - - - message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$height \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 4 - path: system/Images/Handlers/ImageMagickHandler.php - - - - message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$width \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 4 - path: system/Images/Handlers/ImageMagickHandler.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#" - count: 2 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFilterForRoute\\(\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFiltersForRoute\\(\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:isFiltered\\(\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:setHTTPVerb\\(\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(.*\\)\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Expression on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Router/Router.php - - - - message: "#^Property CodeIgniter\\\\Session\\\\Session\\:\\:\\$sessionExpiration \\(int\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: system/Session/Session.php - - - - message: "#^Access to an undefined property object\\:\\:\\$createdField\\.$#" - count: 1 - path: system/Test/Fabricator.php - - - - message: "#^Access to an undefined property object\\:\\:\\$deletedField\\.$#" - count: 1 - path: system/Test/Fabricator.php - - - - message: "#^Access to an undefined property object\\:\\:\\$updatedField\\.$#" - count: 1 - path: system/Test/Fabricator.php - - - - message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: system/Test/FeatureTestCase.php - - - - message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$clean \\(bool\\) in isset\\(\\) is not nullable\\.$#" - count: 1 - path: system/Test/FeatureTestCase.php - - - - message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session \\(array\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Test/FeatureTestCase.php - - - - message: "#^Cannot access property \\$insert_id on object\\|resource\\|false\\.$#" - count: 1 - path: system/Test/Mock/MockConnection.php - - - - message: "#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/Throttle/Throttler.php - - - - message: "#^Property CodeIgniter\\\\View\\\\Cell\\:\\:\\$cache \\(CodeIgniter\\\\Cache\\\\CacheInterface\\) in empty\\(\\) is not falsy\\.$#" - count: 2 - path: system/View/Cell.php - - - - message: "#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#" - count: 1 - path: system/View/Cell.php - - - - message: "#^Property Config\\\\View\\:\\:\\$plugins \\(array\\) on left side of \\?\\? is not nullable\\.$#" - count: 1 - path: system/View/Parser.php - - - - message: "#^Constructor of class CodeIgniter\\\\HTTP\\\\CURLRequest has an unused parameter \\$config\\.$#" - count: 1 - path: system/HTTP/CURLRequest.php diff --git a/phpstan-baseline.php b/phpstan-baseline.php new file mode 100644 index 000000000000..2aae3fc2eeb5 --- /dev/null +++ b/phpstan-baseline.php @@ -0,0 +1,2920 @@ + '#^Property Config\\\\Kint\\:\\:\\$plugins has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Config/Kint.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property Config\\\\Kint\\:\\:\\$richObjectPlugins has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Config/Kint.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property Config\\\\Kint\\:\\:\\$richTabPlugins has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Config/Kint.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method App\\\\Controllers\\\\BaseController\\:\\:initController\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Controllers/BaseController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method App\\\\Controllers\\\\Home\\:\\:index\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Controllers/Home.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:discoverComposerNamespaces\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:register\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClass\'\\} given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClassmap\'\\} given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doOnlyDeleted\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:showError\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:showHelp\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:beep\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:clearScreen\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:error\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:fwrite\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:generateDimensions\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:init\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:newLine\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:parseCommandLine\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:print\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:showProgress\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:table\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:wait\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:write\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:discoverCommands\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/Commands.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Console\\:\\:showHeader\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/Console.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/CacheInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:deleteMatching\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:setLocale\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:bootstrapEnvironment\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:cache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:callExit\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:detectEnvironment\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:forceSecureAccess\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:gatherOutput\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:getRequestObject\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:getResponseObject\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:initializeKint\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:resolvePlatformExtensions\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:spoofRequestMethod\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:startBenchmark\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:storePreviousURL\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\CodeIgniter\\:\\:\\$controller type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showAllTables\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showDataOfTable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listFull\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/ListCommands.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listSimple\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/ListCommands.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has parameter \\$routes with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function force_https\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function helper\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function timer\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\ComposerScripts\\:\\:postUpdate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/ComposerScripts.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseConfig\\:\\:registerProperties\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:resetSingle\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\Config\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\Config\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\DotEnv\\:\\:setVariable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/DotEnv.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Factories.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Factories.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\ForeignCharacters\\:\\:\\$characterList has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/ForeignCharacters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\Publisher\\:\\:registerProperties\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Publisher.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\View\\:\\:\\$filters has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\View\\:\\:\\$plugins has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:cachePage\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:forceHTTPS\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:initController\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:loadHelpers\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:addUnionStatement\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:buildSubquery\\(\\) has parameter \\$builder with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetRun\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetWrite\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:union\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:unionAll\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:close\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:prepare\\(\\) has parameter \\$func with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:transOff\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:ensureFactory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$DBDriver\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$connID\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forEmptyInputGiven\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forFindColumnHaveMultipleColumns\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forInvalidAllowedFields\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forTableNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeDefault\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnique\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnsigned\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:down\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Migration.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:up\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Migration.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Migration\\:\\:\\$DBGroup \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Migration.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:addHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:clearHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:ensureTable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:force\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:removeHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ModelFactory.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ModelFactory.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$mysqli\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$resetStmtId has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$validDSNs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:buildDSN\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:convertDSN\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$connect_timeout has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$options has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$service has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$sslmode has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\PreparedQueryInterface\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/PreparedQueryInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:compileBinds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:setError\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/QueryInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:freeResult\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', + 'count' => 13, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:copyData\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:dropIndexes\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:call\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Seeder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:exceptionHandler\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskSensitiveData\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:render\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:shutdownHandler\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Iterator\\:\\:add\\(\\) has parameter \\$closure with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Iterator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Timer\\:\\:record\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Timer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:prepare\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:respond\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:getBadgeValue\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:getVarData\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:collect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:getConnections\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\History\\:\\:setFiles\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/History.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Logs\\:\\:collectLogs\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getData\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:SMTPEnd\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:appendAttachments\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:batchBCCSend\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:buildHeaders\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:buildMessage\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:setErrorMessage\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:unwrapSpecials\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:writeHeaders\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Static property CodeIgniter\\\\Email\\\\Email\\:\\:\\$func_overload \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\SodiumHandler\\:\\:parseParams\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Entity\\\\Entity\\:\\:\\$casts has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Entity\\\\Entity\\:\\:\\$datamap has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Entity\\\\Entity\\:\\:\\$dates has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:on\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:on\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:removeAllListeners\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:removeListener\\(\\) has parameter \\$listener with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:setFiles\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:simulate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\CastException\\:\\:forInvalidJsonFormatException\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/CastException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\ConfigException\\:\\:forDisabledMigrations\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/ConfigException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\DownloadException\\:\\:forCannotSetBinary\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/DownloadException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\DownloadException\\:\\:forCannotSetCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/DownloadException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\DownloadException\\:\\:forCannotSetFilePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/DownloadException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\DownloadException\\:\\:forCannotSetStatusCode\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/DownloadException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\DownloadException\\:\\:forNotFoundDownloadSource\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/DownloadException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forCopyError\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forEnabledZlibOutputCompression\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forFabricatorCreateFailed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forInvalidFile\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forMissingExtension\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forNoHandlers\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/FrameworkException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\ModelException\\:\\:forMethodNotAvailable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/ModelException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\ModelException\\:\\:forNoDateFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/ModelException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\ModelException\\:\\:forNoPrimaryKey\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/ModelException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:forControllerNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:forEmptyController\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:forLocaleNotSupported\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:forMethodNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:forPageNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\TestException\\:\\:forInvalidMockClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/TestException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Files\\\\Exceptions\\\\FileException\\:\\:forExpectedDirectory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/Exceptions/FileException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Files\\\\Exceptions\\\\FileException\\:\\:forExpectedFile\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/Exceptions/FileException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Files\\\\Exceptions\\\\FileException\\:\\:forUnableToMove\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/Exceptions/FileException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Files\\\\Exceptions\\\\FileNotFoundException\\:\\:forFileNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/Exceptions/FileNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Files\\\\File\\:\\:\\$size \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/File.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:discoverFilters\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:processAliasesToClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:processFilters\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:processGlobals\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:processMethods\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:setResponse\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatter\\:\\:arrayToXML\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Format/XMLFormatter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:parseCommand\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Constructor of class CodeIgniter\\\\HTTP\\\\CURLRequest has an unused parameter \\$config\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:parseOptions\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:resetOptions\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setResponseHeaders\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addOption\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addToHeader\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:buildHeaders\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:finalize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:generateNonces\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:buildHeaders\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setBinary\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setContentTypeByMimeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setFilePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:populateFiles\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$error \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\) of method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:move\\(\\) should be compatible with return type \\(CodeIgniter\\\\Files\\\\File\\) of method CodeIgniter\\\\Files\\\\File\\:\\:move\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFileInterface\\:\\:move\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFileInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:detectLocale\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:detectURI\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$_GET on left side of \\?\\? always exists and is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$_POST on left side of \\?\\? always exists and is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:populateGlobals\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:sendCookies\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:applyParts\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$host \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\UserAgent\\:\\:compileData\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\UserAgent\\:\\:parse\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function delete_cookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/cookie_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function set_cookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/cookie_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Right side of && is always true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function d\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function d\\(\\) has parameter \\$vars with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function dd\\(\\) has no return type specified\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function dd\\(\\) has parameter \\$vars with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function trace\\(\\) has no return type specified\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function mock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/test_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Exceptions\\\\HoneypotException\\:\\:forNoHiddenValue\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Exceptions/HoneypotException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Exceptions\\\\HoneypotException\\:\\:forNoNameField\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Exceptions/HoneypotException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Exceptions\\\\HoneypotException\\:\\:forNoTemplate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Exceptions/HoneypotException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Exceptions\\\\HoneypotException\\:\\:isBot\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Exceptions/HoneypotException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Honeypot\\:\\:attachHoneypot\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Honeypot.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Honeypot\\\\Honeypot\\:\\:hasContent\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Honeypot.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\Time\\:\\:setTestNow\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\Time\\:\\:toDateTimeString\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTestNow\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:toDateTimeString\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forEXIFUnsupported\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forFileNotSupported\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forImageProcessFailed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forInvalidDirection\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forInvalidImageCreate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forInvalidImageLibraryPath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forInvalidPath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forMissingAngle\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forMissingImage\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Exceptions\\\\ImageException\\:\\:forSaveFailed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Exceptions/ImageException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_text\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:ensureResource\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:reproportion\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Comparison operation "\\>\\=" between \\(array\\|float\\|int\\) and 0 results in an error\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_text\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:ensureResource\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:supportedFormatCheck\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string\\|null of property CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:\\$resource is not covariant with PHPDoc type resource\\|null of overridden property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$resource\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$height \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$width \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Exceptions\\\\LogException\\:\\:forInvalidLogLevel\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Exceptions/LogException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Exceptions\\\\LogException\\:\\:forInvalidMessageType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Exceptions/LogException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:sendLogs\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:chunk\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doOnlyDeleted\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Exceptions\\\\PagerException\\:\\:forInvalidPaginationGroup\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Exceptions/PagerException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Exceptions\\\\PagerException\\:\\:forInvalidTemplate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Exceptions/PagerException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Pager\\:\\:calculateCurrentPage\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Pager\\:\\:ensureGroup\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\PagerRenderer\\:\\:updatePages\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/PagerRenderer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\Exceptions\\\\PublisherException\\:\\:forCollision\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/Exceptions/PublisherException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\Exceptions\\\\PublisherException\\:\\:forDestinationNotAllowed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/Exceptions/PublisherException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\Exceptions\\\\PublisherException\\:\\:forFileNotAllowed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/Exceptions/PublisherException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\Publisher\\:\\:verifyAllowed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/Publisher.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\BaseResource\\:\\:initController\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\BaseResource\\:\\:setModel\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouter\\:\\:setDirectory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\AutoRouter\\:\\:\\$cliRoutes type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:add\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:cli\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:create\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:create\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:delete\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:discoverRoutes\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:environment\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:get\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:get404Override\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:getControllerName\\(\\) has parameter \\$handler with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:group\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:group\\(\\) has parameter \\$params with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:head\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:match\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:options\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:patch\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:post\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:put\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:resetRoutes\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$override404 type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:add\\(\\) has parameter \\$to with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:get404Override\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFilterForRoute\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFiltersForRoute\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:isFiltered\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:setHTTPVerb\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:autoRoute\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:controllerName\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:get404Override\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:handle\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setDefaultController\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setDirectory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setMatchedRoute\\(\\) has parameter \\$handler with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setRequest\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\Router\\:\\:\\$controller type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouterInterface\\:\\:controllerName\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouterInterface\\:\\:handle\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forDisallowedAction\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidControlChars\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidSameSite\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Security\\\\Exceptions\\\\SecurityException\\:\\:forInvalidUTF8Chars\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Security/Exceptions/SecurityException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forEmptySavepath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSameSiteSetting\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePathFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forMissingDatabaseTable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forWriteProtectedSavePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Session\\\\Handlers\\\\ArrayHandler\\:\\:\\$cache has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/ArrayHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\Database\\\\PostgreHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/Database/PostgreHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\DatabaseHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/DatabaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\FileHandler\\:\\:configureSessionIDRegex\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configure\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configureSidLength\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:initVars\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:push\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:remove\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:set\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:stop\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Session\\\\Session\\:\\:\\$sessionExpiration \\(int\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:set\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:assertCloseEnough\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:getPrivateMethodInvoker\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockEmail\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetFactories\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetServices\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:setPrivateProperty\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property object\\:\\:\\$createdField\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property object\\:\\:\\$deletedField\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property object\\:\\:\\$updatedField\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:resetCounts\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$clean \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCLIConfig\\:\\:\\$CSRFExcludeURIs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCLIConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getBaseURI\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getDelay\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has parameter \\$output with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$curl_options has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$output has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertHas\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertHasValue\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:assertMissing\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:initialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:remember\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCodeIgniter\\:\\:callExit\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCodeIgniter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Cannot access property \\$insert_id on object\\|resource\\|false\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has parameter \\$return with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:\\$returnValues has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getEventsFile\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getListeners\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getSimulate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:unInitialize\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockFileLogger\\:\\:\\$destination has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockFileLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockLanguage\\:\\:disableIntlSupport\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockLanguage.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$dateFormat has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$handlers has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$threshold has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModel\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModelName\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModel\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModelName\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:getPretend\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:misbehave\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSecurityConfig\\:\\:\\$excludeURIs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSecurityConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$classmap has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$psr4 has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:\\$didRegenerate has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$method with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$params with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:register\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:restore\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:setContent\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestLogger\\:\\:cleanup\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\TestLogger\\:\\:\\$op_logs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestLogger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieExpired\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieMissing\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSee\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSeeElement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeader\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeaderMissing\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONExact\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONFragment\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotOK\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotRedirect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertOK\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirectTo\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSee\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeElement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeInField\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeLink\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionHas\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionMissing\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertStatus\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Throttle/Throttler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forGroupNotArray\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forGroupNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forInvalidTemplate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forNoRuleSets\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Exceptions\\\\ValidationException\\:\\:forRuleNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Exceptions/ValidationException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isClosure\\(\\) has parameter \\$rule with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Validation.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:loadRuleSets\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Validation.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRuleGroup\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/Validation.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRuleGroup\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:getMethodParams\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\View\\\\Cell\\:\\:\\$cache \\(CodeIgniter\\\\Cache\\\\CacheInterface\\) in empty\\(\\) is not falsy\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/View/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:setView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cells/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method class@anonymous/system/Traits/PropertiesTrait\\.php\\:47\\:\\:getProperties\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cells/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method class@anonymous/system/Traits/PropertiesTrait\\.php\\:47\\:\\:getProperties\\(\\) has parameter \\$obj with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cells/Cell.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forInvalidCellClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forInvalidCellMethod\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forInvalidCellParameter\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forInvalidDecorator\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forMissingCellParameters\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forNoCellClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Exceptions\\\\ViewException\\:\\:forTagSyntaxError\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Exceptions/ViewException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:addPlugin\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Parser.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property Config\\\\View\\:\\:\\$plugins \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Parser.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_compileTemplate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_setFromArray\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_setFromDBResult\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$function type has no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:endSection\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:extend\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:logPerformance\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:renderSection\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:section\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$tempData has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', +]; + +return ['parameters' => ['ignoreErrors' => $ignoreErrors]]; diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 4381202385b9..671b0133aaea 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -9,7 +9,7 @@ services: - phpstan.rules.rule includes: - - phpstan-baseline.neon.dist + - phpstan-baseline.php parameters: phpVersion: 80100 From d83416663ac49f665818e1cfbd676f28df613cbe Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Wed, 19 Jul 2023 08:37:05 +0700 Subject: [PATCH 4259/8282] `disableProcessTimeout` in `analyze` Composer --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 996b6d9ed5b5..04ef2f064627 100644 --- a/composer.json +++ b/composer.json @@ -77,6 +77,7 @@ "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\"" ], "analyze": [ + "Composer\\Config::disableProcessTimeout", "bash -c \"XDEBUG_MODE=off phpstan analyse\"", "rector process --dry-run" ], From 9810c1fe9e1ccc7fb51533354827ac1afc24d7ea Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 20 Jul 2023 15:21:01 +0800 Subject: [PATCH 4260/8282] Fix PHPDoc of Config\Cache::$validHandlers --- app/Config/Cache.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Config/Cache.php b/app/Config/Cache.php index 5ba93328110f..61cdd50de890 100644 --- a/app/Config/Cache.php +++ b/app/Config/Cache.php @@ -2,6 +2,7 @@ namespace Config; +use CodeIgniter\Cache\CacheInterface; use CodeIgniter\Cache\Handlers\DummyHandler; use CodeIgniter\Cache\Handlers\FileHandler; use CodeIgniter\Cache\Handlers\MemcachedHandler; @@ -158,6 +159,7 @@ class Cache extends BaseConfig * that are listed here are allowed to be used. * * @var array + * @phpstan-var array> */ public array $validHandlers = [ 'dummy' => DummyHandler::class, From 2a2a40d29ff6e947390cec24525cff830f62ccd5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 10:09:37 +0900 Subject: [PATCH 4261/8282] chore: update test-phpstan.yml --- .github/workflows/test-phpstan.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml index cb793c356d94..8e2a57685cba 100644 --- a/.github/workflows/test-phpstan.yml +++ b/.github/workflows/test-phpstan.yml @@ -12,7 +12,8 @@ on: - 'system/**.php' - 'utils/**.php' - composer.json - - '**.neon.dist' + - phpstan.neon.dist + - phpstan-baseline.php - '.github/workflows/test-phpstan.yml' push: @@ -24,7 +25,8 @@ on: - 'system/**.php' - 'utils/**.php' - composer.json - - '**.neon.dist' + - phpstan.neon.dist + - phpstan-baseline.php - '.github/workflows/test-phpstan.yml' concurrency: From f3bcbfba23438b70b31513cda79de8c4238af644 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 12:11:12 +0900 Subject: [PATCH 4262/8282] refactor: add property types --- app/Config/Routing.php | 2 +- system/Config/Routing.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Config/Routing.php b/app/Config/Routing.php index e3183d2e8db8..8d3c773157cf 100644 --- a/app/Config/Routing.php +++ b/app/Config/Routing.php @@ -78,7 +78,7 @@ class Routing extends BaseRouting * Example: * public $override404 = 'App\Errors::show404'; */ - public $override404; + public ?string $override404 = null; /** * If TRUE, the system will attempt to match the URI against diff --git a/system/Config/Routing.php b/system/Config/Routing.php index 857a27769215..409bcf099f65 100644 --- a/system/Config/Routing.php +++ b/system/Config/Routing.php @@ -76,7 +76,7 @@ class Routing extends BaseConfig * Example: * public $override404 = 'App\Errors::show404'; */ - public $override404; + public ?string $override404 = null; /** * If TRUE, the system will attempt to match the URI against From faac980f67f6df1abcc5ac5d57bb670f32f49d06 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 12:11:52 +0900 Subject: [PATCH 4263/8282] refactor: add return types --- system/Debug/BaseExceptionHandler.php | 2 +- system/HTTP/SiteURI.php | 2 +- system/HotReloader/HotReloader.php | 2 +- system/Router/AutoRouterImproved.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php index 576149b8bf68..9afd450e8b48 100644 --- a/system/Debug/BaseExceptionHandler.php +++ b/system/Debug/BaseExceptionHandler.php @@ -89,7 +89,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array * * @param array|object $trace */ - protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '') + protected function maskSensitiveData(&$trace, array $keysToMask, string $path = ''): void { foreach ($keysToMask as $keyToMask) { $explode = explode('/', $keyToMask); diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index e64080974940..adf873bfb902 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -328,7 +328,7 @@ public function refreshPath() /** * Saves our parts from a parse_url() call. */ - protected function applyParts(array $parts) + protected function applyParts(array $parts): void { if (! empty($parts['host'])) { $this->host = $parts['host']; diff --git a/system/HotReloader/HotReloader.php b/system/HotReloader/HotReloader.php index 2f10fae6a566..564ba544283a 100644 --- a/system/HotReloader/HotReloader.php +++ b/system/HotReloader/HotReloader.php @@ -16,7 +16,7 @@ */ final class HotReloader { - public function run() + public function run(): void { ini_set('zlib.output_compression', 'Off'); diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php index a186fd33ef55..6e0583d2a1e9 100644 --- a/system/Router/AutoRouterImproved.php +++ b/system/Router/AutoRouterImproved.php @@ -121,7 +121,7 @@ public function __construct(// @phpstan-ignore-line $this->controller = $this->defaultController; } - private function createSegments(string $uri) + private function createSegments(string $uri): array { $segments = explode('/', $uri); $segments = array_filter($segments, static fn ($segment) => $segment !== ''); From 05fc454d6f1a16561b7db34912c1c580dfed4942 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 12:13:02 +0900 Subject: [PATCH 4264/8282] docs: add @return --- system/Exceptions/FrameworkException.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php index cee5f903e785..f268966cb6a2 100644 --- a/system/Exceptions/FrameworkException.php +++ b/system/Exceptions/FrameworkException.php @@ -33,6 +33,9 @@ public static function forInvalidFile(string $path) return new static(lang('Core.invalidFile', [$path])); } + /** + * @return static + */ public static function forInvalidDirectory(string $path) { return new static(lang('Core.invalidDirectory', [$path])); From da93771448f53c511e712c2b7ce08a08d79816ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 14:15:53 +0900 Subject: [PATCH 4265/8282] test: add test for maskSensitiveData() --- tests/system/Debug/ExceptionsTest.php | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index b2c2946054bb..6e5a41457647 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -147,4 +147,53 @@ public function testRenderBacktrace(): void ); } } + + public function testMaskSensitiveData(): void + { + $maskSensitiveData = $this->getPrivateMethodInvoker($this->exception, 'maskSensitiveData'); + + $trace = [ + 0 => [ + 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', + 'line' => 15, + 'function' => 'f', + 'class' => 'App\\Controllers\\Home', + 'type' => '->', + 'args' => [ + 0 => (object) [ + 'password' => 'secret1', + ], + 1 => (object) [ + 'default' => [ + 'password' => 'secret2', + ], + ], + 2 => [ + 'password' => 'secret3', + ], + 3 => [ + 'default' => ['password' => 'secret4'], + ], + ], + ], + 1 => [ + 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', + 'line' => 932, + 'function' => 'index', + 'class' => 'App\\Controllers\\Home', + 'type' => '->', + 'args' => [ + ], + ], + ]; + $keysToMask = ['password']; + $path = ''; + + $newTrace = $maskSensitiveData($trace, $keysToMask, $path); + + $this->assertSame(['password' => '******************'], (array) $newTrace[0]['args'][0]); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][1]->default); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][2]); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][3]['default']); + } } From 6b624d67463b455f1a1673ed12234d31a1988010 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 14:16:27 +0900 Subject: [PATCH 4266/8282] fix: $sensitiveDataInTrace does not work --- system/Debug/Exceptions.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 531e95fd9808..11046552de48 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -293,7 +293,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array $trace = $exception->getTrace(); if ($this->config->sensitiveDataInTrace !== []) { - $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace); + $trace = $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace); } return [ @@ -311,8 +311,10 @@ protected function collectVars(Throwable $exception, int $statusCode): array * Mask sensitive data in the trace. * * @param array|object $trace + * + * @return array|object */ - protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '') + protected function maskSensitiveData($trace, array $keysToMask, string $path = '') { foreach ($keysToMask as $keyToMask) { $explode = explode('/', $keyToMask); @@ -327,15 +329,17 @@ protected function maskSensitiveData(&$trace, array $keysToMask, string $path = } } - if (is_object($trace)) { - $trace = get_object_vars($trace); - } - if (is_array($trace)) { foreach ($trace as $pathKey => $subarray) { - $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); + $trace[$pathKey] = $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); + } + } elseif (is_object($trace)) { + foreach ($trace as $pathKey => $subarray) { + $trace->{$pathKey} = $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); } } + + return $trace; } /** From 36a5f5acc86d3d675f880e7a5f93049652a11382 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 14:37:21 +0900 Subject: [PATCH 4267/8282] test: add test for maskSensitiveData() and trace data key --- tests/system/Debug/ExceptionsTest.php | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 6e5a41457647..4d0b1c3c98dd 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -196,4 +196,36 @@ public function testMaskSensitiveData(): void $this->assertSame(['password' => '******************'], $newTrace[0]['args'][2]); $this->assertSame(['password' => '******************'], $newTrace[0]['args'][3]['default']); } + + public function testMaskSensitiveDataTraceDataKey(): void + { + $maskSensitiveData = $this->getPrivateMethodInvoker($this->exception, 'maskSensitiveData'); + + $trace = [ + 0 => [ + 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', + 'line' => 15, + 'function' => 'f', + 'class' => 'App\\Controllers\\Home', + 'type' => '->', + 'args' => [ + ], + ], + 1 => [ + 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', + 'line' => 932, + 'function' => 'index', + 'class' => 'App\\Controllers\\Home', + 'type' => '->', + 'args' => [ + ], + ], + ]; + $keysToMask = ['file']; + $path = ''; + + $newTrace = $maskSensitiveData($trace, $keysToMask, $path); + + $this->assertSame('/var/www/CodeIgniter4/app/Controllers/Home.php', $newTrace[0]['file']); + } } From d6725aa534da6504af855ed7d957fad25f133bca Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 15:15:43 +0900 Subject: [PATCH 4268/8282] chore: fix cache file --- .php-cs-fixer.user-guide.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index c15d0dcca006..392d749c20f1 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -37,7 +37,7 @@ ]; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', + 'cacheFile' => 'build/.php-cs-fixer.user-guide.cache', 'finder' => $finder, ]; From 29af186d907852855d873090a0e4cbf6e03aad7e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 15:06:55 +0900 Subject: [PATCH 4269/8282] fix: maskSensitiveData() may mask backtrace data like `file` --- phpstan-baseline.php | 5 ----- system/Debug/Exceptions.php | 39 ++++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 2aae3fc2eeb5..26a2bbdf1afb 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -931,11 +931,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Debug/Exceptions.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskSensitiveData\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Debug/Exceptions.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:render\\(\\) has no return type specified\\.$#', 'count' => 1, diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 11046552de48..6df81c16d5a5 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -315,31 +315,48 @@ protected function collectVars(Throwable $exception, int $statusCode): array * @return array|object */ protected function maskSensitiveData($trace, array $keysToMask, string $path = '') + { + foreach ($trace as $i => $line) { + $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask); + } + + return $trace; + } + + /** + * @param array|object $args + * + * @return array|object + */ + private function maskData($args, array $keysToMask, string $path = '') { foreach ($keysToMask as $keyToMask) { $explode = explode('/', $keyToMask); $index = end($explode); if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) { - if (is_array($trace) && array_key_exists($index, $trace)) { - $trace[$index] = '******************'; - } elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->{$index})) { - $trace->{$index} = '******************'; + if (is_array($args) && array_key_exists($index, $args)) { + $args[$index] = '******************'; + } elseif ( + is_object($args) && property_exists($args, $index) + && isset($args->{$index}) && is_scalar($args->{$index}) + ) { + $args->{$index} = '******************'; } } } - if (is_array($trace)) { - foreach ($trace as $pathKey => $subarray) { - $trace[$pathKey] = $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); + if (is_array($args)) { + foreach ($args as $pathKey => $subarray) { + $args[$pathKey] = $this->maskData($subarray, $keysToMask, $path . '/' . $pathKey); } - } elseif (is_object($trace)) { - foreach ($trace as $pathKey => $subarray) { - $trace->{$pathKey} = $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); + } elseif (is_object($args)) { + foreach ($args as $pathKey => $subarray) { + $args->{$pathKey} = $this->maskData($subarray, $keysToMask, $path . '/' . $pathKey); } } - return $trace; + return $args; } /** From 13782b3a951884a79a6b55c073a5a943dd117499 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 21 Jul 2023 15:14:27 +0900 Subject: [PATCH 4270/8282] test: use `use` statement --- tests/system/Debug/ExceptionsTest.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 4d0b1c3c98dd..a77745ba8a78 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Debug; +use App\Controllers\Home; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Entity\Exceptions\CastException; use CodeIgniter\Exceptions\ConfigException; @@ -157,7 +158,7 @@ public function testMaskSensitiveData(): void 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', 'line' => 15, 'function' => 'f', - 'class' => 'App\\Controllers\\Home', + 'class' => Home::class, 'type' => '->', 'args' => [ 0 => (object) [ @@ -180,7 +181,7 @@ public function testMaskSensitiveData(): void 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', 'line' => 932, 'function' => 'index', - 'class' => 'App\\Controllers\\Home', + 'class' => Home::class, 'type' => '->', 'args' => [ ], @@ -206,7 +207,7 @@ public function testMaskSensitiveDataTraceDataKey(): void 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', 'line' => 15, 'function' => 'f', - 'class' => 'App\\Controllers\\Home', + 'class' => Home::class, 'type' => '->', 'args' => [ ], @@ -215,7 +216,7 @@ public function testMaskSensitiveDataTraceDataKey(): void 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', 'line' => 932, 'function' => 'index', - 'class' => 'App\\Controllers\\Home', + 'class' => Home::class, 'type' => '->', 'args' => [ ], From 96ed87356ce32a965d951a2615eeae6f951b53c5 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Fri, 21 Jul 2023 20:37:30 +0800 Subject: [PATCH 4271/8282] refactor: services function actually returns `object|null` --- system/Common.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/system/Common.php b/system/Common.php index bdc937af2aa7..9be45b3a9c08 100644 --- a/system/Common.php +++ b/system/Common.php @@ -1004,10 +1004,8 @@ function session(?string $val = null) * - $timer = \CodeIgniter\Config\Services::timer(); * * @param array|bool|float|int|object|string|null ...$params - * - * @return object */ - function service(string $name, ...$params) + function service(string $name, ...$params): ?object { return Services::$name(...$params); } @@ -1018,10 +1016,8 @@ function service(string $name, ...$params) * Always returns a new instance of the class. * * @param array|bool|float|int|object|string|null ...$params - * - * @return object|null */ - function single_service(string $name, ...$params) + function single_service(string $name, ...$params): ?object { $service = Services::serviceExists($name); From 6318c23a17de375fbd25caeb87f37521a9ae6282 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 Feb 2023 13:45:16 +0900 Subject: [PATCH 4272/8282] feat: add SiteURIFactory --- system/HTTP/IncomingRequest.php | 9 + system/HTTP/SiteURIFactory.php | 251 ++++++++++++++++++ .../SiteURIFactoryDetectRoutePathTest.php | 227 ++++++++++++++++ tests/system/HTTP/SiteURIFactoryTest.php | 91 +++++++ 4 files changed, 578 insertions(+) create mode 100644 system/HTTP/SiteURIFactory.php create mode 100644 tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php create mode 100644 tests/system/HTTP/SiteURIFactoryTest.php diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 2554385b7ba6..99bbf223f405 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -235,6 +235,8 @@ protected function detectURI(string $protocol, string $baseURL) /** * Detects the relative path based on * the URIProtocol Config setting. + * + * @deprecated Moved to SiteURIFactory. */ public function detectPath(string $protocol = ''): string { @@ -265,6 +267,8 @@ public function detectPath(string $protocol = ''): string * fixing the query string if necessary. * * @return string The URI it found. + * + * @deprecated Moved to SiteURIFactory. */ protected function parseRequestURI(): string { @@ -323,6 +327,8 @@ protected function parseRequestURI(): string * Parse QUERY_STRING * * Will parse QUERY_STRING and automatically detect the URI from it. + * + * @deprecated Moved to SiteURIFactory. */ protected function parseQueryString(): string { @@ -495,6 +501,9 @@ public function setPath(string $path, ?App $config = null) return $this; } + /** + * @deprecated Moved to SiteURIFactory. + */ private function determineHost(App $config, string $baseURL): string { $host = parse_url($baseURL, PHP_URL_HOST); diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php new file mode 100644 index 000000000000..e96cc2781f85 --- /dev/null +++ b/system/HTTP/SiteURIFactory.php @@ -0,0 +1,251 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use CodeIgniter\HTTP\Exceptions\HTTPException; +use Config\App; + +class SiteURIFactory +{ + /** + * @var array Superglobal SERVER array + */ + private array $server; + + private App $appConfig; + + /** + * @param array $server Superglobal $_SERVER array + */ + public function __construct(array $server, App $appConfig) + { + $this->server = $server; + $this->appConfig = $appConfig; + } + + /** + * Create the current URI object from superglobals. + * + * This method updates superglobal $_SERVER and $_GET. + */ + public function createFromGlobals(): SiteURI + { + $routePath = $this->detectRoutePath(); + + return $this->createURIFromRoutePath($routePath); + } + + /** + * Create the SiteURI object from URI string. + * + * @internal Used for testing purposes only. + */ + public function createFromString(string $uri): SiteURI + { + // Validate URI + if (filter_var($uri, FILTER_VALIDATE_URL) === false) { + throw HTTPException::forUnableToParseURI($uri); + } + + $parts = parse_url($uri); + + if ($parts === false) { + throw HTTPException::forUnableToParseURI($uri); + } + + $query = $fragment = ''; + if (isset($parts['query'])) { + $query = '?' . $parts['query']; + } + if (isset($parts['fragment'])) { + $fragment = '#' . $parts['fragment']; + } + + $relativePath = $parts['path'] . $query . $fragment; + + return new SiteURI($this->appConfig, $relativePath, $parts['host'], $parts['scheme']); + } + + /** + * Detects the current URI path relative to baseURL based on the URIProtocol + * Config setting. + * + * @param string $protocol URIProtocol + * + * @return string The route path + * + * @internal Used for testing purposes only. + */ + public function detectRoutePath(string $protocol = ''): string + { + if ($protocol === '') { + $protocol = $this->appConfig->uriProtocol; + } + + switch ($protocol) { + case 'REQUEST_URI': + $routePath = $this->parseRequestURI(); + break; + + case 'QUERY_STRING': + $routePath = $this->parseQueryString(); + break; + + case 'PATH_INFO': + default: + $routePath = $this->server[$protocol] ?? $this->parseRequestURI(); + break; + } + + return ($routePath === '/' || $routePath === '') ? '/' : ltrim($routePath, '/'); + } + + /** + * Will parse the REQUEST_URI and automatically detect the URI from it, + * fixing the query string if necessary. + * + * This method updates superglobal $_SERVER and $_GET. + * + * @return string The route path (before normalization). + */ + private function parseRequestURI(): string + { + if (! isset($this->server['REQUEST_URI'], $this->server['SCRIPT_NAME'])) { + return ''; + } + + // parse_url() returns false if no host is present, but the path or query + // string contains a colon followed by a number. So we attach a dummy + // host since REQUEST_URI does not include the host. This allows us to + // parse out the query string and path. + $parts = parse_url('http://dummy' . $this->server['REQUEST_URI']); + $query = $parts['query'] ?? ''; + $path = $parts['path'] ?? ''; + + // Strip the SCRIPT_NAME path from the URI + if ( + $path !== '' && isset($this->server['SCRIPT_NAME'][0]) + && pathinfo($this->server['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php' + ) { + // Compare each segment, dropping them until there is no match + $segments = $keep = explode('/', $path); + + foreach (explode('/', $this->server['SCRIPT_NAME']) as $i => $segment) { + // If these segments are not the same then we're done + if (! isset($segments[$i]) || $segment !== $segments[$i]) { + break; + } + + array_shift($keep); + } + + $path = implode('/', $keep); + } + + // This section ensures that even on servers that require the URI to + // contain the query string (Nginx) a correct URI is found, and also + // fixes the QUERY_STRING Server var and $_GET array. + if (trim($path, '/') === '' && strncmp($query, '/', 1) === 0) { + $parts = explode('?', $query, 2); + $path = $parts[0]; + $newQuery = $query[1] ?? ''; + + $this->server['QUERY_STRING'] = $newQuery; + $this->updateServer('QUERY_STRING', $newQuery); + } else { + $this->server['QUERY_STRING'] = $query; + $this->updateServer('QUERY_STRING', $query); + } + + // Update our global GET for values likely to have been changed + parse_str($this->server['QUERY_STRING'], $get); + $this->updateGetArray($get); + + return URI::removeDotSegments($path); + } + + private function updateServer(string $key, string $value): void + { + $_SERVER[$key] = $value; + } + + private function updateGetArray(array $array): void + { + $_GET = $array; + } + + /** + * Will parse QUERY_STRING and automatically detect the URI from it. + * + * This method updates superglobal $_SERVER and $_GET. + * + * @return string The route path (before normalization). + */ + private function parseQueryString(): string + { + $query = $this->server['QUERY_STRING'] ?? @getenv('QUERY_STRING'); + + if (trim($query, '/') === '') { + return '/'; + } + + if (strncmp($query, '/', 1) === 0) { + $parts = explode('?', $query, 2); + $path = $parts[0]; + $newQuery = $parts[1] ?? ''; + + $this->server['QUERY_STRING'] = $newQuery; + $this->updateServer('QUERY_STRING', $newQuery); + } else { + $path = $query; + } + + // Update our global GET for values likely to have been changed + parse_str($this->server['QUERY_STRING'], $get); + $this->updateGetArray($get); + + return URI::removeDotSegments($path); + } + + /** + * Create current URI object. + * + * @param string $routePath URI path relative to baseURL + */ + private function createURIFromRoutePath(string $routePath): SiteURI + { + $query = $this->server['QUERY_STRING'] ?? ''; + + $relativePath = $query !== '' ? $routePath . '?' . $query : $routePath; + + return new SiteURI($this->appConfig, $relativePath, $this->getHost()); + } + + /** + * @return string|null The current hostname. Returns null if no host header. + */ + private function getHost(): ?string + { + $host = null; + + $httpHostPort = $this->server['HTTP_HOST'] ?? null; + if ($httpHostPort !== null) { + [$httpHost] = explode(':', $httpHostPort, 2); + + if (in_array($httpHost, $this->appConfig->allowedHostnames, true)) { + $host = $httpHost; + } + } + + return $host; + } +} diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php new file mode 100644 index 000000000000..3b7715049a5c --- /dev/null +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -0,0 +1,227 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use CodeIgniter\Test\CIUnitTestCase; +use Config\App; + +/** + * @backupGlobals enabled + * + * @internal + * + * @group Others + */ +final class SiteURIFactoryDetectRoutePathTest extends CIUnitTestCase +{ + protected function setUp(): void + { + parent::setUp(); + + $_GET = $_SERVER = []; + } + + private function createSiteURIFactory(array $server, ?App $appConfig = null): SiteURIFactory + { + $appConfig ??= new App(); + + return new SiteURIFactory($server, $appConfig); + } + + public function testDefault() + { + // /index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath()); + } + + public function testDefaultEmpty() + { + // / + $_SERVER['REQUEST_URI'] = '/'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = '/'; + $this->assertSame($expected, $factory->detectRoutePath()); + } + + public function testRequestURI() + { + // /index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURINested() + { + // I'm not sure but this is a case of Apache config making such SERVER + // values? + // The current implementation doesn't use the value of the URI object. + // So I removed the code to set URI. Therefore, it's exactly the same as + // the method above as a test. + // But it may be changed in the future to use the value of the URI object. + // So I don't remove this test case. + + // /ci/index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURISubfolder() + { + // /ci/index.php/popcorn/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot'; + $_SERVER['SCRIPT_NAME'] = '/ci/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'popcorn/woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURINoIndex() + { + // /sub/example + $_SERVER['REQUEST_URI'] = '/sub/example'; + $_SERVER['SCRIPT_NAME'] = '/sub/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'example'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURINginx() + { + // /ci/index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURINginxRedirecting() + { + // /?/ci/index.php/woot + $_SERVER['REQUEST_URI'] = '/?/ci/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'ci/woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testRequestURISuppressed() + { + // /woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/woot'; + $_SERVER['SCRIPT_NAME'] = '/'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('REQUEST_URI')); + } + + public function testQueryString() + { + // /index.php?/ci/woot + $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot'; + $_SERVER['QUERY_STRING'] = '/ci/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $_GET['/ci/woot'] = ''; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'ci/woot'; + $this->assertSame($expected, $factory->detectRoutePath('QUERY_STRING')); + } + + public function testQueryStringWithQueryString() + { + // /index.php?/ci/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot?code=good'; + $_SERVER['QUERY_STRING'] = '/ci/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $_GET['/ci/woot?code'] = 'good'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'ci/woot'; + $this->assertSame($expected, $factory->detectRoutePath('QUERY_STRING')); + $this->assertSame('code=good', $_SERVER['QUERY_STRING']); + $this->assertSame(['code' => 'good'], $_GET); + } + + public function testQueryStringEmpty() + { + // /index.php? + $_SERVER['REQUEST_URI'] = '/index.php?'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = '/'; + $this->assertSame($expected, $factory->detectRoutePath('QUERY_STRING')); + } + + public function testPathInfoUnset() + { + // /index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('PATH_INFO')); + } + + public function testPathInfoSubfolder() + { + $appConfig = new App(); + $appConfig->baseURL = 'http://localhost:8888/ci431/public/'; + + // http://localhost:8888/ci431/public/index.php/woot?code=good#pos + $_SERVER['PATH_INFO'] = '/woot'; + $_SERVER['REQUEST_URI'] = '/ci431/public/index.php/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/ci431/public/index.php'; + + $factory = $this->createSiteURIFactory($_SERVER, $appConfig); + + $expected = 'woot'; + $this->assertSame($expected, $factory->detectRoutePath('PATH_INFO')); + } +} diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php new file mode 100644 index 000000000000..294ae9e9844b --- /dev/null +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -0,0 +1,91 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP; + +use CodeIgniter\Test\CIUnitTestCase; +use Config\App; + +/** + * @backupGlobals enabled + * + * @internal + * + * @group Others + */ +final class SiteURIFactoryTest extends CIUnitTestCase +{ + protected function setUp(): void + { + parent::setUp(); + + $_GET = $_SERVER = []; + } + + public function testCreateFromGlobals() + { + // http://localhost:8080/index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + $_SERVER['QUERY_STRING'] = 'code=good'; + $_SERVER['HTTP_HOST'] = 'localhost:8080'; + $_SERVER['PATH_INFO'] = '/woot'; + + $_GET['code'] = 'good'; + + $factory = new SiteURIFactory($_SERVER, new App()); + + $uri = $factory->createFromGlobals(); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://localhost:8080/index.php/woot?code=good', (string) $uri); + $this->assertSame('/index.php/woot', $uri->getPath()); + $this->assertSame('woot', $uri->getRoutePath()); + } + + public function testCreateFromGlobalsAllowedHost() + { + // http://users.example.jp/index.php/woot?code=good#pos + $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good'; + $_SERVER['SCRIPT_NAME'] = '/index.php'; + $_SERVER['QUERY_STRING'] = 'code=good'; + $_SERVER['HTTP_HOST'] = 'users.example.jp'; + $_SERVER['PATH_INFO'] = '/woot'; + + $_GET['code'] = 'good'; + + $config = new App(); + $config->baseURL = 'http://example.jp/'; + $config->allowedHostnames = ['users.example.jp']; + + $factory = new SiteURIFactory($_SERVER, $config); + + $uri = $factory->createFromGlobals(); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://users.example.jp/index.php/woot?code=good', (string) $uri); + $this->assertSame('/index.php/woot', $uri->getPath()); + $this->assertSame('woot', $uri->getRoutePath()); + } + + public function testCreateFromString() + { + $factory = new SiteURIFactory($_SERVER, new App()); + + $uriString = 'http://invalid.example.jp/foo/bar?page=3'; + $uri = $factory->createFromString($uriString); + + $this->assertInstanceOf(SiteURI::class, $uri); + $this->assertSame('http://localhost:8080/index.php/foo/bar?page=3', (string) $uri); + $this->assertSame('/index.php/foo/bar', $uri->getPath()); + $this->assertSame('foo/bar', $uri->getRoutePath()); + } +} From 09a96abb01315a8f8a0d1c2097f2870c6a893eef Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 23 Feb 2023 16:06:03 +0900 Subject: [PATCH 4273/8282] fix: createFromString() returns URI with invalid hostname --- system/HTTP/SiteURIFactory.php | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index e96cc2781f85..0115ef5df9d5 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -71,8 +71,9 @@ public function createFromString(string $uri): SiteURI } $relativePath = $parts['path'] . $query . $fragment; + $host = $this->getValidHost($parts['host']); - return new SiteURI($this->appConfig, $relativePath, $parts['host'], $parts['scheme']); + return new SiteURI($this->appConfig, $relativePath, $host, $parts['scheme']); } /** @@ -231,21 +232,30 @@ private function createURIFromRoutePath(string $routePath): SiteURI } /** - * @return string|null The current hostname. Returns null if no host header. + * @return string|null The current hostname. Returns null if no valid host. */ private function getHost(): ?string { - $host = null; - $httpHostPort = $this->server['HTTP_HOST'] ?? null; + if ($httpHostPort !== null) { [$httpHost] = explode(':', $httpHostPort, 2); - if (in_array($httpHost, $this->appConfig->allowedHostnames, true)) { - $host = $httpHost; - } + return $this->getValidHost($httpHost); + } + + return null; + } + + /** + * @return string|null The valid hostname. Returns null if not valid. + */ + private function getValidHost(string $host): ?string + { + if (in_array($host, $this->appConfig->allowedHostnames, true)) { + return $host; } - return $host; + return null; } } From 37772e910e7ddaab91185b8a8813d2977fd2678c Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 08:20:45 +0900 Subject: [PATCH 4274/8282] docs: add version to @deprecated --- system/HTTP/IncomingRequest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 99bbf223f405..bf9e01a8a603 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -236,7 +236,7 @@ protected function detectURI(string $protocol, string $baseURL) * Detects the relative path based on * the URIProtocol Config setting. * - * @deprecated Moved to SiteURIFactory. + * @deprecated 4.4.0 Moved to SiteURIFactory. */ public function detectPath(string $protocol = ''): string { @@ -268,7 +268,7 @@ public function detectPath(string $protocol = ''): string * * @return string The URI it found. * - * @deprecated Moved to SiteURIFactory. + * @deprecated 4.4.0 Moved to SiteURIFactory. */ protected function parseRequestURI(): string { @@ -328,7 +328,7 @@ protected function parseRequestURI(): string * * Will parse QUERY_STRING and automatically detect the URI from it. * - * @deprecated Moved to SiteURIFactory. + * @deprecated 4.4.0 Moved to SiteURIFactory. */ protected function parseQueryString(): string { @@ -502,7 +502,7 @@ public function setPath(string $path, ?App $config = null) } /** - * @deprecated Moved to SiteURIFactory. + * @deprecated 4.4.0 Moved to SiteURIFactory. */ private function determineHost(App $config, string $baseURL): string { From 9937a0308a4a288a43f1c53d36a18407a5ecf9f3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 09:32:19 +0900 Subject: [PATCH 4275/8282] refactor: extract class Superglobals and use it --- system/HTTP/SiteURIFactory.php | 64 +++++++------------ system/Superglobals.php | 35 ++++++++++ .../SiteURIFactoryDetectRoutePathTest.php | 6 +- tests/system/HTTP/SiteURIFactoryTest.php | 10 ++- 4 files changed, 71 insertions(+), 44 deletions(-) create mode 100644 system/Superglobals.php diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index 0115ef5df9d5..dbe29546963e 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -12,24 +12,18 @@ namespace CodeIgniter\HTTP; use CodeIgniter\HTTP\Exceptions\HTTPException; +use CodeIgniter\Superglobals; use Config\App; class SiteURIFactory { - /** - * @var array Superglobal SERVER array - */ - private array $server; - + private Superglobals $superglobals; private App $appConfig; - /** - * @param array $server Superglobal $_SERVER array - */ - public function __construct(array $server, App $appConfig) + public function __construct(Superglobals $superglobals, App $appConfig) { - $this->server = $server; - $this->appConfig = $appConfig; + $this->superglobals = $superglobals; + $this->appConfig = $appConfig; } /** @@ -103,7 +97,7 @@ public function detectRoutePath(string $protocol = ''): string case 'PATH_INFO': default: - $routePath = $this->server[$protocol] ?? $this->parseRequestURI(); + $routePath = $this->superglobals->server($protocol) ?? $this->parseRequestURI(); break; } @@ -120,7 +114,10 @@ public function detectRoutePath(string $protocol = ''): string */ private function parseRequestURI(): string { - if (! isset($this->server['REQUEST_URI'], $this->server['SCRIPT_NAME'])) { + if ( + $this->superglobals->server('REQUEST_URI') === null + || $this->superglobals->server('SCRIPT_NAME') === null + ) { return ''; } @@ -128,19 +125,19 @@ private function parseRequestURI(): string // string contains a colon followed by a number. So we attach a dummy // host since REQUEST_URI does not include the host. This allows us to // parse out the query string and path. - $parts = parse_url('http://dummy' . $this->server['REQUEST_URI']); + $parts = parse_url('http://dummy' . $this->superglobals->server('REQUEST_URI')); $query = $parts['query'] ?? ''; $path = $parts['path'] ?? ''; // Strip the SCRIPT_NAME path from the URI if ( - $path !== '' && isset($this->server['SCRIPT_NAME'][0]) - && pathinfo($this->server['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php' + $path !== '' && isset($this->superglobals->server('SCRIPT_NAME')[0]) + && pathinfo($this->superglobals->server('SCRIPT_NAME'), PATHINFO_EXTENSION) === 'php' ) { // Compare each segment, dropping them until there is no match $segments = $keep = explode('/', $path); - foreach (explode('/', $this->server['SCRIPT_NAME']) as $i => $segment) { + foreach (explode('/', $this->superglobals->server('SCRIPT_NAME')) as $i => $segment) { // If these segments are not the same then we're done if (! isset($segments[$i]) || $segment !== $segments[$i]) { break; @@ -160,30 +157,18 @@ private function parseRequestURI(): string $path = $parts[0]; $newQuery = $query[1] ?? ''; - $this->server['QUERY_STRING'] = $newQuery; - $this->updateServer('QUERY_STRING', $newQuery); + $this->superglobals->setServer('QUERY_STRING', $newQuery); } else { - $this->server['QUERY_STRING'] = $query; - $this->updateServer('QUERY_STRING', $query); + $this->superglobals->setServer('QUERY_STRING', $query); } // Update our global GET for values likely to have been changed - parse_str($this->server['QUERY_STRING'], $get); - $this->updateGetArray($get); + parse_str($this->superglobals->server('QUERY_STRING'), $get); + $this->superglobals->setGetArray($get); return URI::removeDotSegments($path); } - private function updateServer(string $key, string $value): void - { - $_SERVER[$key] = $value; - } - - private function updateGetArray(array $array): void - { - $_GET = $array; - } - /** * Will parse QUERY_STRING and automatically detect the URI from it. * @@ -193,7 +178,7 @@ private function updateGetArray(array $array): void */ private function parseQueryString(): string { - $query = $this->server['QUERY_STRING'] ?? @getenv('QUERY_STRING'); + $query = $this->superglobals->server('QUERY_STRING') ?? @getenv('QUERY_STRING'); if (trim($query, '/') === '') { return '/'; @@ -204,15 +189,14 @@ private function parseQueryString(): string $path = $parts[0]; $newQuery = $parts[1] ?? ''; - $this->server['QUERY_STRING'] = $newQuery; - $this->updateServer('QUERY_STRING', $newQuery); + $this->superglobals->setServer('QUERY_STRING', $newQuery); } else { $path = $query; } // Update our global GET for values likely to have been changed - parse_str($this->server['QUERY_STRING'], $get); - $this->updateGetArray($get); + parse_str($this->superglobals->server('QUERY_STRING'), $get); + $this->superglobals->setGetArray($get); return URI::removeDotSegments($path); } @@ -224,7 +208,7 @@ private function parseQueryString(): string */ private function createURIFromRoutePath(string $routePath): SiteURI { - $query = $this->server['QUERY_STRING'] ?? ''; + $query = $this->superglobals->server('QUERY_STRING') ?? ''; $relativePath = $query !== '' ? $routePath . '?' . $query : $routePath; @@ -236,7 +220,7 @@ private function createURIFromRoutePath(string $routePath): SiteURI */ private function getHost(): ?string { - $httpHostPort = $this->server['HTTP_HOST'] ?? null; + $httpHostPort = $this->superglobals->server('HTTP_HOST') ?? null; if ($httpHostPort !== null) { [$httpHost] = explode(':', $httpHostPort, 2); diff --git a/system/Superglobals.php b/system/Superglobals.php new file mode 100644 index 000000000000..65ab800e98f3 --- /dev/null +++ b/system/Superglobals.php @@ -0,0 +1,35 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter; + +/** + * Superglobals manipulation. + * + * @internal + */ +final class Superglobals +{ + public function server(string $key): ?string + { + return $_SERVER[$key] ?? null; + } + + public function setServer(string $key, string $value): void + { + $_SERVER[$key] = $value; + } + + public function setGetArray(array $array): void + { + $_GET = $array; + } +} diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php index 3b7715049a5c..12d111f33390 100644 --- a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -34,7 +35,10 @@ private function createSiteURIFactory(array $server, ?App $appConfig = null): Si { $appConfig ??= new App(); - return new SiteURIFactory($server, $appConfig); + $_SERVER = $server; + $superglobals = new Superglobals(); + + return new SiteURIFactory($superglobals, $appConfig); } public function testDefault() diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index 294ae9e9844b..12ee43757579 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -41,7 +42,8 @@ public function testCreateFromGlobals() $_GET['code'] = 'good'; - $factory = new SiteURIFactory($_SERVER, new App()); + $superglobals = new Superglobals(); + $factory = new SiteURIFactory($superglobals, new App()); $uri = $factory->createFromGlobals(); @@ -66,7 +68,8 @@ public function testCreateFromGlobalsAllowedHost() $config->baseURL = 'http://example.jp/'; $config->allowedHostnames = ['users.example.jp']; - $factory = new SiteURIFactory($_SERVER, $config); + $superglobals = new Superglobals(); + $factory = new SiteURIFactory($superglobals, $config); $uri = $factory->createFromGlobals(); @@ -78,7 +81,8 @@ public function testCreateFromGlobalsAllowedHost() public function testCreateFromString() { - $factory = new SiteURIFactory($_SERVER, new App()); + $superglobals = new Superglobals(); + $factory = new SiteURIFactory($superglobals, new App()); $uriString = 'http://invalid.example.jp/foo/bar?page=3'; $uri = $factory->createFromString($uriString); From 8522e992208ca795f16254156cbed21a55ea82b1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 09:43:19 +0900 Subject: [PATCH 4276/8282] test: extract createSiteURIFactory() --- tests/system/HTTP/SiteURIFactoryTest.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index 12ee43757579..e211e7167db5 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -31,6 +31,14 @@ protected function setUp(): void $_GET = $_SERVER = []; } + private function createSiteURIFactory(?App $config = null, ?Superglobals $superglobals = null): SiteURIFactory + { + $config ??= new App(); + $superglobals ??= new Superglobals(); + + return new SiteURIFactory($superglobals, $config); + } + public function testCreateFromGlobals() { // http://localhost:8080/index.php/woot?code=good#pos @@ -42,8 +50,7 @@ public function testCreateFromGlobals() $_GET['code'] = 'good'; - $superglobals = new Superglobals(); - $factory = new SiteURIFactory($superglobals, new App()); + $factory = $this->createSiteURIFactory(); $uri = $factory->createFromGlobals(); @@ -68,8 +75,7 @@ public function testCreateFromGlobalsAllowedHost() $config->baseURL = 'http://example.jp/'; $config->allowedHostnames = ['users.example.jp']; - $superglobals = new Superglobals(); - $factory = new SiteURIFactory($superglobals, $config); + $factory = $this->createSiteURIFactory($config); $uri = $factory->createFromGlobals(); @@ -81,8 +87,7 @@ public function testCreateFromGlobalsAllowedHost() public function testCreateFromString() { - $superglobals = new Superglobals(); - $factory = new SiteURIFactory($superglobals, new App()); + $factory = $this->createSiteURIFactory(); $uriString = 'http://invalid.example.jp/foo/bar?page=3'; $uri = $factory->createFromString($uriString); From be7ca15611603c7ff7f9558e0f5fae03061c8ab5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 09:44:44 +0900 Subject: [PATCH 4277/8282] refactor: change parameter order --- system/HTTP/SiteURIFactory.php | 6 +++--- tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php | 2 +- tests/system/HTTP/SiteURIFactoryTest.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index dbe29546963e..c8996038116f 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -17,13 +17,13 @@ class SiteURIFactory { - private Superglobals $superglobals; private App $appConfig; + private Superglobals $superglobals; - public function __construct(Superglobals $superglobals, App $appConfig) + public function __construct(App $appConfig, Superglobals $superglobals) { - $this->superglobals = $superglobals; $this->appConfig = $appConfig; + $this->superglobals = $superglobals; } /** diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php index 12d111f33390..b207d1134dc4 100644 --- a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -38,7 +38,7 @@ private function createSiteURIFactory(array $server, ?App $appConfig = null): Si $_SERVER = $server; $superglobals = new Superglobals(); - return new SiteURIFactory($superglobals, $appConfig); + return new SiteURIFactory($appConfig, $superglobals); } public function testDefault() diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index e211e7167db5..138ccad0b48d 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -36,7 +36,7 @@ private function createSiteURIFactory(?App $config = null, ?Superglobals $superg $config ??= new App(); $superglobals ??= new Superglobals(); - return new SiteURIFactory($superglobals, $config); + return new SiteURIFactory($config, $superglobals); } public function testCreateFromGlobals() From 1a95c89421e9ea25282e201c7f1c3c39f1eb84f2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 12 Jul 2023 09:50:40 +0900 Subject: [PATCH 4278/8282] feat: allow Superglobals state changes from the constructor --- system/Superglobals.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/system/Superglobals.php b/system/Superglobals.php index 65ab800e98f3..4ffa51033bac 100644 --- a/system/Superglobals.php +++ b/system/Superglobals.php @@ -18,18 +18,37 @@ */ final class Superglobals { + private array $server; + private array $get; + + public function __construct(?array $server = null, ?array $get = null) + { + $this->server = $server ?? $_SERVER; + $this->get = $get ?? $_GET; + } + public function server(string $key): ?string { - return $_SERVER[$key] ?? null; + return $this->server[$key] ?? null; } public function setServer(string $key, string $value): void { - $_SERVER[$key] = $value; + $this->server[$key] = $value; + $_SERVER[$key] = $value; + } + + /** + * @return array|string|null + */ + public function get(string $key) + { + return $this->get[$key] ?? null; } public function setGetArray(array $array): void { - $_GET = $array; + $this->get = $array; + $_GET = $array; } } From 78b0ac6ef9d1fed2a48d16d74b1389a550146d7e Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 09:32:33 +0900 Subject: [PATCH 4279/8282] refactore: remove `@` that does not make sense, and cast to string Because it might be false. --- system/HTTP/SiteURIFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index c8996038116f..49ee3bf3ed73 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -178,7 +178,7 @@ private function parseRequestURI(): string */ private function parseQueryString(): string { - $query = $this->superglobals->server('QUERY_STRING') ?? @getenv('QUERY_STRING'); + $query = $this->superglobals->server('QUERY_STRING') ?? (string) getenv('QUERY_STRING'); if (trim($query, '/') === '') { return '/'; From fde3216efdb84392aeb7c53df1f2df2c0a6bd74f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 09:37:34 +0900 Subject: [PATCH 4280/8282] refactor: remove string array access It is difficult to understand. --- system/HTTP/SiteURIFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index 49ee3bf3ed73..fcf295c82b02 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -131,7 +131,7 @@ private function parseRequestURI(): string // Strip the SCRIPT_NAME path from the URI if ( - $path !== '' && isset($this->superglobals->server('SCRIPT_NAME')[0]) + $path !== '' && $this->superglobals->server('SCRIPT_NAME') !== '' && pathinfo($this->superglobals->server('SCRIPT_NAME'), PATHINFO_EXTENSION) === 'php' ) { // Compare each segment, dropping them until there is no match From 6b3dd7af0da55785d6342883634738db8e0779fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 09:40:55 +0900 Subject: [PATCH 4281/8282] refactor: make SiteURIFactory final --- system/HTTP/SiteURIFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/HTTP/SiteURIFactory.php b/system/HTTP/SiteURIFactory.php index fcf295c82b02..f0b846a44457 100644 --- a/system/HTTP/SiteURIFactory.php +++ b/system/HTTP/SiteURIFactory.php @@ -15,7 +15,7 @@ use CodeIgniter\Superglobals; use Config\App; -class SiteURIFactory +final class SiteURIFactory { private App $appConfig; private Superglobals $superglobals; From 84b4a31535cd767225a0cdcdeb40c7170fefc1c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 09:50:00 +0900 Subject: [PATCH 4282/8282] feat: add Superglobals::setGet() --- system/Superglobals.php | 6 ++++++ tests/system/SuperglobalsTest.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/system/SuperglobalsTest.php diff --git a/system/Superglobals.php b/system/Superglobals.php index 4ffa51033bac..b126af130f34 100644 --- a/system/Superglobals.php +++ b/system/Superglobals.php @@ -46,6 +46,12 @@ public function get(string $key) return $this->get[$key] ?? null; } + public function setGet(string $key, string $value): void + { + $this->get[$key] = $value; + $_GET[$key] = $value; + } + public function setGetArray(array $array): void { $this->get = $array; diff --git a/tests/system/SuperglobalsTest.php b/tests/system/SuperglobalsTest.php new file mode 100644 index 000000000000..f530145da766 --- /dev/null +++ b/tests/system/SuperglobalsTest.php @@ -0,0 +1,31 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter; + +use CodeIgniter\Test\CIUnitTestCase; + +/** + * @internal + * + * @group Others + */ +final class SuperglobalsTest extends CIUnitTestCase +{ + public function testSetGet() + { + $globals = new Superglobals([], []); + + $globals->setGet('test', 'value1'); + + $this->assertSame('value1', $globals->get('test')); + } +} From 23336a3289e2f3b68d0034734d6b268b93e7fa33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 15:08:36 +0000 Subject: [PATCH 4283/8282] build(deps-dev): update rector/rector requirement from 0.17.6 to 0.17.7 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/0.17.6...0.17.7) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 671a1023ca65..981db0694265 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "0.17.6", + "rector/rector": "0.17.7", "vimeo/psalm": "^5.0" }, "suggest": { From b08c28aee8358538c3849a418836b9b0ac348cb8 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Fri, 21 Jul 2023 14:14:33 +0800 Subject: [PATCH 4284/8282] Add auto-review workflow --- .github/workflows/test-autoreview.yml | 78 +++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml index dfe4892bdebe..79d9bd876615 100644 --- a/.github/workflows/test-autoreview.yml +++ b/.github/workflows/test-autoreview.yml @@ -29,3 +29,81 @@ jobs: php-version: '8.1' job-id: auto-review-tests group-name: AutoReview + + composer-normalize-tests: + name: Check normalized composer.json + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.1' + + - name: Install composer normalize + run: | + composer global require ergebnis/composer-normalize --no-interaction + composer global config allow-plugins.ergebnis/composer-normalize true --no-interaction + + - name: Run on root composer.json + id: normalize-root-composer + if: ${{ always() }} + run: | + echo "ROOT_COMPOSER_RESULT<> $GITHUB_OUTPUT + echo "$(composer normalize)" >> $GITHUB_OUTPUT + echo "RCR" >> $GITHUB_OUTPUT + + - name: Run on framework composer.json + id: normalize-framework-composer + if: ${{ always() }} + working-directory: admin/framework + run: | + echo "FRAMEWORK_COMPOSER_RESULT<> $GITHUB_OUTPUT + echo "$(composer normalize)" >> $GITHUB_OUTPUT + echo "FCR" >> $GITHUB_OUTPUT + + - name: Run on starter composer.json + id: normalize-starter-composer + if: ${{ always() }} + working-directory: admin/starter + run: | + echo "STARTER_COMPOSER_RESULT<> $GITHUB_OUTPUT + echo "$(composer normalize)" >> $GITHUB_OUTPUT + echo "SCR" >> $GITHUB_OUTPUT + + - name: Analyse normalization results + run: | + if [[ '${{ steps.normalize-root-composer.conclusion }}' == 'failure' ]]; then + echo 'Normalization of root composer.json encountered a problem.'; + echo 'Please run it locally: `composer normalize`'; + exit 1; + fi + + if [[ ${{ contains(steps.normalize-root-composer.outputs.ROOT_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then + echo 'Root composer.json is not yet normalized.'; + exit 1; + fi + + if [[ '${{ steps.normalize-framework-composer.conclusion }}' == 'failure' ]]; then + echo 'Normalization of framework composer.json encountered a problem.'; + echo 'Please run it locally: `composer normalize -d admin/framework`'; + exit 1; + fi + + if [[ ${{ contains(steps.normalize-framework-composer.outputs.FRAMEWORK_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then + echo 'Framework composer.json is not yet normalized.'; + exit 1; + fi + + if [[ '${{ steps.normalize-starter-composer.conclusion }}' == 'failure' ]]; then + echo 'Normalization of starter composer.json encountered a problem.'; + echo 'Please run it locally: `composer normalize -d admin/framework`'; + exit 1; + fi + + if [[ ${{ contains(steps.normalize-starter-composer.outputs.STARTER_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then + echo 'Starter composer.json is not yet normalized.'; + exit 1; + fi From bd6a8e3e28c2d1dbf409af335450aabd0fc9a81e Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Fri, 21 Jul 2023 17:53:34 +0800 Subject: [PATCH 4285/8282] Run composer normalize --- admin/framework/composer.json | 50 ++++++++++++------------- admin/starter/composer.json | 24 ++++++------ composer.json | 70 +++++++++++++++++------------------ 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 905e123cd89a..f93daa275b1d 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -1,9 +1,14 @@ { "name": "codeigniter4/framework", - "type": "project", "description": "The CodeIgniter framework v4", - "homepage": "https://codeigniter.com", "license": "MIT", + "type": "project", + "homepage": "https://codeigniter.com", + "support": { + "forum": "https://forum.codeigniter.com/", + "source": "https://github.com/codeigniter4/CodeIgniter4", + "slack": "https://codeigniterchat.slack.com" + }, "require": { "php": "^7.4 || ^8.0", "ext-intl": "*", @@ -13,10 +18,10 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.4", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", "friendsofphp/php-cs-fixer": "3.13.0", + "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", "phpunit/phpunit": "^9.1", @@ -24,28 +29,23 @@ }, "suggest": { "ext-curl": "If you use CURLRequest class", - "ext-imagick": "If you use Image class ImageMagickHandler", - "ext-gd": "If you use Image class GDHandler", + "ext-dom": "If you use TestResponse", "ext-exif": "If you run Image class tests", - "ext-simplexml": "If you format XML", + "ext-fileinfo": "Improves mime type detection for files", + "ext-gd": "If you use Image class GDHandler", + "ext-imagick": "If you use Image class ImageMagickHandler", + "ext-libxml": "If you use TestResponse", + "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", + "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", "ext-mysqli": "If you use MySQL", "ext-oci8": "If you use Oracle Database", "ext-pgsql": "If you use PostgreSQL", - "ext-sqlsrv": "If you use SQL Server", - "ext-sqlite3": "If you use SQLite3", - "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", - "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", + "ext-readline": "Improves CLI::input() usability", "ext-redis": "If you use Cache class RedisHandler", - "ext-dom": "If you use TestResponse", - "ext-libxml": "If you use TestResponse", - "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()", - "ext-fileinfo": "Improves mime type detection for files", - "ext-readline": "Improves CLI::input() usability" - }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true + "ext-simplexml": "If you format XML", + "ext-sqlite3": "If you use SQLite3", + "ext-sqlsrv": "If you use SQL Server", + "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()" }, "autoload": { "psr-4": { @@ -55,12 +55,12 @@ "**/Database/Migrations/**" ] }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, "scripts": { "test": "phpunit" - }, - "support": { - "forum": "https://forum.codeigniter.com/", - "source": "https://github.com/codeigniter4/CodeIgniter4", - "slack": "https://codeigniterchat.slack.com" } } diff --git a/admin/starter/composer.json b/admin/starter/composer.json index cec23ba1987e..082d7b648c25 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -1,9 +1,14 @@ { "name": "codeigniter4/appstarter", - "type": "project", "description": "CodeIgniter4 starter app", - "homepage": "https://codeigniter.com", "license": "MIT", + "type": "project", + "homepage": "https://codeigniter.com", + "support": { + "forum": "https://forum.codeigniter.com/", + "source": "https://github.com/codeigniter4/CodeIgniter4", + "slack": "https://codeigniterchat.slack.com" + }, "require": { "php": "^7.4 || ^8.0", "codeigniter4/framework": "^4.0" @@ -13,11 +18,6 @@ "mikey179/vfsstream": "^1.6", "phpunit/phpunit": "^9.1" }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, "autoload": { "exclude-from-classmap": [ "**/Database/Migrations/**" @@ -28,12 +28,12 @@ "Tests\\Support\\": "tests/_support" } }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, "scripts": { "test": "phpunit" - }, - "support": { - "forum": "https://forum.codeigniter.com/", - "source": "https://github.com/codeigniter4/CodeIgniter4", - "slack": "https://codeigniterchat.slack.com" } } diff --git a/composer.json b/composer.json index 981db0694265..53fc1ef47018 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,14 @@ { "name": "codeigniter4/codeigniter4", - "type": "project", "description": "The CodeIgniter framework v4", - "homepage": "https://codeigniter.com", "license": "MIT", + "type": "project", + "homepage": "https://codeigniter.com", + "support": { + "forum": "https://forum.codeigniter.com/", + "source": "https://github.com/codeigniter4/CodeIgniter4", + "slack": "https://codeigniterchat.slack.com" + }, "require": { "php": "^7.4 || ^8.0", "ext-intl": "*", @@ -13,9 +18,9 @@ "psr/log": "^1.1" }, "require-dev": { - "kint-php/kint": "^5.0.4", "codeigniter/coding-standard": "^1.5", "fakerphp/faker": "^1.9", + "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", "nexusphp/tachycardia": "^1.0", @@ -29,33 +34,23 @@ }, "suggest": { "ext-curl": "If you use CURLRequest class", - "ext-imagick": "If you use Image class ImageMagickHandler", - "ext-gd": "If you use Image class GDHandler", + "ext-dom": "If you use TestResponse", "ext-exif": "If you run Image class tests", - "ext-simplexml": "If you format XML", + "ext-fileinfo": "Improves mime type detection for files", + "ext-gd": "If you use Image class GDHandler", + "ext-imagick": "If you use Image class ImageMagickHandler", + "ext-libxml": "If you use TestResponse", + "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", + "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", "ext-mysqli": "If you use MySQL", "ext-oci8": "If you use Oracle Database", "ext-pgsql": "If you use PostgreSQL", - "ext-sqlsrv": "If you use SQL Server", - "ext-sqlite3": "If you use SQLite3", - "ext-memcache": "If you use Cache class MemcachedHandler with Memcache", - "ext-memcached": "If you use Cache class MemcachedHandler with Memcached", + "ext-readline": "Improves CLI::input() usability", "ext-redis": "If you use Cache class RedisHandler", - "ext-dom": "If you use TestResponse", - "ext-libxml": "If you use TestResponse", - "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()", - "ext-fileinfo": "Improves mime type detection for files", - "ext-readline": "Improves CLI::input() usability" - }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, - "extra": { - "branch-alias": { - "dev-develop": "4.x-dev" - } + "ext-simplexml": "If you format XML", + "ext-sqlite3": "If you use SQLite3", + "ext-sqlsrv": "If you use SQL Server", + "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()" }, "autoload": { "psr-4": { @@ -71,6 +66,16 @@ "Utils\\": "utils/" } }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-develop": "4.x-dev" + } + }, "scripts": { "post-update-cmd": [ "CodeIgniter\\ComposerScripts::postUpdate", @@ -81,8 +86,6 @@ "bash -c \"XDEBUG_MODE=off phpstan analyse\"", "rector process --dry-run" ], - "sa": "@analyze", - "test": "phpunit", "cs": [ "Composer\\Config::disableProcessTimeout", "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php", @@ -95,17 +98,14 @@ "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php", "php-cs-fixer fix --ansi --verbose --diff" ], - "style": "@cs-fix" + "sa": "@analyze", + "style": "@cs-fix", + "test": "phpunit" }, "scripts-descriptions": { "analyze": "Run static analysis", - "test": "Run unit tests", "cs": "Check the coding style", - "cs-fix": "Fix the coding style" - }, - "support": { - "forum": "https://forum.codeigniter.com/", - "source": "https://github.com/codeigniter4/CodeIgniter4", - "slack": "https://codeigniterchat.slack.com" + "cs-fix": "Fix the coding style", + "test": "Run unit tests" } } From 3ef4d42004f5ec39ee83093e15a4b78fbada8289 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 25 Jul 2023 11:35:31 +0800 Subject: [PATCH 4286/8282] Require composer-normalize locally --- .github/workflows/test-autoreview.yml | 6 ++---- composer.json | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml index 79d9bd876615..6753b7ebc419 100644 --- a/.github/workflows/test-autoreview.yml +++ b/.github/workflows/test-autoreview.yml @@ -42,10 +42,8 @@ jobs: with: php-version: '8.1' - - name: Install composer normalize - run: | - composer global require ergebnis/composer-normalize --no-interaction - composer global config allow-plugins.ergebnis/composer-normalize true --no-interaction + - name: Install dependencies + run: composer update - name: Run on root composer.json id: normalize-root-composer diff --git a/composer.json b/composer.json index 53fc1ef47018..f06a8df04033 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ }, "require-dev": { "codeigniter/coding-standard": "^1.5", + "ergebnis/composer-normalize": "^2.28", "fakerphp/faker": "^1.9", "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", @@ -67,6 +68,9 @@ } }, "config": { + "allow-plugins": { + "ergebnis/composer-normalize": true + }, "optimize-autoloader": true, "preferred-install": "dist", "sort-packages": true From 58dc6cdcd537877be975caf1f13aaf36c350a2f0 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 25 Jul 2023 12:01:16 +0800 Subject: [PATCH 4287/8282] Add test for config --- tests/system/AutoReview/ComposerJsonTest.php | 31 ++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index dc9ad26b9ef8..e4abf910c492 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -73,12 +73,20 @@ public function testFrameworkSuggestIsTheSameWithDevSuggest(): void public function testFrameworkConfigIsTheSameWithDevSuggest(): void { - $this->checkFramework('config'); + $this->checkConfig( + $this->devComposer['config'], + $this->frameworkComposer['config'], + 'framework' + ); } public function testStarterConfigIsTheSameWithDevSuggest(): void { - $this->checkStarter('config'); + $this->checkConfig( + $this->devComposer['config'], + $this->starterComposer['config'], + 'starter' + ); } private function checkFramework(string $section): void @@ -99,6 +107,25 @@ private function checkStarter(string $section): void ); } + private function checkConfig(array $fromMain, array $fromComponent, string $component): void + { + foreach ($fromMain as $key => $expectedValue) { + if (! isset($fromComponent[$key])) { + $this->addToAssertionCount(1); + + continue; + } + + $actualValue = $fromComponent[$key]; + + $this->assertSame($expectedValue, $actualValue, sprintf( + '%s\'s value for config property "%s" is not same with the main composer.json\'s config.', + ucfirst($component), + $key + )); + } + } + private function getComposerJson(string $path): array { try { From 246eba4c6f245d2c0f1813e806ebcee36d558b60 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 13:56:29 +0900 Subject: [PATCH 4288/8282] fix: wrong Config classname to config() --- system/Debug/Toolbar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 17e67aa8eb94..f00ad09bd122 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -365,7 +365,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r return; } - $toolbar = Services::toolbar(config(self::class)); + $toolbar = Services::toolbar(config(ToolbarConfig::class)); $stats = $app->getPerformanceStats(); $data = $toolbar->run( $stats['startTime'], From d43095542d95c94dec7b0c0cd47dc39a98589dc1 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 25 Jul 2023 13:28:40 +0800 Subject: [PATCH 4289/8282] refactor ComposerJsonTest --- tests/system/AutoReview/ComposerJsonTest.php | 31 ++++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index e4abf910c492..ecc57c028cba 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\AutoReview; +use InvalidArgumentException; use JsonException; use PHPUnit\Framework\TestCase; @@ -40,7 +41,7 @@ protected function setUp(): void public function testFrameworkRequireIsTheSameWithDevRequire(): void { - $this->checkFramework('require'); + $this->checkSection('require', 'framework'); } public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void @@ -68,7 +69,7 @@ public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void public function testFrameworkSuggestIsTheSameWithDevSuggest(): void { - $this->checkFramework('suggest'); + $this->checkSection('suggest', 'framework'); } public function testFrameworkConfigIsTheSameWithDevSuggest(): void @@ -89,21 +90,25 @@ public function testStarterConfigIsTheSameWithDevSuggest(): void ); } - private function checkFramework(string $section): void + private function checkSection(string $section, string $component): void { - $this->assertSame( - $this->devComposer[$section], - $this->frameworkComposer[$section], - 'The framework\'s "' . $section . '" section is not updated with the main composer.json.' - ); - } + switch (strtolower($component)) { + case 'framework': + $sectionContent = $this->frameworkComposer[$section] ?? null; + break; + + case 'starter': + $sectionContent = $this->starterComposer[$section] ?? null; + break; + + default: + throw new InvalidArgumentException(sprintf('Unknown component: %s.', $component)); + } - private function checkStarter(string $section): void - { $this->assertSame( $this->devComposer[$section], - $this->starterComposer[$section], - 'The starter\'s "' . $section . '" section is not updated with the main composer.json.' + $sectionContent, + sprintf('The %s\'s "%s" section is not updated with the main composer.json', strtolower($component), $section) ); } From 75d87ed9d47cc9cacd4e232112dcd2fed6745a8a Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Wed, 19 Jul 2023 23:27:10 +0800 Subject: [PATCH 4290/8282] Fix failures due to line ending --- tests/system/Commands/RoutesTest.php | 2 +- tests/system/Commands/Utilities/NamespacesTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 6d506274145d..bb89d35bb96d 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -39,7 +39,7 @@ protected function tearDown(): void protected function getBuffer() { - return $this->getStreamFilterBuffer(); + return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer()); } private function getCleanRoutes(): RouteCollection diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index 1b9d15a9e361..b561e4eea599 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -37,7 +37,7 @@ protected function tearDown(): void protected function getBuffer() { - return $this->getStreamFilterBuffer(); + return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer()); } public function testNamespacesCommandCodeIgniterOnly() From ccbfcfa7a7339d277606f7b2c2e0c6d19b67dfdb Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 25 Jul 2023 13:51:30 +0800 Subject: [PATCH 4291/8282] Fix failures due to path in heredoc --- tests/system/Commands/Utilities/NamespacesTest.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index b561e4eea599..26eabd32895f 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -35,9 +35,16 @@ protected function tearDown(): void $this->resetServices(); } + /** + * @see https://regex101.com/r/l3lHfR/1 + */ protected function getBuffer() { - return str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer()); + return preg_replace_callback('/(\|\s*[^|]+\s*\|\s*)(.*?)(\s*\|\s*[^|]+\s*\|)/', static function (array $matches) { + $matches[2] = str_replace(DIRECTORY_SEPARATOR, '/', $matches[2]); + + return $matches[1] . $matches[2] . $matches[3]; + }, str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer())); } public function testNamespacesCommandCodeIgniterOnly() From 23539c95ff1d3a70ff5ce9f396678c40460f90d6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 06:26:47 +0900 Subject: [PATCH 4292/8282] fix: merge Exception::maskSensitiveData() fix into BaseExceptionHandler --- system/Debug/BaseExceptionHandler.php | 45 +++++++---- system/Debug/Exceptions.php | 4 +- tests/system/Debug/ExceptionHandlerTest.php | 82 +++++++++++++++++++++ 3 files changed, 117 insertions(+), 14 deletions(-) diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php index 9afd450e8b48..0a4bfc8eeb1c 100644 --- a/system/Debug/BaseExceptionHandler.php +++ b/system/Debug/BaseExceptionHandler.php @@ -70,7 +70,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array $trace = $exception->getTrace(); if ($this->config->sensitiveDataInTrace !== []) { - $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace); + $trace = $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace); } return [ @@ -89,30 +89,49 @@ protected function collectVars(Throwable $exception, int $statusCode): array * * @param array|object $trace */ - protected function maskSensitiveData(&$trace, array $keysToMask, string $path = ''): void + protected function maskSensitiveData($trace, array $keysToMask, string $path = '') + { + foreach ($trace as $i => $line) { + $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask); + } + + return $trace; + } + + /** + * @param array|object $args + * + * @return array|object + */ + private function maskData($args, array $keysToMask, string $path = '') { foreach ($keysToMask as $keyToMask) { $explode = explode('/', $keyToMask); $index = end($explode); if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) { - if (is_array($trace) && array_key_exists($index, $trace)) { - $trace[$index] = '******************'; - } elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->{$index})) { - $trace->{$index} = '******************'; + if (is_array($args) && array_key_exists($index, $args)) { + $args[$index] = '******************'; + } elseif ( + is_object($args) && property_exists($args, $index) + && isset($args->{$index}) && is_scalar($args->{$index}) + ) { + $args->{$index} = '******************'; } } } - if (is_object($trace)) { - $trace = get_object_vars($trace); - } - - if (is_array($trace)) { - foreach ($trace as $pathKey => $subarray) { - $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey); + if (is_array($args)) { + foreach ($args as $pathKey => $subarray) { + $args[$pathKey] = $this->maskData($subarray, $keysToMask, $path . '/' . $pathKey); + } + } elseif (is_object($args)) { + foreach ($args as $pathKey => $subarray) { + $args->{$pathKey} = $this->maskData($subarray, $keysToMask, $path . '/' . $pathKey); } } + + return $args; } /** diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 3a7c0e4a3c39..d185070412a2 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -338,7 +338,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array * * @return array|object * - * @deprecated No longer used. Moved to BaseExceptionHandler. + * @deprecated 4.4.0 No longer used. Moved to BaseExceptionHandler. */ protected function maskSensitiveData($trace, array $keysToMask, string $path = '') { @@ -353,6 +353,8 @@ protected function maskSensitiveData($trace, array $keysToMask, string $path = ' * @param array|object $args * * @return array|object + * + * @deprecated 4.4.0 No longer used. Moved to BaseExceptionHandler. */ private function maskData($args, array $keysToMask, string $path = '') { diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php index f28f44a9b7e4..cd87eff739cf 100644 --- a/tests/system/Debug/ExceptionHandlerTest.php +++ b/tests/system/Debug/ExceptionHandlerTest.php @@ -11,6 +11,7 @@ namespace CodeIgniter\Debug; +use App\Controllers\Home; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; @@ -140,4 +141,85 @@ public function testHandleCLIPageNotFoundException(): void $this->resetStreamFilterBuffer(); } + + public function testMaskSensitiveData(): void + { + $maskSensitiveData = $this->getPrivateMethodInvoker($this->handler, 'maskSensitiveData'); + + $trace = [ + 0 => [ + 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', + 'line' => 15, + 'function' => 'f', + 'class' => Home::class, + 'type' => '->', + 'args' => [ + 0 => (object) [ + 'password' => 'secret1', + ], + 1 => (object) [ + 'default' => [ + 'password' => 'secret2', + ], + ], + 2 => [ + 'password' => 'secret3', + ], + 3 => [ + 'default' => ['password' => 'secret4'], + ], + ], + ], + 1 => [ + 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', + 'line' => 932, + 'function' => 'index', + 'class' => Home::class, + 'type' => '->', + 'args' => [ + ], + ], + ]; + $keysToMask = ['password']; + $path = ''; + + $newTrace = $maskSensitiveData($trace, $keysToMask, $path); + + $this->assertSame(['password' => '******************'], (array) $newTrace[0]['args'][0]); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][1]->default); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][2]); + $this->assertSame(['password' => '******************'], $newTrace[0]['args'][3]['default']); + } + + public function testMaskSensitiveDataTraceDataKey(): void + { + $maskSensitiveData = $this->getPrivateMethodInvoker($this->handler, 'maskSensitiveData'); + + $trace = [ + 0 => [ + 'file' => '/var/www/CodeIgniter4/app/Controllers/Home.php', + 'line' => 15, + 'function' => 'f', + 'class' => Home::class, + 'type' => '->', + 'args' => [ + ], + ], + 1 => [ + 'file' => '/var/www/CodeIgniter4/system/CodeIgniter.php', + 'line' => 932, + 'function' => 'index', + 'class' => Home::class, + 'type' => '->', + 'args' => [ + ], + ], + ]; + $keysToMask = ['file']; + $path = ''; + + $newTrace = $maskSensitiveData($trace, $keysToMask, $path); + + $this->assertSame('/var/www/CodeIgniter4/app/Controllers/Home.php', $newTrace[0]['file']); + } } From ec6835d1b93c06578bd9f746484d40c1b72a1ab6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 06:38:20 +0900 Subject: [PATCH 4293/8282] fix: declare param/return types --- system/Debug/BaseExceptionHandler.php | 4 +--- system/Debug/Exceptions.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php index 0a4bfc8eeb1c..0330c53cf97c 100644 --- a/system/Debug/BaseExceptionHandler.php +++ b/system/Debug/BaseExceptionHandler.php @@ -86,10 +86,8 @@ protected function collectVars(Throwable $exception, int $statusCode): array /** * Mask sensitive data in the trace. - * - * @param array|object $trace */ - protected function maskSensitiveData($trace, array $keysToMask, string $path = '') + protected function maskSensitiveData(array $trace, array $keysToMask, string $path = ''): array { foreach ($trace as $i => $line) { $trace[$i]['args'] = $this->maskData($line['args'], $keysToMask); diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index d185070412a2..8f07681f3a31 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -334,9 +334,9 @@ protected function collectVars(Throwable $exception, int $statusCode): array /** * Mask sensitive data in the trace. * - * @param array|object $trace + * @param array $trace * - * @return array|object + * @return array * * @deprecated 4.4.0 No longer used. Moved to BaseExceptionHandler. */ From a8b528e789bc07f0fa9626210a6a7a8f9374f017 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 9 Jul 2023 17:12:50 +0900 Subject: [PATCH 4294/8282] style: break long lines --- system/Config/Factories.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 222df063196a..fa533d9a791b 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -125,7 +125,11 @@ public static function __callStatic(string $component, array $arguments) protected static function locateClass(array $options, string $name): ?string { // Check for low-hanging fruit - if (class_exists($name, false) && self::verifyPreferApp($options, $name) && self::verifyInstanceOf($options, $name)) { + if ( + class_exists($name, false) + && self::verifyPreferApp($options, $name) + && self::verifyInstanceOf($options, $name) + ) { return $name; } @@ -136,7 +140,10 @@ protected static function locateClass(array $options, string $name): ?string : rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename; // If an App version was requested then see if it verifies - if ($options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name)) { + if ( + $options['preferApp'] && class_exists($appname) + && self::verifyInstanceOf($options, $name) + ) { return $appname; } From 85dd31b54817c22c7cceb5c532939a3845691aa1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 10:48:07 +0900 Subject: [PATCH 4295/8282] refactor: extract isConfig() --- system/Config/Factories.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index fa533d9a791b..16be3abe0e2f 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -116,6 +116,14 @@ public static function __callStatic(string $component, array $arguments) return self::$instances[$options['component']][$class]; } + /** + * Is the component Config? + */ + private static function isConfig(string $component): bool + { + return $component === 'config'; + } + /** * Finds a component class * @@ -135,7 +143,7 @@ class_exists($name, false) // Determine the relative class names we need $basename = self::getBasename($name); - $appname = $options['component'] === 'config' + $appname = self::isConfig($options['component']) ? 'Config\\' . $basename : rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename; @@ -194,7 +202,7 @@ protected static function verifyPreferApp(array $options, string $name): bool } // Special case for Config since its App namespace is actually \Config - if ($options['component'] === 'config') { + if (self::isConfig($options['component'])) { return strpos($name, 'Config') === 0; } @@ -233,7 +241,7 @@ public static function getOptions(string $component): array return self::$options[$component]; } - $values = $component === 'config' + $values = self::isConfig($component) // Handle Config as a special case to prevent logic loops ? self::$configOptions // Load values from the best Factory configuration (will include Registrars) From 79d3f351c9459ac464b6c23b49ebbb4f5ecfcb20 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 13:51:52 +0900 Subject: [PATCH 4296/8282] docs: add doc comments --- system/Config/Factories.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 16be3abe0e2f..a0802bdf9bd2 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -65,6 +65,8 @@ class Factories * A multi-dimensional array with components as * keys to the array of name-indexed instances. * + * [component => [FQCN => instance]] + * * @var array> * @phpstan-var array> */ @@ -118,6 +120,8 @@ public static function __callStatic(string $component, array $arguments) /** * Is the component Config? + * + * @param string $component Lowercase, plural component name */ private static function isConfig(string $component): bool { @@ -231,6 +235,8 @@ protected static function verifyInstanceOf(array $options, string $name): bool * @param string $component Lowercase, plural component name * * @return array + * + * @internal For testing only */ public static function getOptions(string $component): array { @@ -247,6 +253,8 @@ public static function getOptions(string $component): array // Load values from the best Factory configuration (will include Registrars) : config(Factory::class)->{$component} ?? []; + // The setOptions() reset the component. So getOptions() may reset + // the component. return self::setOptions($component, $values); } @@ -254,6 +262,7 @@ public static function getOptions(string $component): array * Normalizes, stores, and returns the configuration for a specific component * * @param string $component Lowercase, plural component name + * @param array $values option values * * @return array The result after applying defaults and normalization */ @@ -305,6 +314,8 @@ public static function reset(?string $component = null) * * @param string $component Lowercase, plural component name * @param string $name The name of the instance + * + * @internal For testing only */ public static function injectMock(string $component, string $name, object $instance) { @@ -321,6 +332,8 @@ public static function injectMock(string $component, string $name, object $insta /** * Gets a basename from a class name, namespaced or not. + * + * @internal For testing only */ public static function getBasename(string $name): string { From d7ed0536b786e473ccb6570592cbfc8bc0b44bad Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 13:52:23 +0900 Subject: [PATCH 4297/8282] feat: [BC] add Factories::define() to override module classes Except for Config, if FQCN is specified, preferApp is ignored and that class is loaded. --- system/Config/Factories.php | 95 +++++++++++++++++++++--- tests/system/Config/FactoriesTest.php | 103 ++++++++++++++++++++++++-- 2 files changed, 183 insertions(+), 15 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index a0802bdf9bd2..c91d62d75b37 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -14,6 +14,7 @@ use CodeIgniter\Database\ConnectionInterface; use CodeIgniter\Model; use Config\Services; +use InvalidArgumentException; /** * Factories for creating instances. @@ -51,9 +52,11 @@ class Factories ]; /** - * Mapping of class basenames (no namespace) to + * Mapping of classnames (with or without namespace) to * their instances. * + * [component => [name => FQCN]] + * * @var array> * @phpstan-var array> */ @@ -72,6 +75,37 @@ class Factories */ protected static $instances = []; + /** + * Define the class to load. You can *override* the concrete class. + * + * @param string $component Lowercase, plural component name + * @param string $name Classname. The first parameter of Factories magic method + * @param string $classname FQCN to load + * @phpstan-param class-string $classname FQCN to load + */ + public static function define(string $component, string $name, string $classname): void + { + if (isset(self::$basenames[$component][$name])) { + if (self::$basenames[$component][$name] === $classname) { + return; + } + + throw new InvalidArgumentException( + 'Already defined in Factories: ' . $component . ' ' . $name . ' -> ' . self::$basenames[$component][$name] + ); + } + + if (! class_exists($classname)) { + throw new InvalidArgumentException('No such class: ' . $classname); + } + + // Force a configuration to exist for this component. + // Otherwise, getOptions() will reset the component. + self::getOptions($component); + + self::$basenames[$component][$name] = $classname; + } + /** * Loads instances based on the method component name. Either * creates a new instance or returns an existing shared instance. @@ -88,6 +122,12 @@ public static function __callStatic(string $component, array $arguments) $options = array_merge(self::getOptions(strtolower($component)), $options); if (! $options['getShared']) { + if (isset(self::$basenames[$component][$name])) { + $class = self::$basenames[$component][$name]; + + return new $class(...$arguments); + } + if ($class = self::locateClass($options, $name)) { return new $class(...$arguments); } @@ -95,15 +135,39 @@ public static function __callStatic(string $component, array $arguments) return null; } - $basename = self::getBasename($name); - // Check for an existing instance - if (isset(self::$basenames[$options['component']][$basename])) { - $class = self::$basenames[$options['component']][$basename]; + if (isset(self::$basenames[$options['component']][$name])) { + $class = self::$basenames[$options['component']][$name]; // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { + if (isset(self::$instances[$options['component']][$class])) { + return self::$instances[$options['component']][$class]; + } + self::$instances[$options['component']][$class] = new $class(...$arguments); + return self::$instances[$options['component']][$class]; + + } + } + + // Check for an existing Config instance with basename. + if (self::isConfig($options['component'])) { + $basename = self::getBasename($name); + + if (isset(self::$basenames[$options['component']][$basename])) { + $class = self::$basenames[$options['component']][$basename]; + + // Need to verify if the shared instance matches the request + if (self::verifyInstanceOf($options, $class)) { + if (isset(self::$instances[$options['component']][$class])) { + return self::$instances[$options['component']][$class]; + } + self::$instances[$options['component']][$class] = new $class(...$arguments); + + return self::$instances[$options['component']][$class]; + + } } } @@ -112,8 +176,13 @@ public static function __callStatic(string $component, array $arguments) return null; } - self::$instances[$options['component']][$class] = new $class(...$arguments); - self::$basenames[$options['component']][$basename] = $class; + self::$instances[$options['component']][$class] = new $class(...$arguments); + self::$basenames[$options['component']][$name] = $class; + + // If a short classname is specified, also register FQCN to share the instance. + if (! isset(self::$basenames[$options['component']][$class])) { + self::$basenames[$options['component']][$class] = $class; + } return self::$instances[$options['component']][$class]; } @@ -153,7 +222,9 @@ class_exists($name, false) // If an App version was requested then see if it verifies if ( - $options['preferApp'] && class_exists($appname) + // preferApp is used only for no namespace class or Config class. + (strpos($name, '\\') === false || self::isConfig($options['component'])) + && $options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name) ) { return $appname; @@ -326,8 +397,12 @@ public static function injectMock(string $component, string $name, object $insta $class = get_class($instance); $basename = self::getBasename($name); - self::$instances[$component][$class] = $instance; - self::$basenames[$component][$basename] = $class; + self::$instances[$component][$class] = $instance; + self::$basenames[$component][$name] = $class; + + if (self::isConfig($component)) { + self::$basenames[$component][$basename] = $class; + } } /** diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index 655329ad95de..dc56c6535ab6 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -12,9 +12,13 @@ namespace CodeIgniter\Config; use CodeIgniter\Test\CIUnitTestCase; +use InvalidArgumentException; use ReflectionClass; use stdClass; +use Tests\Support\Config\TestRegistrar; +use Tests\Support\Models\EntityModel; use Tests\Support\Models\UserModel; +use Tests\Support\View\SampleClass; use Tests\Support\Widgets\OtherWidget; use Tests\Support\Widgets\SomeWidget; @@ -251,7 +255,33 @@ class_alias(SomeWidget::class, $class); $this->assertInstanceOf(SomeWidget::class, $result); } - public function testpreferAppOverridesClassname() + public function testPreferAppOverridesConfigClassname() + { + // Create a config class in App + $file = APPPATH . 'Config/TestRegistrar.php'; + $source = <<<'EOL' + assertInstanceOf('Config\TestRegistrar', $result); + + Factories::setOptions('config', ['preferApp' => false]); + + $result = Factories::config(TestRegistrar::class); + + $this->assertInstanceOf(TestRegistrar::class, $result); + + // Delete the config class in App + unlink($file); + } + + public function testPreferAppIsIgnored() { // Create a fake class in App $class = 'App\Widgets\OtherWidget'; @@ -260,11 +290,74 @@ class_alias(SomeWidget::class, $class); } $result = Factories::widgets(OtherWidget::class); - $this->assertInstanceOf(SomeWidget::class, $result); + $this->assertInstanceOf(OtherWidget::class, $result); + } - Factories::setOptions('widgets', ['preferApp' => false]); + public function testCanLoadTwoCellsWithSameShortName() + { + $cell1 = Factories::cells('\\' . SampleClass::class); + $cell2 = Factories::cells('\\' . \Tests\Support\View\OtherCells\SampleClass::class); - $result = Factories::widgets(OtherWidget::class); - $this->assertInstanceOf(OtherWidget::class, $result); + $this->assertNotSame($cell1, $cell2); + } + + public function testDefineTwice() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage( + 'Already defined in Factories: models CodeIgniter\Shield\Models\UserModel -> Tests\Support\Models\UserModel' + ); + + Factories::define( + 'models', + 'CodeIgniter\Shield\Models\UserModel', + UserModel::class + ); + Factories::define( + 'models', + 'CodeIgniter\Shield\Models\UserModel', + EntityModel::class + ); + } + + public function testDefineNonExistentClass() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage('No such class: App\Models\UserModel'); + + Factories::define( + 'models', + 'CodeIgniter\Shield\Models\UserModel', + 'App\Models\UserModel' + ); + } + + public function testDefineAfterLoading() + { + $this->expectException(InvalidArgumentException::class); + $this->expectExceptionMessage( + 'Already defined in Factories: models Tests\Support\Models\UserModel -> Tests\Support\Models\UserModel' + ); + + model(UserModel::class); + + Factories::define( + 'models', + UserModel::class, + 'App\Models\UserModel' + ); + } + + public function testDefineAndLoad() + { + Factories::define( + 'models', + UserModel::class, + EntityModel::class + ); + + $model = model(UserModel::class); + + $this->assertInstanceOf(EntityModel::class, $model); } } From 510c73fea47b74d2947b98af9e8187d2a23ca9b1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 16:41:03 +0900 Subject: [PATCH 4298/8282] chore: update psalm-baseline.xml for UndefinedClass --- psalm-baseline.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 41c5c1830d3f..dcef743f607f 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + Memcache @@ -104,7 +104,9 @@ - + + + From 8629fdd4154ea4e115c10146c66ffa01f326e1d4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 17:08:12 +0900 Subject: [PATCH 4299/8282] test: update failed test --- tests/system/Test/FabricatorTest.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php index 6f92be2aaaad..fdc2d8465a8b 100644 --- a/tests/system/Test/FabricatorTest.php +++ b/tests/system/Test/FabricatorTest.php @@ -11,7 +11,7 @@ namespace CodeIgniter\Test; -use CodeIgniter\Database\ModelFactory; +use CodeIgniter\Config\Factories; use Tests\Support\Models\EntityModel; use Tests\Support\Models\EventModel; use Tests\Support\Models\FabricatorModel; @@ -98,12 +98,16 @@ public function testConstructorUsesProvidedLocale() public function testModelUsesNewInstance() { - // Inject the wrong model for UserModel to show it is ignored by Fabricator + // Inject the wrong model for UserModel $mock = new FabricatorModel(); - ModelFactory::injectMock(UserModel::class, $mock); + Factories::injectMock('models', UserModel::class, $mock); $fabricator = new Fabricator(UserModel::class); - $this->assertInstanceOf(UserModel::class, $fabricator->getModel()); + + // Fabricator gets the instance from Factories, so it is FabricatorModel. + $this->assertInstanceOf(FabricatorModel::class, $fabricator->getModel()); + // But Fabricator creates a new instance. + $this->assertNotSame($mock, $fabricator->getModel()); } public function testGetModelReturnsModel() From 3f23901eee76442a97faf360673ca5fb1fd80eed Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 17:45:26 +0900 Subject: [PATCH 4300/8282] fix: when injecting Config mock with `Validation`, register the same instance as `Config\Validation` When you call `Factories::injectMock('config', 'Validation', $config)`, but if the production code calls `config(\Config\Validation::class)`, the mock instance will not be used and fail the test: CodeIgniter\Database\ModelFactoryTest::testBasenameReturnsExistingNamespaceInstance --- system/Config/Factories.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index c91d62d75b37..54620e3cf7a9 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -401,7 +401,11 @@ public static function injectMock(string $component, string $name, object $insta self::$basenames[$component][$name] = $class; if (self::isConfig($component)) { - self::$basenames[$component][$basename] = $class; + if ($name !== $basename) { + self::$basenames[$component][$basename] = $class; + } else { + self::$basenames[$component]['Config\\' . $basename] = $class; + } } } From 86ca97bec97d5bd2d6c785868d2d2484ed411d00 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 18:10:58 +0900 Subject: [PATCH 4301/8282] style: remove empty line --- system/Config/Factories.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 54620e3cf7a9..8d8fd148a89b 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -166,7 +166,6 @@ public static function __callStatic(string $component, array $arguments) self::$instances[$options['component']][$class] = new $class(...$arguments); return self::$instances[$options['component']][$class]; - } } } From 74177efa190da86270a4749b2278d693f2d49061 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 18:11:29 +0900 Subject: [PATCH 4302/8282] test: update failed test --- tests/system/Database/ModelFactoryTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php index 4ec47a9b5967..1f69ee865bb5 100644 --- a/tests/system/Database/ModelFactoryTest.php +++ b/tests/system/Database/ModelFactoryTest.php @@ -66,12 +66,12 @@ public function testReset() $this->assertNull(ModelFactory::get('Banana')); } - public function testBasenameReturnsExistingNamespaceInstance() + public function testBasenameDoesNotReturnExistingNamespaceInstance() { ModelFactory::injectMock(UserModel::class, new JobModel()); $basenameModel = ModelFactory::get('UserModel'); - $this->assertInstanceOf(JobModel::class, $basenameModel); + $this->assertInstanceOf(UserModel::class, $basenameModel); } } From 88bbbcf906b5988ea448466896b8db48bd5e6d7d Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 24 Jul 2023 18:56:44 +0900 Subject: [PATCH 4303/8282] fix: preferApp is used with short classname only --- system/Config/Factories.php | 4 ++-- tests/system/Config/FactoriesTest.php | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 8d8fd148a89b..a5e085c1d8aa 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -221,8 +221,8 @@ class_exists($name, false) // If an App version was requested then see if it verifies if ( - // preferApp is used only for no namespace class or Config class. - (strpos($name, '\\') === false || self::isConfig($options['component'])) + // preferApp is used only for no namespace class. + strpos($name, '\\') === false && $options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name) ) { diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index dc56c6535ab6..1b3a68bbe707 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -255,7 +255,7 @@ class_alias(SomeWidget::class, $class); $this->assertInstanceOf(SomeWidget::class, $result); } - public function testPreferAppOverridesConfigClassname() + public function testShortnameReturnsConfigInApp() { // Create a config class in App $file = APPPATH . 'Config/TestRegistrar.php'; @@ -267,10 +267,30 @@ class TestRegistrar EOL; file_put_contents($file, $source); - $result = Factories::config(TestRegistrar::class); + $result = Factories::config('TestRegistrar'); $this->assertInstanceOf('Config\TestRegistrar', $result); + // Delete the config class in App + unlink($file); + } + + public function testFullClassnameIgnoresPreferApp() + { + // Create a config class in App + $file = APPPATH . 'Config/TestRegistrar.php'; + $source = <<<'EOL' + assertInstanceOf(TestRegistrar::class, $result); + Factories::setOptions('config', ['preferApp' => false]); $result = Factories::config(TestRegistrar::class); From da9ea306a692136945b21dc8c38352e87ed823bb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 10:35:04 +0900 Subject: [PATCH 4304/8282] docs: introduce term "class alias" for docs --- system/Config/Factories.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index a5e085c1d8aa..14eb11e5483b 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -52,10 +52,14 @@ class Factories ]; /** - * Mapping of classnames (with or without namespace) to - * their instances. + * Mapping of class aliases to their true Full Qualified Class Name (FQCN). * - * [component => [name => FQCN]] + * Class aliases can be: + * - FQCN. E.g., 'App\Lib\SomeLib' + * - short classname. E.g., 'SomeLib' + * - short classname with sub-directories. E.g., 'Sub/SomeLib' + * + * [component => [alias => FQCN]] * * @var array> * @phpstan-var array> @@ -65,6 +69,7 @@ class Factories /** * Store for instances of any component that * has been requested as "shared". + * * A multi-dimensional array with components as * keys to the array of name-indexed instances. * @@ -79,7 +84,7 @@ class Factories * Define the class to load. You can *override* the concrete class. * * @param string $component Lowercase, plural component name - * @param string $name Classname. The first parameter of Factories magic method + * @param string $name Class alias. See the $basenames property. * @param string $classname FQCN to load * @phpstan-param class-string $classname FQCN to load */ @@ -114,7 +119,7 @@ public static function define(string $component, string $name, string $classname */ public static function __callStatic(string $component, array $arguments) { - // First argument is the name, second is options + // First argument is the class alias, second is options $name = trim(array_shift($arguments), '\\ '); $options = array_shift($arguments) ?? []; @@ -200,7 +205,7 @@ private static function isConfig(string $component): bool * Finds a component class * * @param array $options The array of component-specific directives - * @param string $name Class name, namespace optional + * @param string $name Class alias. See the $basenames property. */ protected static function locateClass(array $options, string $name): ?string { @@ -266,7 +271,7 @@ class_exists($name, false) * Verifies that a class & config satisfy the "preferApp" option * * @param array $options The array of component-specific directives - * @param string $name Class name, namespace optional + * @param string $name Class alias. See the $basenames property. */ protected static function verifyPreferApp(array $options, string $name): bool { @@ -287,7 +292,7 @@ protected static function verifyPreferApp(array $options, string $name): bool * Verifies that a class & config satisfy the "instanceOf" option * * @param array $options The array of component-specific directives - * @param string $name Class name, namespace optional + * @param string $name Class alias. See the $basenames property. */ protected static function verifyInstanceOf(array $options, string $name): bool { @@ -383,7 +388,7 @@ public static function reset(?string $component = null) * Helper method for injecting mock instances * * @param string $component Lowercase, plural component name - * @param string $name The name of the instance + * @param string $name Class alias. See the $basenames property. * * @internal For testing only */ From fd4d88c0b29abf285c62b075074876d9e3b86755 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 10:40:18 +0900 Subject: [PATCH 4305/8282] refactor: rename $basenames to $aliases --- system/Config/Factories.php | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 14eb11e5483b..78d386820982 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -64,7 +64,7 @@ class Factories * @var array> * @phpstan-var array> */ - protected static $basenames = []; + protected static $aliases = []; /** * Store for instances of any component that @@ -84,19 +84,19 @@ class Factories * Define the class to load. You can *override* the concrete class. * * @param string $component Lowercase, plural component name - * @param string $name Class alias. See the $basenames property. + * @param string $name Class alias. See the $aliases property. * @param string $classname FQCN to load * @phpstan-param class-string $classname FQCN to load */ public static function define(string $component, string $name, string $classname): void { - if (isset(self::$basenames[$component][$name])) { - if (self::$basenames[$component][$name] === $classname) { + if (isset(self::$aliases[$component][$name])) { + if (self::$aliases[$component][$name] === $classname) { return; } throw new InvalidArgumentException( - 'Already defined in Factories: ' . $component . ' ' . $name . ' -> ' . self::$basenames[$component][$name] + 'Already defined in Factories: ' . $component . ' ' . $name . ' -> ' . self::$aliases[$component][$name] ); } @@ -108,7 +108,7 @@ public static function define(string $component, string $name, string $classname // Otherwise, getOptions() will reset the component. self::getOptions($component); - self::$basenames[$component][$name] = $classname; + self::$aliases[$component][$name] = $classname; } /** @@ -127,8 +127,8 @@ public static function __callStatic(string $component, array $arguments) $options = array_merge(self::getOptions(strtolower($component)), $options); if (! $options['getShared']) { - if (isset(self::$basenames[$component][$name])) { - $class = self::$basenames[$component][$name]; + if (isset(self::$aliases[$component][$name])) { + $class = self::$aliases[$component][$name]; return new $class(...$arguments); } @@ -141,8 +141,8 @@ public static function __callStatic(string $component, array $arguments) } // Check for an existing instance - if (isset(self::$basenames[$options['component']][$name])) { - $class = self::$basenames[$options['component']][$name]; + if (isset(self::$aliases[$options['component']][$name])) { + $class = self::$aliases[$options['component']][$name]; // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { @@ -160,8 +160,8 @@ public static function __callStatic(string $component, array $arguments) if (self::isConfig($options['component'])) { $basename = self::getBasename($name); - if (isset(self::$basenames[$options['component']][$basename])) { - $class = self::$basenames[$options['component']][$basename]; + if (isset(self::$aliases[$options['component']][$basename])) { + $class = self::$aliases[$options['component']][$basename]; // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { @@ -181,11 +181,11 @@ public static function __callStatic(string $component, array $arguments) } self::$instances[$options['component']][$class] = new $class(...$arguments); - self::$basenames[$options['component']][$name] = $class; + self::$aliases[$options['component']][$name] = $class; // If a short classname is specified, also register FQCN to share the instance. - if (! isset(self::$basenames[$options['component']][$class])) { - self::$basenames[$options['component']][$class] = $class; + if (! isset(self::$aliases[$options['component']][$class])) { + self::$aliases[$options['component']][$class] = $class; } return self::$instances[$options['component']][$class]; @@ -205,7 +205,7 @@ private static function isConfig(string $component): bool * Finds a component class * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $basenames property. + * @param string $name Class alias. See the $aliases property. */ protected static function locateClass(array $options, string $name): ?string { @@ -271,7 +271,7 @@ class_exists($name, false) * Verifies that a class & config satisfy the "preferApp" option * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $basenames property. + * @param string $name Class alias. See the $aliases property. */ protected static function verifyPreferApp(array $options, string $name): bool { @@ -292,7 +292,7 @@ protected static function verifyPreferApp(array $options, string $name): bool * Verifies that a class & config satisfy the "instanceOf" option * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $basenames property. + * @param string $name Class alias. See the $aliases property. */ protected static function verifyInstanceOf(array $options, string $name): bool { @@ -372,7 +372,7 @@ public static function reset(?string $component = null) if ($component) { unset( static::$options[$component], - static::$basenames[$component], + static::$aliases[$component], static::$instances[$component] ); @@ -380,7 +380,7 @@ public static function reset(?string $component = null) } static::$options = []; - static::$basenames = []; + static::$aliases = []; static::$instances = []; } @@ -388,7 +388,7 @@ public static function reset(?string $component = null) * Helper method for injecting mock instances * * @param string $component Lowercase, plural component name - * @param string $name Class alias. See the $basenames property. + * @param string $name Class alias. See the $aliases property. * * @internal For testing only */ @@ -402,13 +402,13 @@ public static function injectMock(string $component, string $name, object $insta $basename = self::getBasename($name); self::$instances[$component][$class] = $instance; - self::$basenames[$component][$name] = $class; + self::$aliases[$component][$name] = $class; if (self::isConfig($component)) { if ($name !== $basename) { - self::$basenames[$component][$basename] = $class; + self::$aliases[$component][$basename] = $class; } else { - self::$basenames[$component]['Config\\' . $basename] = $class; + self::$aliases[$component]['Config\\' . $basename] = $class; } } } From 0fac66c50337b4912142448d293e7efc5b8c1dba Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 10:42:26 +0900 Subject: [PATCH 4306/8282] refactor: rename $name to $alias --- system/Config/Factories.php | 90 ++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 78d386820982..727c0bbb5512 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -25,7 +25,7 @@ * instantiation checks. * * @method static BaseConfig|null config(...$arguments) - * @method static Model|null models(string $name, array $options = [], ?ConnectionInterface &$conn = null) + * @method static Model|null models(string $alias, array $options = [], ?ConnectionInterface &$conn = null) */ class Factories { @@ -84,19 +84,19 @@ class Factories * Define the class to load. You can *override* the concrete class. * * @param string $component Lowercase, plural component name - * @param string $name Class alias. See the $aliases property. + * @param string $alias Class alias. See the $aliases property. * @param string $classname FQCN to load * @phpstan-param class-string $classname FQCN to load */ - public static function define(string $component, string $name, string $classname): void + public static function define(string $component, string $alias, string $classname): void { - if (isset(self::$aliases[$component][$name])) { - if (self::$aliases[$component][$name] === $classname) { + if (isset(self::$aliases[$component][$alias])) { + if (self::$aliases[$component][$alias] === $classname) { return; } throw new InvalidArgumentException( - 'Already defined in Factories: ' . $component . ' ' . $name . ' -> ' . self::$aliases[$component][$name] + 'Already defined in Factories: ' . $component . ' ' . $alias . ' -> ' . self::$aliases[$component][$alias] ); } @@ -108,7 +108,7 @@ public static function define(string $component, string $name, string $classname // Otherwise, getOptions() will reset the component. self::getOptions($component); - self::$aliases[$component][$name] = $classname; + self::$aliases[$component][$alias] = $classname; } /** @@ -120,20 +120,20 @@ public static function define(string $component, string $name, string $classname public static function __callStatic(string $component, array $arguments) { // First argument is the class alias, second is options - $name = trim(array_shift($arguments), '\\ '); + $alias = trim(array_shift($arguments), '\\ '); $options = array_shift($arguments) ?? []; // Determine the component-specific options $options = array_merge(self::getOptions(strtolower($component)), $options); if (! $options['getShared']) { - if (isset(self::$aliases[$component][$name])) { - $class = self::$aliases[$component][$name]; + if (isset(self::$aliases[$component][$alias])) { + $class = self::$aliases[$component][$alias]; return new $class(...$arguments); } - if ($class = self::locateClass($options, $name)) { + if ($class = self::locateClass($options, $alias)) { return new $class(...$arguments); } @@ -141,8 +141,8 @@ public static function __callStatic(string $component, array $arguments) } // Check for an existing instance - if (isset(self::$aliases[$options['component']][$name])) { - $class = self::$aliases[$options['component']][$name]; + if (isset(self::$aliases[$options['component']][$alias])) { + $class = self::$aliases[$options['component']][$alias]; // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { @@ -158,7 +158,7 @@ public static function __callStatic(string $component, array $arguments) // Check for an existing Config instance with basename. if (self::isConfig($options['component'])) { - $basename = self::getBasename($name); + $basename = self::getBasename($alias); if (isset(self::$aliases[$options['component']][$basename])) { $class = self::$aliases[$options['component']][$basename]; @@ -176,12 +176,12 @@ public static function __callStatic(string $component, array $arguments) } // Try to locate the class - if (! $class = self::locateClass($options, $name)) { + if (! $class = self::locateClass($options, $alias)) { return null; } self::$instances[$options['component']][$class] = new $class(...$arguments); - self::$aliases[$options['component']][$name] = $class; + self::$aliases[$options['component']][$alias] = $class; // If a short classname is specified, also register FQCN to share the instance. if (! isset(self::$aliases[$options['component']][$class])) { @@ -205,21 +205,21 @@ private static function isConfig(string $component): bool * Finds a component class * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $aliases property. + * @param string $alias Class alias. See the $aliases property. */ - protected static function locateClass(array $options, string $name): ?string + protected static function locateClass(array $options, string $alias): ?string { // Check for low-hanging fruit if ( - class_exists($name, false) - && self::verifyPreferApp($options, $name) - && self::verifyInstanceOf($options, $name) + class_exists($alias, false) + && self::verifyPreferApp($options, $alias) + && self::verifyInstanceOf($options, $alias) ) { - return $name; + return $alias; } // Determine the relative class names we need - $basename = self::getBasename($name); + $basename = self::getBasename($alias); $appname = self::isConfig($options['component']) ? 'Config\\' . $basename : rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename; @@ -227,31 +227,31 @@ class_exists($name, false) // If an App version was requested then see if it verifies if ( // preferApp is used only for no namespace class. - strpos($name, '\\') === false + strpos($alias, '\\') === false && $options['preferApp'] && class_exists($appname) - && self::verifyInstanceOf($options, $name) + && self::verifyInstanceOf($options, $alias) ) { return $appname; } // If we have ruled out an App version and the class exists then try it - if (class_exists($name) && self::verifyInstanceOf($options, $name)) { - return $name; + if (class_exists($alias) && self::verifyInstanceOf($options, $alias)) { + return $alias; } // Have to do this the hard way... $locator = Services::locator(); // Check if the class was namespaced - if (strpos($name, '\\') !== false) { - if (! $file = $locator->locateFile($name, $options['path'])) { + if (strpos($alias, '\\') !== false) { + if (! $file = $locator->locateFile($alias, $options['path'])) { return null; } $files = [$file]; } // No namespace? Search for it // Check all namespaces, prioritizing App and modules - elseif (! $files = $locator->search($options['path'] . DIRECTORY_SEPARATOR . $name)) { + elseif (! $files = $locator->search($options['path'] . DIRECTORY_SEPARATOR . $alias)) { return null; } @@ -271,9 +271,9 @@ class_exists($name, false) * Verifies that a class & config satisfy the "preferApp" option * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $aliases property. + * @param string $alias Class alias. See the $aliases property. */ - protected static function verifyPreferApp(array $options, string $name): bool + protected static function verifyPreferApp(array $options, string $alias): bool { // Anything without that restriction passes if (! $options['preferApp']) { @@ -282,26 +282,26 @@ protected static function verifyPreferApp(array $options, string $name): bool // Special case for Config since its App namespace is actually \Config if (self::isConfig($options['component'])) { - return strpos($name, 'Config') === 0; + return strpos($alias, 'Config') === 0; } - return strpos($name, APP_NAMESPACE) === 0; + return strpos($alias, APP_NAMESPACE) === 0; } /** * Verifies that a class & config satisfy the "instanceOf" option * * @param array $options The array of component-specific directives - * @param string $name Class alias. See the $aliases property. + * @param string $alias Class alias. See the $aliases property. */ - protected static function verifyInstanceOf(array $options, string $name): bool + protected static function verifyInstanceOf(array $options, string $alias): bool { // Anything without that restriction passes if (! $options['instanceOf']) { return true; } - return is_a($name, $options['instanceOf'], true); + return is_a($alias, $options['instanceOf'], true); } /** @@ -388,24 +388,24 @@ public static function reset(?string $component = null) * Helper method for injecting mock instances * * @param string $component Lowercase, plural component name - * @param string $name Class alias. See the $aliases property. + * @param string $alias Class alias. See the $aliases property. * * @internal For testing only */ - public static function injectMock(string $component, string $name, object $instance) + public static function injectMock(string $component, string $alias, object $instance) { // Force a configuration to exist for this component $component = strtolower($component); self::getOptions($component); $class = get_class($instance); - $basename = self::getBasename($name); + $basename = self::getBasename($alias); self::$instances[$component][$class] = $instance; - self::$aliases[$component][$name] = $class; + self::$aliases[$component][$alias] = $class; if (self::isConfig($component)) { - if ($name !== $basename) { + if ($alias !== $basename) { self::$aliases[$component][$basename] = $class; } else { self::$aliases[$component]['Config\\' . $basename] = $class; @@ -418,13 +418,13 @@ public static function injectMock(string $component, string $name, object $insta * * @internal For testing only */ - public static function getBasename(string $name): string + public static function getBasename(string $alias): string { // Determine the basename - if ($basename = strrchr($name, '\\')) { + if ($basename = strrchr($alias, '\\')) { return substr($basename, 1); } - return $name; + return $alias; } } From d385e98ef1f3f9e3d32d87e48ea1e3d7aabebab9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 10:47:30 +0900 Subject: [PATCH 4307/8282] docs: improve doc comments --- system/Config/Factories.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 727c0bbb5512..e48307920fbc 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -85,8 +85,8 @@ class Factories * * @param string $component Lowercase, plural component name * @param string $alias Class alias. See the $aliases property. - * @param string $classname FQCN to load - * @phpstan-param class-string $classname FQCN to load + * @param string $classname FQCN to be loaded + * @phpstan-param class-string $classname FQCN to be loaded */ public static function define(string $component, string $alias, string $classname): void { From 88803513cce5e039c95ff5d20b8345136250bb04 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 10:54:42 +0900 Subject: [PATCH 4308/8282] refactor: extract isNamespaced() --- system/Config/Factories.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index e48307920fbc..bcb249ba387b 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -242,8 +242,8 @@ class_exists($alias, false) // Have to do this the hard way... $locator = Services::locator(); - // Check if the class was namespaced - if (strpos($alias, '\\') !== false) { + // Check if the class alias was namespaced + if (self::isNamespaced($alias)) { if (! $file = $locator->locateFile($alias, $options['path'])) { return null; } @@ -267,6 +267,16 @@ class_exists($alias, false) return null; } + /** + * Is the class alias namespaced or not? + * + * @param string $alias Class alias. See the $aliases property. + */ + private static function isNamespaced(string $alias): bool + { + return strpos($alias, '\\') !== false; + } + /** * Verifies that a class & config satisfy the "preferApp" option * @@ -414,7 +424,7 @@ public static function injectMock(string $component, string $alias, object $inst } /** - * Gets a basename from a class name, namespaced or not. + * Gets a basename from a class alias, namespaced or not. * * @internal For testing only */ From a1fa03f642fbd09ecbe403dc67be95397998f8fb Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 11:04:59 +0900 Subject: [PATCH 4309/8282] docs: add @testTag --- system/Config/Factories.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index bcb249ba387b..7430ecdd0dad 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -322,6 +322,7 @@ protected static function verifyInstanceOf(array $options, string $alias): bool * @return array * * @internal For testing only + * @testTag */ public static function getOptions(string $component): array { @@ -401,6 +402,7 @@ public static function reset(?string $component = null) * @param string $alias Class alias. See the $aliases property. * * @internal For testing only + * @testTag */ public static function injectMock(string $component, string $alias, object $instance) { @@ -427,6 +429,7 @@ public static function injectMock(string $component, string $alias, object $inst * Gets a basename from a class alias, namespaced or not. * * @internal For testing only + * @testTag */ public static function getBasename(string $alias): string { From 5b05bf93f62a75ae9ad191f8516352ed67f8d0bc Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 16:20:48 +0900 Subject: [PATCH 4310/8282] refactor: use isNamespaced() --- system/Config/Factories.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 7430ecdd0dad..93a2193a12bf 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -410,17 +410,16 @@ public static function injectMock(string $component, string $alias, object $inst $component = strtolower($component); self::getOptions($component); - $class = get_class($instance); - $basename = self::getBasename($alias); + $class = get_class($instance); self::$instances[$component][$class] = $instance; self::$aliases[$component][$alias] = $class; if (self::isConfig($component)) { - if ($alias !== $basename) { - self::$aliases[$component][$basename] = $class; + if (self::isNamespaced($alias)) { + self::$aliases[$component][self::getBasename($alias)] = $class; } else { - self::$aliases[$component]['Config\\' . $basename] = $class; + self::$aliases[$component]['Config\\' . $alias] = $class; } } } From b48277466480b2252480fbec3de0ca9574f64948 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 25 Jul 2023 16:27:38 +0900 Subject: [PATCH 4311/8282] refactor: use isNamespaced() --- system/Config/Factories.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 93a2193a12bf..f75c87d59cd9 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -226,8 +226,8 @@ class_exists($alias, false) // If an App version was requested then see if it verifies if ( - // preferApp is used only for no namespace class. - strpos($alias, '\\') === false + // preferApp is used only for no namespaced class. + ! self::isNamespaced($alias) && $options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $alias) ) { From a3c768ab4b37a0082344ad4121ab260b4bea3bf7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 09:10:45 +0900 Subject: [PATCH 4312/8282] test: add test --- tests/system/Config/FactoriesTest.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index 1b3a68bbe707..ffbf8b7b8a83 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -321,7 +321,7 @@ public function testCanLoadTwoCellsWithSameShortName() $this->assertNotSame($cell1, $cell2); } - public function testDefineTwice() + public function testDefineSameAliasTwiceWithDifferentClasses() { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage( @@ -340,6 +340,24 @@ public function testDefineTwice() ); } + public function testDefineSameAliasAndSameClassTwice() + { + Factories::define( + 'models', + 'CodeIgniter\Shield\Models\UserModel', + UserModel::class + ); + Factories::define( + 'models', + 'CodeIgniter\Shield\Models\UserModel', + UserModel::class + ); + + $model = model('CodeIgniter\Shield\Models\UserModel'); + + $this->assertInstanceOf(UserModel::class, $model); + } + public function testDefineNonExistentClass() { $this->expectException(InvalidArgumentException::class); From e3c223bbd96b2f3697e73c32bb71d78ac6c3f0de Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 09:20:04 +0900 Subject: [PATCH 4313/8282] docs: update comments --- system/Config/Factories.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index f75c87d59cd9..94fa7cf71330 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -140,15 +140,17 @@ public static function __callStatic(string $component, array $arguments) return null; } - // Check for an existing instance + // Check for an existing definition if (isset(self::$aliases[$options['component']][$alias])) { $class = self::$aliases[$options['component']][$alias]; // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { + // Check for an existing instance if (isset(self::$instances[$options['component']][$class])) { return self::$instances[$options['component']][$class]; } + self::$instances[$options['component']][$class] = new $class(...$arguments); return self::$instances[$options['component']][$class]; @@ -156,7 +158,7 @@ public static function __callStatic(string $component, array $arguments) } } - // Check for an existing Config instance with basename. + // Check for an existing Config definition with basename. if (self::isConfig($options['component'])) { $basename = self::getBasename($alias); @@ -165,9 +167,11 @@ public static function __callStatic(string $component, array $arguments) // Need to verify if the shared instance matches the request if (self::verifyInstanceOf($options, $class)) { + // Check for an existing instance if (isset(self::$instances[$options['component']][$class])) { return self::$instances[$options['component']][$class]; } + self::$instances[$options['component']][$class] = new $class(...$arguments); return self::$instances[$options['component']][$class]; From 244c5fbe7b76bce549e868c588f7fa9195d3268f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 09:34:34 +0900 Subject: [PATCH 4314/8282] refactor: extract getDefinedInstance() --- system/Config/Factories.php | 61 +++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index 94fa7cf71330..e122a650d366 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -141,41 +141,18 @@ public static function __callStatic(string $component, array $arguments) } // Check for an existing definition - if (isset(self::$aliases[$options['component']][$alias])) { - $class = self::$aliases[$options['component']][$alias]; - - // Need to verify if the shared instance matches the request - if (self::verifyInstanceOf($options, $class)) { - // Check for an existing instance - if (isset(self::$instances[$options['component']][$class])) { - return self::$instances[$options['component']][$class]; - } - - self::$instances[$options['component']][$class] = new $class(...$arguments); - - return self::$instances[$options['component']][$class]; - - } + $instance = self::getDefinedInstance($options, $alias, $arguments); + if ($instance !== null) { + return $instance; } // Check for an existing Config definition with basename. if (self::isConfig($options['component'])) { $basename = self::getBasename($alias); - if (isset(self::$aliases[$options['component']][$basename])) { - $class = self::$aliases[$options['component']][$basename]; - - // Need to verify if the shared instance matches the request - if (self::verifyInstanceOf($options, $class)) { - // Check for an existing instance - if (isset(self::$instances[$options['component']][$class])) { - return self::$instances[$options['component']][$class]; - } - - self::$instances[$options['component']][$class] = new $class(...$arguments); - - return self::$instances[$options['component']][$class]; - } + $instance = self::getDefinedInstance($options, $basename, $arguments); + if ($instance !== null) { + return $instance; } } @@ -195,6 +172,32 @@ public static function __callStatic(string $component, array $arguments) return self::$instances[$options['component']][$class]; } + /** + * Gets the defined instance. If not exists, creates new one. + * + * @return object|null + */ + private static function getDefinedInstance(array $options, string $alias, array $arguments) + { + if (isset(self::$aliases[$options['component']][$alias])) { + $class = self::$aliases[$options['component']][$alias]; + + // Need to verify if the shared instance matches the request + if (self::verifyInstanceOf($options, $class)) { + // Check for an existing instance + if (isset(self::$instances[$options['component']][$class])) { + return self::$instances[$options['component']][$class]; + } + + self::$instances[$options['component']][$class] = new $class(...$arguments); + + return self::$instances[$options['component']][$class]; + } + } + + return null; + } + /** * Is the component Config? * From 340a930dcfcd088a6b094747a7b44e724c5dc855 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 09:42:14 +0900 Subject: [PATCH 4315/8282] fix: remove logic for preferApp for no namespaced Config classname preferApp should work only for no namespaced (Config) classname. --- system/Config/Factories.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index e122a650d366..a33079bec4d5 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -146,16 +146,6 @@ public static function __callStatic(string $component, array $arguments) return $instance; } - // Check for an existing Config definition with basename. - if (self::isConfig($options['component'])) { - $basename = self::getBasename($alias); - - $instance = self::getDefinedInstance($options, $basename, $arguments); - if ($instance !== null) { - return $instance; - } - } - // Try to locate the class if (! $class = self::locateClass($options, $alias)) { return null; From a13c53d5c1ed72544d787df3978196cdaf44ea6c Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 10:20:59 +0900 Subject: [PATCH 4316/8282] docs: update existing description --- user_guide_src/source/concepts/factories.rst | 48 +++++++++++++------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index b3ec0a064176..0c97052c9a4d 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -54,9 +54,18 @@ by using the magic static method of the Factories class, ``Factories::models()`` The static method name is called *component*. -By default, Factories first searches in the ``App`` namespace for the path corresponding to the magic static method name. +.. _factories-passing-classname-without-namespace: + +Passing Classname without Namespace +----------------------------------- + +If you pass a classname without a namespace, Factories first searches in the +``App`` namespace for the path corresponding to the magic static method name. ``Factories::models()`` searches the **app/Models** directory. +Passing Short Classname +^^^^^^^^^^^^^^^^^^^^^^^ + In the following code, if you have ``App\Models\UserModel``, the instance will be returned: .. literalinclude:: factories/001.php @@ -68,31 +77,35 @@ you get back the instance as before: .. literalinclude:: factories/003.php -preferApp option ----------------- +Passing Short Classname with Sub-directories +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -You could also request a specific class: +If you want to load a class in sub directories, you use the ``/`` as a separator. +The following code loads **app/Libraries/Sub/SubLib.php** if it exists: -.. literalinclude:: factories/002.php +.. literalinclude:: factories/013.php :lines: 2- -If you have only ``Blog\Models\UserModel``, the instance will be returned. -But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, -the instance of ``App\Models\UserModel`` will be returned. +Passing Full Qualified Classname +-------------------------------- -If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``: +You could also request a full qualified classname: -.. literalinclude:: factories/010.php +.. literalinclude:: factories/002.php :lines: 2- -Loading a Class in Sub-directories -================================== +It returns the instance of ``Blog\Models\UserModel`` if it exists. -If you want to load a class in sub directories, you use the ``/`` as a separator. -The following code loads **app/Libraries/Sub/SubLib.php**: +.. note:: Prior to v4.4.0, when you requested a full qualified classname, + if you had only ``Blog\Models\UserModel``, the instance would be returned. + But if you had both ``App\Models\UserModel`` and ``Blog\Models\UserModel``, + the instance of ``App\Models\UserModel`` would be returned. -.. literalinclude:: factories/013.php - :lines: 2- + If you wanted to get ``Blog\Models\UserModel``, you needed to disable the + option ``preferApp``: + + .. literalinclude:: factories/010.php + :lines: 2- Convenience Functions ********************* @@ -154,6 +167,9 @@ preferApp boolean Whether a class with the same basename in the App name overrides other explicit class requests. ========== ============== ============================================================ =================================================== +.. note:: Since v4.4.0, ``preferApp`` works only when you request + :ref:`a classname without a namespace `. + Factories Behavior ****************** From 886fa8703a7be8312497be1cdaadbe78b9125546 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 10:44:28 +0900 Subject: [PATCH 4317/8282] docs: add about Factories::define() --- user_guide_src/source/concepts/factories.rst | 23 +++++++++++++++++++ .../source/concepts/factories/014.php | 3 +++ .../source/concepts/factories/015.php | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 user_guide_src/source/concepts/factories/014.php create mode 100644 user_guide_src/source/concepts/factories/015.php diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 0c97052c9a4d..881f0fa1b1f1 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -128,6 +128,29 @@ The second function, :php:func:`model()` returns a new instance of a Model class .. literalinclude:: factories/009.php +.. _factories-defining-classname-to-be-loaded: + +Defining Classname to be Loaded +******************************* + +.. versionadded:: 4.4.0 + +You could define a classname to be loaded before loading the class with +the ``Factories::define()`` method: + +.. literalinclude:: factories/014.php + :lines: 2- + +The first parameter is a component. The second parameter is a class alias +(the first parameter to Factories magic static method), and the third parameter +is the true full qualified classname to be loaded. + +After that, if you load ``Myth\Auth\Models\UserModel`` with Factories, the +``App\Models\UserModel`` instance will be returned: + +.. literalinclude:: factories/015.php + :lines: 2- + Factory Parameters ****************** diff --git a/user_guide_src/source/concepts/factories/014.php b/user_guide_src/source/concepts/factories/014.php new file mode 100644 index 000000000000..992b0f7b2236 --- /dev/null +++ b/user_guide_src/source/concepts/factories/014.php @@ -0,0 +1,3 @@ + Date: Wed, 26 Jul 2023 11:28:42 +0900 Subject: [PATCH 4318/8282] docs: add changelog and upgrade guide --- user_guide_src/source/changelogs/v4.4.0.rst | 31 +++++++++++++++++++ .../source/installation/upgrade_440.rst | 15 +++++++++ 2 files changed, 46 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 475d08e9eaea..6eb96418c6ae 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -29,6 +29,35 @@ or more was specified. See :ref:`upgrade-440-uri-setsegment`. The next segment (``+1``) of the current last segment can be set as before. +.. _v440-factories: + +Factories +--------- + +Passing Fully Qualified Classname +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Now ``preferApp`` works only when you request +:ref:`a classname without a namespace `. + +For example, when you call ``model(\Myth\Auth\Models\UserModel::class)`` or +``model('Myth\Auth\Models\UserModel')``: + + - before: + + - returns ``App\Models\UserModel`` if exists and ``preferApp`` is true (default) + - returns ``Myth\Auth\Models\UserModel`` if exists and ``preferApp`` is false + + - after: + + - returns ``Myth\Auth\Models\UserModel`` even if ``preferApp`` is true (default) + - returns ``App\Models\UserModel`` if you define ``Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel')`` before calling the ``model()`` + +Property Name +^^^^^^^^^^^^^ + +The property ``Factories::$basenames`` has been renamed to ``$aliases``. + .. _v440-interface-changes: Interface Changes @@ -164,6 +193,8 @@ Others - **RedirectException:** can also take an object that implements ResponseInterface as its first argument. - **RedirectException:** implements ResponsableInterface. - **DebugBar:** Now :ref:`view-routes` are displayed in *DEFINED ROUTES* on the *Routes* tab. +- **Factories:** You can now define the classname that will actually be loaded. + See :ref:`factories-defining-classname-to-be-loaded`. Message Changes *************** diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index a64e35813a4a..3fc02a179330 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -73,6 +73,21 @@ This bug was fixed and now URIs for underscores (**foo_bar**) is not accessible. If you have links to URIs for underscores (**foo_bar**), update them with URIs for dashes (**foo-bar**). +When Passing Fully Qualified Classnames to Factories +==================================================== + +The behavior of passing fully qualified classnames to Factories has been changed. +See :ref:`ChangeLog ` for details. + +If you have code like ``model('\Myth\Auth\Models\UserModel::class')`` or +``model('Myth\Auth\Models\UserModel')`` (the code may be in the third-party packages), +and you expect to load your ``App\Models\UserModel``, you need to define the +classname to be loaded before the first loading of that class:: + + Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel'); + +See :ref:`factories-defining-classname-to-be-loaded` for details. + Interface Changes ================= From c48b5239b4c6ace84bf754ca134255a79180d057 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 11:29:54 +0900 Subject: [PATCH 4319/8282] docs: fix typo --- system/Config/Factories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Config/Factories.php b/system/Config/Factories.php index a33079bec4d5..67a31728d65c 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -52,7 +52,7 @@ class Factories ]; /** - * Mapping of class aliases to their true Full Qualified Class Name (FQCN). + * Mapping of class aliases to their true Fully Qualified Class Name (FQCN). * * Class aliases can be: * - FQCN. E.g., 'App\Lib\SomeLib' From 50b8d7f32cac2616b29e48feb081317dd0d044a2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 11:45:31 +0900 Subject: [PATCH 4320/8282] docs: group items --- user_guide_src/source/changelogs/v4.4.0.rst | 30 +++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.4.0.rst b/user_guide_src/source/changelogs/v4.4.0.rst index 475d08e9eaea..19fe6bc29b3c 100644 --- a/user_guide_src/source/changelogs/v4.4.0.rst +++ b/user_guide_src/source/changelogs/v4.4.0.rst @@ -150,19 +150,20 @@ Others the ``Content-Disposition: inline`` header to display the file in the browser. See :ref:`open-file-in-browser` for details. - **View:** Added optional 2nd parameter ``$saveData`` on ``renderSection()`` to prevent from auto cleans the data after displaying. See :ref:`View Layouts ` for details. -- **Auto Routing (Improved)**: Now you can route to Modules. - See :ref:`auto-routing-improved-module-routing` for details. -- **Auto Routing (Improved):** If a controller is found that corresponds to a URI - segment and that controller does not have a method defined for the URI segment, - the default method will now be executed. This addition allows for more flexible - handling of URIs in auto routing. - See :ref:`controller-default-method-fallback` for details. +- **Auto Routing (Improved)**: + - Now you can route to Modules. See :ref:`auto-routing-improved-module-routing` + for details. + - If a controller is found that corresponds to a URI segment and that controller + does not have a method defined for the URI segment, the default method will + now be executed. This addition allows for more flexible handling of URIs in + auto routing. See :ref:`controller-default-method-fallback` for details. - **Filters:** Now you can use Filter Arguments with :ref:`$filters property `. - **Request:** Added ``IncomingRequest::setValidLocales()`` method to set valid locales. - **Table:** Added ``Table::setSyncRowsWithHeading()`` method to synchronize row columns with headings. See :ref:`table-sync-rows-with-headings` for details. - **Error Handling:** Now you can use :ref:`custom-exception-handlers`. -- **RedirectException:** can also take an object that implements ResponseInterface as its first argument. -- **RedirectException:** implements ResponsableInterface. +- **RedirectException:** + - It can also take an object that implements ``ResponseInterface`` as its first argument. + - It implements ``ResponsableInterface``. - **DebugBar:** Now :ref:`view-routes` are displayed in *DEFINED ROUTES* on the *Routes* tab. Message Changes @@ -174,11 +175,12 @@ Changes ******* - **Images:** The default quality for WebP in ``GDHandler`` has been changed from 80 to 90. -- **Config:** The deprecated Cookie items in **app/Config/App.php** has been removed. -- **Config:** The deprecated Session items in **app/Config/App.php** has been removed. -- **Config:** The deprecated CSRF items in **app/Config/App.php** has been removed. -- **Config:** Routing settings have been moved to **app/Config/Routing.php** config file. - See :ref:`Upgrading Guide `. +- **Config:** + - The deprecated Cookie items in **app/Config/App.php** has been removed. + - The deprecated Session items in **app/Config/App.php** has been removed. + - The deprecated CSRF items in **app/Config/App.php** has been removed. + - Routing settings have been moved to **app/Config/Routing.php** config file. + See :ref:`Upgrading Guide `. - **DownloadResponse:** When generating response headers, does not replace the ``Content-Disposition`` header if it was previously specified. - **Autoloader:** Before v4.4.0, CodeIgniter autoloader did not allow special characters that are illegal in filenames on certain operating systems. From b5170d46a631b945a38168075fb4564737d995d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 26 Jul 2023 11:46:09 +0900 Subject: [PATCH 4321/8282] docs: capitalize first letters --- user_guide_src/source/installation/upgrade_440.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_440.rst b/user_guide_src/source/installation/upgrade_440.rst index a64e35813a4a..62fe4214775c 100644 --- a/user_guide_src/source/installation/upgrade_440.rst +++ b/user_guide_src/source/installation/upgrade_440.rst @@ -47,7 +47,7 @@ If your code depends on this bug, fix the segment number. .. literalinclude:: upgrade_440/002.php :lines: 2- -When you extend Exceptions +When You Extend Exceptions ========================== If you are extending ``CodeIgniter\Debug\Exceptions`` and have not overridden From 9f8bc2feddd7956b78ec852eb3e21806bd9394c2 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Fri, 21 Jul 2023 17:58:53 +0800 Subject: [PATCH 4322/8282] style: Use all available checked tokens for `no_extra_blank_lines` --- .php-cs-fixer.dist.php | 17 +++++++++++++++ .php-cs-fixer.no-header.php | 17 +++++++++++++++ .php-cs-fixer.user-guide.php | 21 ++++++++++++++++++- app/Config/Logger.php | 2 -- .../Live/OCI8/CallStoredProcedureTest.php | 3 --- tests/system/Database/Live/UpdateTest.php | 1 - tests/system/Database/Live/UpsertTest.php | 3 --- tests/system/Test/TestCaseTest.php | 1 - 8 files changed, 54 insertions(+), 11 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 928f5b801071..3f9a0dd6f254 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -45,6 +45,23 @@ $overrides = [ 'php_unit_data_provider_return_type' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'attribute', + 'break', + 'case', + 'continue', + 'curly_brace_block', + 'default', + 'extra', + 'parenthesis_brace_block', + 'return', + 'square_brace_block', + 'switch', + 'throw', + 'use', + ], + ], ]; $options = [ diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index 954a06ec0230..16271f3cb31c 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -31,6 +31,23 @@ $overrides = [ 'php_unit_data_provider_return_type' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'attribute', + 'break', + 'case', + 'continue', + 'curly_brace_block', + 'default', + 'extra', + 'parenthesis_brace_block', + 'return', + 'square_brace_block', + 'switch', + 'throw', + 'use', + ], + ], ]; $options = [ diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 392d749c20f1..ef37d80386bd 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -24,8 +24,10 @@ ]) ->notPath([ 'ci3sample/', - 'libraries/sessions/016.php', 'database/query_builder/075.php', + 'libraries/sessions/016.php', + 'outgoing/response/031.php', + 'outgoing/response/032.php', ]); $overrides = [ @@ -34,6 +36,23 @@ 'no_unused_imports' => false, 'class_attributes_separation' => false, 'php_unit_data_provider_return_type' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'attribute', + 'break', + 'case', + 'continue', + 'curly_brace_block', + 'default', + 'extra', + 'parenthesis_brace_block', + 'return', + 'square_brace_block', + 'switch', + 'throw', + 'use', + ], + ], ]; $options = [ diff --git a/app/Config/Logger.php b/app/Config/Logger.php index 3fb341c6c04f..568c5da658ba 100644 --- a/app/Config/Logger.php +++ b/app/Config/Logger.php @@ -74,14 +74,12 @@ class Logger extends BaseConfig * the handler on top and continuing down. */ public array $handlers = [ - /* * -------------------------------------------------------------------- * File Handler * -------------------------------------------------------------------- */ FileHandler::class => [ - // The log levels that this handler will handle. 'handles' => [ 'critical', diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php index 3b85fd068d36..4b174a0f72a2 100644 --- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php +++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php @@ -51,7 +51,6 @@ public function testCallPackageProcedure() 'name' => ':output', 'value' => &$result, ], - ]); $this->assertSame($result, '7'); @@ -74,7 +73,6 @@ public function testCallStoredProcedure() 'name' => ':output', 'value' => &$result, ], - ]); $this->assertSame($result, '7'); @@ -90,7 +88,6 @@ public function testCallStoredProcedureForCursor() 'type' => OCI_B_CURSOR, 'value' => &$result, ], - ]); oci_execute($result); diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php index 031bbbc12be9..db998100395d 100644 --- a/tests/system/Database/Live/UpdateTest.php +++ b/tests/system/Database/Live/UpdateTest.php @@ -342,7 +342,6 @@ public function testUpdateBatchUpdateFieldsAndAlias() 'country' => 'Greece', ], [ - 'email' => 'ahmadinejad@world.com', 'name' => 'Ahmadinejad No change', 'country' => 'Greece', diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php index f8ad456b1bc2..51289b879da5 100644 --- a/tests/system/Database/Live/UpsertTest.php +++ b/tests/system/Database/Live/UpsertTest.php @@ -98,11 +98,8 @@ public function testUpsertAndUpsertBatchWithObject() break; case 'Postgre': - case 'SQLite3': - case 'SQLSRV': - case 'OCI8': // postgre, sqlite, sqlsrv, oracle - counts row with no change $this->assertSame(3, $affectedRows1); diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php index d94403a10b6a..dc2feda00210 100644 --- a/tests/system/Test/TestCaseTest.php +++ b/tests/system/Test/TestCaseTest.php @@ -14,7 +14,6 @@ use CodeIgniter\CLI\CLI; use CodeIgniter\Events\Events; use CodeIgniter\HTTP\Response; - use Config\App; /** From 1890d05b99dcae369a722e109f6ef6c1d40e7099 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 27 Jul 2023 11:30:45 +0800 Subject: [PATCH 4323/8282] docs: replace `U+2019` with `U+0060` --- app/Config/Filters.php | 2 +- changelogs/CHANGELOG_4.0.md | 4 ++-- contributing/pull_request.md | 2 +- system/Database/OCI8/Forge.php | 2 +- system/HTTP/ContentSecurityPolicy.php | 2 +- user_guide_src/source/libraries/sessions.rst | 2 +- user_guide_src/source/outgoing/response.rst | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 7b70c4fb3381..f751b8c2b581 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -49,7 +49,7 @@ class Filters extends BaseConfig * * If you use this, you should disable auto-routing because auto-routing * permits any HTTP method to access a controller. Accessing the controller - * with a method you don’t expect could bypass the filter. + * with a method you don't expect could bypass the filter. */ public array $methods = []; diff --git a/changelogs/CHANGELOG_4.0.md b/changelogs/CHANGELOG_4.0.md index ba2a9a85826d..57492ecaed6a 100644 --- a/changelogs/CHANGELOG_4.0.md +++ b/changelogs/CHANGELOG_4.0.md @@ -515,7 +515,7 @@ These changes increase security when handling uploaded files as the client can n - Add hex2bin prefix handling for encryption key [\#3307](https://github.com/codeigniter4/CodeIgniter4/pull/3307) ([michalsn](https://github.com/michalsn)) - add break; in foreach at Time::getDst\(\) when daylightSaving set [\#3305](https://github.com/codeigniter4/CodeIgniter4/pull/3305) ([samsonasik](https://github.com/samsonasik)) - New command: cache:clear [\#3304](https://github.com/codeigniter4/CodeIgniter4/pull/3304) ([lonnieezell](https://github.com/lonnieezell)) -- force\_https didn’t force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen)) +- force\_https didn't force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen)) - add test for CommandRunner::\_remap\(\) with empty first params [\#3301](https://github.com/codeigniter4/CodeIgniter4/pull/3301) ([samsonasik](https://github.com/samsonasik)) - FieldData -\> add typeName field and length field [\#3299](https://github.com/codeigniter4/CodeIgniter4/pull/3299) ([devorama](https://github.com/devorama)) - reduce repetitive getDefaultNamespace\(\) and controllerName\(\) function call in Router [\#3298](https://github.com/codeigniter4/CodeIgniter4/pull/3298) ([samsonasik](https://github.com/samsonasik)) @@ -2380,7 +2380,7 @@ These changes increase security when handling uploaded files as the client can n - Database can't save connect instances because var "$group" default is NULL [\#466](https://github.com/codeigniter4/CodeIgniter4/issues/466) - redirect\(\) issue [\#465](https://github.com/codeigniter4/CodeIgniter4/issues/465) - Join not working in Query Builder [\#464](https://github.com/codeigniter4/CodeIgniter4/issues/464) -- If the controller’s method's parameter has a default value , the program will show 500 error [\#461](https://github.com/codeigniter4/CodeIgniter4/issues/461) +- If the controller's method's parameter has a default value , the program will show 500 error [\#461](https://github.com/codeigniter4/CodeIgniter4/issues/461) - Wrong ROOTPATH on console [\#460](https://github.com/codeigniter4/CodeIgniter4/issues/460) - Rename "public" Folder Not Working [\#453](https://github.com/codeigniter4/CodeIgniter4/issues/453) - Environment File [\#452](https://github.com/codeigniter4/CodeIgniter4/issues/452) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index a28e5e75d171..3acd1f1c6219 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -28,7 +28,7 @@ Before we look into how to contribute to CodeIgniter4, here are some guidelines. Your Pull Requests (PRs) need to meet our guidelines. If your Pull Requests fail to pass these guidelines, they will be declined, -and you will need to re-submit when you’ve made the changes. +and you will need to re-submit when you've made the changes. This might sound a bit tough, but it is required for us to maintain the quality of the codebase. ### PHP Style diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php index 31b20584fe74..1eddd4a72888 100644 --- a/system/Database/OCI8/Forge.php +++ b/system/Database/OCI8/Forge.php @@ -187,7 +187,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field) protected function _processColumn(array $field): string { $constraint = ''; - // @todo: can’t cover multi pattern when set type. + // @todo: can't cover multi pattern when set type. if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) { $constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name']) . ' IN ' . $field['length'] . ')'; diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php index 2ff9e355a83e..deb5093e86a8 100644 --- a/system/HTTP/ContentSecurityPolicy.php +++ b/system/HTTP/ContentSecurityPolicy.php @@ -327,7 +327,7 @@ public function reportOnly(bool $value = true) /** * Adds a new base_uri value. Can be either a URI class or a simple string. * - * base_uri restricts the URLs that can appear in a page’s element. + * base_uri restricts the URLs that can appear in a page's element. * * @see http://www.w3.org/TR/CSP/#directive-base-uri * diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 3c0e13d77552..4e65cf7a17fa 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -392,7 +392,7 @@ necessary with our new implementation. However, it may happen that your application relied on these values, so here are alternative methods of accessing them: - - session_id: ``$session->session_id`` or ``session_id()`` (PHP’s built-in function) + - session_id: ``$session->session_id`` or ``session_id()`` (PHP's built-in function) - ip_address: ``$_SERVER['REMOTE_ADDR']`` - user_agent: ``$_SERVER['HTTP_USER_AGENT']`` (unused by sessions) - last_activity: Depends on the storage, no straightforward way. Sorry! diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 762ce8e200ef..1e25b4dae583 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -111,7 +111,7 @@ When you want to redirect back, use ``redirect()->back()``: .. note:: ``redirect()->back()`` is not the same as browser "back" button. It takes a visitor to "the last page viewed during the Session" when the Session is available. - If the Session hasn’t been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used. + If the Session hasn't been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used. .. _response-redirect-status-code: From daf48bbfd58b6072bb1954a6f8fb51f6e58f9400 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 27 Jul 2023 12:02:08 +0800 Subject: [PATCH 4324/8282] Add types for app --- app/Config/Kint.php | 18 ++++++++++++++++++ app/Controllers/BaseController.php | 2 +- app/Controllers/Home.php | 2 +- phpstan-baseline.php | 25 ------------------------- 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/app/Config/Kint.php b/app/Config/Kint.php index 7e0a0157c065..cc8b54592b6b 100644 --- a/app/Config/Kint.php +++ b/app/Config/Kint.php @@ -3,7 +3,10 @@ namespace Config; use CodeIgniter\Config\BaseConfig; +use Kint\Parser\ConstructablePluginInterface; use Kint\Renderer\AbstractRenderer; +use Kint\Renderer\Rich\TabPluginInterface; +use Kint\Renderer\Rich\ValuePluginInterface; /** * -------------------------------------------------------------------------- @@ -23,7 +26,12 @@ class Kint extends BaseConfig |-------------------------------------------------------------------------- */ + /** + * @var array + * @phpstan-var list|ConstructablePluginInterface> + */ public $plugins; + public int $maxDepth = 6; public bool $displayCalledFrom = true; public bool $expanded = false; @@ -36,7 +44,17 @@ class Kint extends BaseConfig public string $richTheme = 'aante-light.css'; public bool $richFolder = false; public int $richSort = AbstractRenderer::SORT_FULL; + + /** + * @var array + * @phpstan-var array> + */ public $richObjectPlugins; + + /** + * @var array + * @phpstan-var array> + */ public $richTabPlugins; /* diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index ecea16206654..fb44007e5c72 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -44,7 +44,7 @@ abstract class BaseController extends Controller // protected $session; /** - * Constructor. + * @return void */ public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) { diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 7f867e95ffc4..59343333099a 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -4,7 +4,7 @@ class Home extends BaseController { - public function index() + public function index(): string { return view('welcome_message'); } diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 26a2bbdf1afb..6df649cb8bdc 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1,31 +1,6 @@ '#^Property Config\\\\Kint\\:\\:\\$plugins has no type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Config/Kint.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property Config\\\\Kint\\:\\:\\$richObjectPlugins has no type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Config/Kint.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property Config\\\\Kint\\:\\:\\$richTabPlugins has no type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Config/Kint.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method App\\\\Controllers\\\\BaseController\\:\\:initController\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Controllers/BaseController.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method App\\\\Controllers\\\\Home\\:\\:index\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Controllers/Home.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:discoverComposerNamespaces\\(\\) has no return type specified\\.$#', 'count' => 1, From 89d6f3788741440b0b2035527bb883b957810a93 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 28 Jul 2023 11:21:54 +0900 Subject: [PATCH 4325/8282] docs: update existing descriptions --- user_guide_src/source/general/configuration.rst | 5 +++-- user_guide_src/source/general/modules.rst | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst index 2e666c8245c8..e51ab1e8fa40 100644 --- a/user_guide_src/source/general/configuration.rst +++ b/user_guide_src/source/general/configuration.rst @@ -47,9 +47,10 @@ All of the configuration files that ship with CodeIgniter are namespaced with ``Config``. Using this namespace in your application will provide the best performance since it knows exactly where to find the files. -.. note:: ``config()`` finds the file in **app/Config/** when there is a class with the same shortname, +.. note:: Prior to v4.4.0, ``config()`` finds the file in **app/Config/** when there + is a class with the same shortname, even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``. - This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. + This behavior has been fixed in v4.4.0, and returns the specified instance. Getting a Config Property ========================= diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index ae79f5431779..92093d5bd5c1 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -189,14 +189,15 @@ with the ``new`` command: .. literalinclude:: modules/008.php -Config files are automatically discovered whenever using the :php:func:`config()` function that is always available. +Config files are automatically discovered whenever using the :php:func:`config()` function that is always available, and you pass a short classname to it. .. note:: We don't recommend you use the same short classname in modules. - Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`. + Modules that need to override or add to known configurations in **app/Config/** should use :ref:`Implicit Registrars `. -.. note:: ``config()`` finds the file in **app/Config/** when there is a class with the same shortname, +.. note:: Prior to v4.4.0, ``config()`` finds the file in **app/Config/** when there + is a class with the same shortname, even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``. - This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. + This behavior has been fixed in v4.4.0, and returns the specified instance. Migrations ========== From 912480aa191e7e0df873a897eae0db3efacc0828 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 28 Jul 2023 11:35:16 +0900 Subject: [PATCH 4326/8282] style: remove emtpy line Fix due to changes in the coding standard. --- system/Router/DefinedRouteCollector.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Router/DefinedRouteCollector.php b/system/Router/DefinedRouteCollector.php index f77383fa6cef..9d211415a8a0 100644 --- a/system/Router/DefinedRouteCollector.php +++ b/system/Router/DefinedRouteCollector.php @@ -49,7 +49,6 @@ public function collect(): Generator foreach ($routes as $route => $handler) { if (is_string($handler) || $handler instanceof Closure) { - if ($handler instanceof Closure) { $view = $this->routeCollection->getRoutesOptions($route, $method)['view'] ?? false; From 68a090758950c3e18274efc7619897dff7097182 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sat, 29 Jul 2023 20:45:23 +0800 Subject: [PATCH 4327/8282] Add types to Autoloader --- phpstan-baseline.php | 10 ---------- system/Autoloader/Autoloader.php | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 6df649cb8bdc..5302862f143a 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1,16 +1,6 @@ '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:discoverComposerNamespaces\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:register\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', -]; $ignoreErrors[] = [ 'message' => '#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), \'loadClass\'\\} given\\.$#', 'count' => 1, diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index f838451ce6fb..65be3d7d3cee 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -148,6 +148,8 @@ private function loadComposerInfo(Modules $modules): void /** * Register the loader with the SPL autoloader stack. + * + * @return void */ public function register() { @@ -445,6 +447,8 @@ private function loadComposerClassmap(ClassLoader $composer): void * Locates autoload information from Composer, if available. * * @deprecated No longer used. + * + * @return void */ protected function discoverComposerNamespaces() { From 361cb3f27780b9633b7fe11ecb3dfb65e2664198 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sat, 29 Jul 2023 22:59:04 +0800 Subject: [PATCH 4328/8282] Add void return to tests --- tests/_support/Commands/AppInfo.php | 6 +- tests/_support/Commands/InvalidCommand.php | 2 +- tests/_support/Commands/LanguageCommand.php | 2 +- tests/_support/Commands/ParamsReveal.php | 2 +- tests/_support/Commands/Unsuffixable.php | 2 +- tests/_support/Controllers/Popcorn.php | 6 +- .../20160428212500_Create_test_tables.php | 4 +- .../_support/Database/Seeds/AnotherSeeder.php | 2 +- .../_support/Database/Seeds/CITestSeeder.php | 2 +- tests/_support/Filters/Customfilter.php | 2 +- .../2018-01-24-102301_Some_migration.php | 4 +- .../2018-01-24-102302_Another_migration.php | 4 +- tests/_support/Publishers/TestPublisher.php | 2 +- tests/_support/View/Cells/AdditionCell.php | 2 +- .../View/SampleClassWithInitController.php | 2 +- tests/system/API/ResponseTraitTest.php | 62 ++--- tests/system/Autoloader/AutoloaderTest.php | 52 ++-- tests/system/Autoloader/FileLocatorTest.php | 60 ++-- tests/system/CLI/CLITest.php | 74 ++--- tests/system/CLI/ConsoleTest.php | 16 +- tests/system/Cache/CacheFactoryTest.php | 10 +- tests/system/Cache/CacheMockTest.php | 4 +- .../Cache/Handlers/AbstractHandlerTest.php | 4 +- .../system/Cache/Handlers/BaseHandlerTest.php | 12 +- .../Cache/Handlers/DummyHandlerTest.php | 24 +- .../system/Cache/Handlers/FileHandlerTest.php | 36 +-- .../Cache/Handlers/MemcachedHandlerTest.php | 26 +- .../Cache/Handlers/PredisHandlerTest.php | 24 +- .../Cache/Handlers/RedisHandlerTest.php | 26 +- tests/system/CodeIgniterTest.php | 72 ++--- tests/system/Commands/BaseCommandTest.php | 8 +- tests/system/Commands/ClearCacheTest.php | 4 +- tests/system/Commands/ClearDebugbarTest.php | 4 +- tests/system/Commands/ClearLogsTest.php | 4 +- .../system/Commands/CommandGeneratorTest.php | 12 +- tests/system/Commands/CommandTest.php | 22 +- tests/system/Commands/ConfigGeneratorTest.php | 4 +- .../Commands/ConfigurableSortImportsTest.php | 6 +- .../Commands/ControllerGeneratorTest.php | 10 +- tests/system/Commands/CreateDatabaseTest.php | 6 +- .../system/Commands/DatabaseCommandsTest.php | 10 +- tests/system/Commands/EntityGeneratorTest.php | 4 +- .../Commands/EnvironmentCommandTest.php | 2 +- tests/system/Commands/FilterCheckTest.php | 4 +- tests/system/Commands/FilterGeneratorTest.php | 4 +- tests/system/Commands/GenerateKeyTest.php | 14 +- tests/system/Commands/GeneratorsTest.php | 12 +- tests/system/Commands/HelpCommandTest.php | 10 +- tests/system/Commands/InfoCacheTest.php | 8 +- .../Commands/MigrationGeneratorTest.php | 8 +- tests/system/Commands/ModelGeneratorTest.php | 16 +- tests/system/Commands/PublishCommandTest.php | 4 +- tests/system/Commands/RoutesTest.php | 8 +- .../system/Commands/ScaffoldGeneratorTest.php | 10 +- tests/system/Commands/SeederGeneratorTest.php | 4 +- .../Commands/Utilities/NamespacesTest.php | 4 +- .../Routes/AutoRouteCollectorTest.php | 2 +- .../AutoRouteCollectorTest.php | 4 +- .../ControllerMethodReaderTest.php | 6 +- .../AutoRouterImproved/Controllers/Home.php | 6 +- .../Utilities/Routes/ControllerFinderTest.php | 2 +- .../Routes/ControllerMethodReaderTest.php | 4 +- .../Utilities/Routes/FilterCollectorTest.php | 2 +- .../Utilities/Routes/FilterFinderTest.php | 10 +- .../Routes/SampleURIGeneratorTest.php | 4 +- .../Commands/ValidationGeneratorTest.php | 4 +- tests/system/CommonFunctionsSendTest.php | 2 +- tests/system/CommonFunctionsTest.php | 118 ++++---- tests/system/CommonHelperTest.php | 4 +- tests/system/Config/BaseConfigTest.php | 36 +-- tests/system/Config/ConfigTest.php | 10 +- tests/system/Config/DotEnvTest.php | 30 +- tests/system/Config/FactoriesTest.php | 50 ++-- tests/system/Config/MimesTest.php | 4 +- tests/system/Config/ServicesTest.php | 94 +++---- tests/system/ControllerTest.php | 18 +- tests/system/Database/BaseConnectionTest.php | 22 +- tests/system/Database/BaseQueryTest.php | 68 ++--- tests/system/Database/Builder/AliasTest.php | 12 +- tests/system/Database/Builder/BaseTest.php | 8 +- tests/system/Database/Builder/CountTest.php | 12 +- tests/system/Database/Builder/DeleteTest.php | 8 +- .../system/Database/Builder/DistinctTest.php | 2 +- tests/system/Database/Builder/EmptyTest.php | 2 +- tests/system/Database/Builder/FromTest.php | 16 +- tests/system/Database/Builder/GetTest.php | 12 +- tests/system/Database/Builder/GroupTest.php | 62 ++--- tests/system/Database/Builder/InsertTest.php | 24 +- tests/system/Database/Builder/JoinTest.php | 14 +- tests/system/Database/Builder/LikeTest.php | 20 +- tests/system/Database/Builder/LimitTest.php | 6 +- tests/system/Database/Builder/OrderTest.php | 8 +- tests/system/Database/Builder/PrefixTest.php | 4 +- tests/system/Database/Builder/ReplaceTest.php | 4 +- tests/system/Database/Builder/SelectTest.php | 50 ++-- .../system/Database/Builder/TruncateTest.php | 2 +- tests/system/Database/Builder/UpdateTest.php | 36 +-- tests/system/Database/Builder/WhenTest.php | 44 +-- tests/system/Database/Builder/WhereTest.php | 78 +++--- tests/system/Database/ConfigTest.php | 10 +- tests/system/Database/DatabaseSeederTest.php | 8 +- .../DatabaseTestCaseMigrationOnce1Test.php | 6 +- .../DatabaseTestCaseMigrationOnce2Test.php | 4 +- .../system/Database/DatabaseTestCaseTest.php | 6 +- .../system/Database/Forge/CreateTableTest.php | 2 +- .../Database/Forge/DropForeignKeyTest.php | 2 +- tests/system/Database/Live/AliasTest.php | 2 +- tests/system/Database/Live/BadQueryTest.php | 4 +- tests/system/Database/Live/ConnectTest.php | 8 +- tests/system/Database/Live/CountTest.php | 10 +- .../Live/DatabaseTestTraitCaseTest.php | 10 +- tests/system/Database/Live/DbDebugTest.php | 4 +- tests/system/Database/Live/DbUtilsTest.php | 26 +- tests/system/Database/Live/DeleteTest.php | 12 +- tests/system/Database/Live/EmptyTest.php | 4 +- tests/system/Database/Live/EscapeTest.php | 12 +- .../Database/Live/FabricatorLiveTest.php | 14 +- tests/system/Database/Live/ForgeTest.php | 90 +++--- tests/system/Database/Live/FromTest.php | 6 +- tests/system/Database/Live/GetNumRowsTest.php | 2 +- tests/system/Database/Live/GetTest.php | 34 +-- tests/system/Database/Live/GetVersionTest.php | 2 +- tests/system/Database/Live/GroupTest.php | 40 +-- tests/system/Database/Live/IncrementTest.php | 12 +- tests/system/Database/Live/InsertTest.php | 20 +- tests/system/Database/Live/JoinTest.php | 2 +- tests/system/Database/Live/LikeTest.php | 22 +- tests/system/Database/Live/LimitTest.php | 4 +- tests/system/Database/Live/MetadataTest.php | 6 +- .../Database/Live/MySQLi/RawSqlTest.php | 14 +- .../Live/OCI8/CallStoredProcedureTest.php | 6 +- .../Database/Live/OCI8/LastInsertIDTest.php | 8 +- tests/system/Database/Live/OrderTest.php | 8 +- .../Database/Live/PreparedQueryTest.php | 22 +- tests/system/Database/Live/PretendTest.php | 2 +- .../Database/Live/SQLite/AlterTableTest.php | 20 +- .../Database/Live/SQLite/GetIndexDataTest.php | 2 +- tests/system/Database/Live/SelectTest.php | 34 +-- .../Live/TransactionDBDebugFalseTest.php | 2 +- .../Live/TransactionDBDebugTrueTest.php | 10 +- .../system/Database/Live/TransactionTest.php | 8 +- tests/system/Database/Live/UpdateTest.php | 38 +-- tests/system/Database/Live/UpsertTest.php | 38 +-- tests/system/Database/Live/WhereTest.php | 28 +- .../Database/Live/WriteTypeQueryTest.php | 38 +-- .../Migrations/MigrationRunnerTest.php | 56 ++-- .../Database/Migrations/MigrationTest.php | 6 +- tests/system/Database/ModelFactoryTest.php | 10 +- tests/system/Database/RawSqlTest.php | 6 +- tests/system/Debug/TimerTest.php | 42 +-- .../Debug/Toolbar/Collectors/HistoryTest.php | 4 +- tests/system/Email/EmailTest.php | 20 +- tests/system/Encryption/EncryptionTest.php | 30 +- .../Handlers/OpenSSLHandlerTest.php | 14 +- .../Encryption/Handlers/SodiumHandlerTest.php | 16 +- tests/system/Entity/EntityTest.php | 152 +++++------ tests/system/Events/EventsTest.php | 62 ++--- tests/system/Files/FileCollectionTest.php | 82 +++--- tests/system/Files/FileTest.php | 20 +- tests/system/Files/FileWithVfsTest.php | 28 +- tests/system/Filters/CSRFTest.php | 4 +- tests/system/Filters/DebugToolbarTest.php | 2 +- tests/system/Filters/FiltersTest.php | 74 ++--- tests/system/Filters/HoneypotTest.php | 8 +- tests/system/Filters/InvalidCharsTest.php | 12 +- tests/system/Filters/SecureHeadersTest.php | 2 +- .../system/Filters/fixtures/GoogleCurious.php | 2 +- tests/system/Filters/fixtures/GoogleEmpty.php | 2 +- tests/system/Filters/fixtures/GoogleYou.php | 2 +- tests/system/Filters/fixtures/Multiple1.php | 2 +- tests/system/Filters/fixtures/Multiple2.php | 2 +- tests/system/Format/FormatTest.php | 10 +- tests/system/Format/JSONFormatterTest.php | 8 +- tests/system/Format/XMLFormatterTest.php | 14 +- tests/system/HTTP/CLIRequestTest.php | 78 +++--- .../HTTP/CURLRequestDoNotShareOptionsTest.php | 122 ++++----- tests/system/HTTP/CURLRequestTest.php | 122 ++++----- .../system/HTTP/ContentSecurityPolicyTest.php | 76 +++--- tests/system/HTTP/DownloadResponseTest.php | 52 ++-- .../system/HTTP/Files/FileCollectionTest.php | 50 ++-- tests/system/HTTP/Files/FileMovingTest.php | 18 +- tests/system/HTTP/HeaderTest.php | 30 +- .../HTTP/IncomingRequestDetectingTest.php | 28 +- tests/system/HTTP/IncomingRequestTest.php | 152 +++++------ tests/system/HTTP/MessageTest.php | 50 ++-- tests/system/HTTP/NegotiateTest.php | 34 +-- tests/system/HTTP/OutgoingRequestTest.php | 14 +- tests/system/HTTP/RedirectResponseTest.php | 30 +- tests/system/HTTP/RequestTest.php | 60 ++-- tests/system/HTTP/ResponseCookieTest.php | 36 +-- tests/system/HTTP/ResponseSendTest.php | 6 +- tests/system/HTTP/ResponseTest.php | 78 +++--- tests/system/HTTP/URITest.php | 134 ++++----- tests/system/HTTP/UserAgentTest.php | 16 +- tests/system/Helpers/ArrayHelperTest.php | 40 +-- tests/system/Helpers/CookieHelperTest.php | 30 +- tests/system/Helpers/DateHelperTest.php | 10 +- tests/system/Helpers/FilesystemHelperTest.php | 76 +++--- tests/system/Helpers/FormHelperTest.php | 134 ++++----- tests/system/Helpers/HTMLHelperTest.php | 122 ++++----- tests/system/Helpers/InflectorHelperTest.php | 24 +- tests/system/Helpers/NumberHelperTest.php | 38 +-- tests/system/Helpers/SecurityHelperTest.php | 8 +- tests/system/Helpers/TextHelperTest.php | 60 ++-- .../Helpers/URLHelper/CurrentUrlTest.php | 30 +- .../system/Helpers/URLHelper/MiscUrlTest.php | 52 ++-- .../system/Helpers/URLHelper/SiteUrlTest.php | 16 +- tests/system/Helpers/XMLHelperTest.php | 4 +- tests/system/HomeTest.php | 2 +- tests/system/Honeypot/HoneypotTest.php | 24 +- tests/system/I18n/TimeDifferenceTest.php | 48 ++-- tests/system/I18n/TimeLegacyTest.php | 256 ++++++++--------- tests/system/I18n/TimeTest.php | 258 +++++++++--------- tests/system/Images/BaseHandlerTest.php | 14 +- tests/system/Images/GDHandlerTest.php | 70 ++--- .../system/Images/ImageMagickHandlerTest.php | 70 ++--- tests/system/Images/ImageTest.php | 14 +- tests/system/Language/LanguageTest.php | 42 +-- .../Log/Handlers/ChromeLoggerHandlerTest.php | 10 +- tests/system/Log/Handlers/FileHandlerTest.php | 8 +- tests/system/Log/LoggerTest.php | 48 ++-- .../system/Models/MiscellaneousModelTest.php | 2 +- .../Models/ValidationModelRuleGroupTest.php | 6 +- tests/system/Models/ValidationModelTest.php | 6 +- tests/system/Pager/PagerRendererTest.php | 62 ++--- tests/system/Pager/PagerTest.php | 78 +++--- .../Publisher/PublisherContentReplaceTest.php | 6 +- tests/system/Publisher/PublisherInputTest.php | 16 +- .../system/Publisher/PublisherOutputTest.php | 18 +- .../Publisher/PublisherRestrictionsTest.php | 8 +- .../system/Publisher/PublisherSupportTest.php | 20 +- .../system/RESTful/ResourceControllerTest.php | 30 +- .../system/RESTful/ResourcePresenterTest.php | 28 +- .../system/Router/AutoRouterImprovedTest.php | 36 +-- .../Dash_folder/Dash_controller.php | 4 +- .../Router/Controllers/Dash_folder/Home.php | 2 +- .../Controllers/Dash_folder/Mycontroller.php | 2 +- tests/system/Router/Controllers/Home.php | 4 +- tests/system/Router/Controllers/Index.php | 4 +- .../Router/Controllers/Mycontroller.php | 4 +- .../Controllers/Subfolder/Mycontroller.php | 2 +- .../RouteCollectionReverseRouteTest.php | 28 +- tests/system/Router/RouteCollectionTest.php | 256 ++++++++--------- tests/system/Router/RouterTest.php | 110 ++++---- .../SecurityCSRFCookieRandomizeTokenTest.php | 4 +- .../SecurityCSRFSessionRandomizeTokenTest.php | 26 +- .../Security/SecurityCSRFSessionTest.php | 22 +- tests/system/Security/SecurityTest.php | 28 +- .../Database/AbstractHandlerTestCase.php | 12 +- .../Handlers/Database/RedisHandlerTest.php | 22 +- tests/system/Session/SessionTest.php | 84 +++--- tests/system/SparkTest.php | 2 +- tests/system/Test/BootstrapFCPATHTest.php | 2 +- tests/system/Test/ControllerTestTraitTest.php | 38 +-- tests/system/Test/DOMParserTest.php | 72 ++--- tests/system/Test/FabricatorTest.php | 94 +++---- .../FeatureTestAutoRoutingImprovedTest.php | 6 +- tests/system/Test/FeatureTestTraitTest.php | 58 ++-- tests/system/Test/FilterTestTraitTest.php | 18 +- tests/system/Test/ReflectionHelperTest.php | 14 +- tests/system/Test/TestCaseEmissionsTest.php | 4 +- tests/system/Test/TestCaseTest.php | 20 +- tests/system/Test/TestResponseTest.php | 76 +++--- tests/system/Throttle/ThrottleTest.php | 20 +- tests/system/Typography/TypographyTest.php | 18 +- tests/system/Validation/FormatRulesTest.php | 6 +- tests/system/Validation/ValidationTest.php | 34 +-- tests/system/View/CellTest.php | 50 ++-- tests/system/View/ControlledCellTest.php | 34 +-- tests/system/View/DecoratorsTest.php | 10 +- tests/system/View/ParserFilterTest.php | 52 ++-- tests/system/View/ParserPluginTest.php | 22 +- tests/system/View/ParserTest.php | 126 ++++----- tests/system/View/TableTest.php | 52 ++-- tests/system/View/ViewTest.php | 60 ++-- 275 files changed, 3769 insertions(+), 3769 deletions(-) diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php index e7bf3093e658..efb6d941a953 100644 --- a/tests/_support/Commands/AppInfo.php +++ b/tests/_support/Commands/AppInfo.php @@ -23,12 +23,12 @@ class AppInfo extends BaseCommand protected $arguments = ['draft' => 'unused']; protected $description = 'Displays basic application information.'; - public function run(array $params) + public function run(array $params): void { CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red')); } - public function bomb() + public function bomb(): void { try { CLI::color('test', 'white', 'Background'); @@ -37,7 +37,7 @@ public function bomb() } } - public function helpme() + public function helpme(): void { $this->call('help'); } diff --git a/tests/_support/Commands/InvalidCommand.php b/tests/_support/Commands/InvalidCommand.php index 5b4acf936b08..e69827669290 100644 --- a/tests/_support/Commands/InvalidCommand.php +++ b/tests/_support/Commands/InvalidCommand.php @@ -27,7 +27,7 @@ public function __construct() throw new ReflectionException(); } - public function run(array $params) + public function run(array $params): void { CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red')); } diff --git a/tests/_support/Commands/LanguageCommand.php b/tests/_support/Commands/LanguageCommand.php index e495d250a295..978099e5257f 100644 --- a/tests/_support/Commands/LanguageCommand.php +++ b/tests/_support/Commands/LanguageCommand.php @@ -27,7 +27,7 @@ class LanguageCommand extends BaseCommand '--sort' => 'Turn on/off the sortImports flag.', ]; - public function run(array $params) + public function run(array $params): void { $this->setHasClassName(false); $params[0] = 'Foobar'; diff --git a/tests/_support/Commands/ParamsReveal.php b/tests/_support/Commands/ParamsReveal.php index 76be444e69d1..331c1471611f 100644 --- a/tests/_support/Commands/ParamsReveal.php +++ b/tests/_support/Commands/ParamsReveal.php @@ -21,7 +21,7 @@ class ParamsReveal extends BaseCommand protected $description = 'Reveal params'; public static $args; - public function run(array $params) + public function run(array $params): void { static::$args = $params; } diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php index 36a752e25891..cf906071d7ef 100644 --- a/tests/_support/Commands/Unsuffixable.php +++ b/tests/_support/Commands/Unsuffixable.php @@ -65,7 +65,7 @@ class Unsuffixable extends BaseCommand /** * Actually execute a command. */ - public function run(array $params) + public function run(array $params): void { $this->component = 'Command'; $this->directory = 'Commands'; diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php index 660a405cccc2..2084c3b81713 100644 --- a/tests/_support/Controllers/Popcorn.php +++ b/tests/_support/Controllers/Popcorn.php @@ -33,7 +33,7 @@ public function pop() return $this->respond('Oops', 567, 'Surprise'); } - public function popper() + public function popper(): void { throw new RuntimeException('Surprise', 500); } @@ -61,12 +61,12 @@ public function index3() return $this->response->setJSON(['lang' => $this->request->getLocale()]); } - public function canyon() + public function canyon(): void { echo 'Hello-o-o ' . $this->request->getGet('foo'); } - public function cat() + public function cat(): void { } diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php index ac489ecbb57b..6e3d9be574fa 100644 --- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php +++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php @@ -15,7 +15,7 @@ class Migration_Create_test_tables extends Migration { - public function up() + public function up(): void { // User Table $this->forge->addField([ @@ -160,7 +160,7 @@ public function up() } } - public function down() + public function down(): void { $this->forge->dropTable('user', true); $this->forge->dropTable('job', true); diff --git a/tests/_support/Database/Seeds/AnotherSeeder.php b/tests/_support/Database/Seeds/AnotherSeeder.php index aaf7c7e93410..09c9a93d8af8 100644 --- a/tests/_support/Database/Seeds/AnotherSeeder.php +++ b/tests/_support/Database/Seeds/AnotherSeeder.php @@ -15,7 +15,7 @@ class AnotherSeeder extends Seeder { - public function run() + public function run(): void { $row = [ 'name' => 'Jerome Lohan', diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php index 9353578246b5..1749970fe338 100644 --- a/tests/_support/Database/Seeds/CITestSeeder.php +++ b/tests/_support/Database/Seeds/CITestSeeder.php @@ -15,7 +15,7 @@ class CITestSeeder extends Seeder { - public function run() + public function run(): void { // Job Data $data = [ diff --git a/tests/_support/Filters/Customfilter.php b/tests/_support/Filters/Customfilter.php index 7efbb6c0ddb8..6804cacf62b4 100644 --- a/tests/_support/Filters/Customfilter.php +++ b/tests/_support/Filters/Customfilter.php @@ -23,7 +23,7 @@ public function before(RequestInterface $request, $arguments = null) return $request; } - public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) + public function after(RequestInterface $request, ResponseInterface $response, $arguments = null): void { } } diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php index 39eb6e0879cc..e0a34f3eb03c 100644 --- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php +++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php @@ -13,7 +13,7 @@ class Migration_some_migration extends \CodeIgniter\Database\Migration { - public function up() + public function up(): void { $this->forge->addField([ 'key' => [ @@ -28,7 +28,7 @@ public function up() ]); } - public function down() + public function down(): void { $this->forge->dropTable('foo', true); } diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php index f1606eff56e1..0006da2a347d 100644 --- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php +++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php @@ -13,7 +13,7 @@ class Migration_another_migration extends \CodeIgniter\Database\Migration { - public function up() + public function up(): void { $fields = [ 'value' => [ @@ -29,7 +29,7 @@ public function up() ]); } - public function down() + public function down(): void { if ($this->db->tableExists('foo')) { $this->forge->dropColumn('foo', 'value'); diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php index 95d9fa72c250..0e3b67ab23a5 100644 --- a/tests/_support/Publishers/TestPublisher.php +++ b/tests/_support/Publishers/TestPublisher.php @@ -39,7 +39,7 @@ final class TestPublisher extends Publisher /** * Fakes an error on the given file. */ - public static function setResult(bool $result) + public static function setResult(bool $result): void { self::$result = $result; } diff --git a/tests/_support/View/Cells/AdditionCell.php b/tests/_support/View/Cells/AdditionCell.php index aaa89a6560cb..0b5b8a5ddc74 100644 --- a/tests/_support/View/Cells/AdditionCell.php +++ b/tests/_support/View/Cells/AdditionCell.php @@ -17,7 +17,7 @@ class AdditionCell extends Cell { public int $value = 2; - public function mount(?int $number = null, bool $skipAddition = false) + public function mount(?int $number = null, bool $skipAddition = false): void { $this->value = ! $skipAddition ? $this->value + (int) $number diff --git a/tests/_support/View/SampleClassWithInitController.php b/tests/_support/View/SampleClassWithInitController.php index 32eb4f70a7a3..8b12326c5b58 100644 --- a/tests/_support/View/SampleClassWithInitController.php +++ b/tests/_support/View/SampleClassWithInitController.php @@ -25,7 +25,7 @@ class SampleClassWithInitController { private ResponseInterface $response; - public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger) + public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger): void { $this->response = $response; } diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index b8a522da86dd..693eff53f33d 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -95,14 +95,14 @@ public function __construct(&$request, &$response, &$formatter) $this->formatter = $formatter; } - public function resetFormatter() + public function resetFormatter(): void { $this->formatter = null; } }; } - public function testNoFormatterJSON() + public function testNoFormatterJSON(): void { $this->formatter = null; $controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']); @@ -120,7 +120,7 @@ public function testNoFormatterJSON() $this->assertSame($expected, $this->response->getBody()); } - public function testNoFormatter() + public function testNoFormatter(): void { $this->formatter = null; $controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']); @@ -130,7 +130,7 @@ public function testNoFormatter() $this->assertSame('A Custom Reason', $this->response->getBody()); } - public function testAssociativeArrayPayload() + public function testAssociativeArrayPayload(): void { $this->formatter = null; $controller = $this->makeController(); @@ -146,7 +146,7 @@ public function testAssociativeArrayPayload() $this->assertSame($expected, $this->response->getBody()); } - public function testArrayPayload() + public function testArrayPayload(): void { $this->formatter = null; $controller = $this->makeController(); @@ -168,7 +168,7 @@ public function testArrayPayload() $this->assertSame($expected, $this->response->getBody()); } - public function testPHPtoArrayPayload() + public function testPHPtoArrayPayload(): void { $this->formatter = null; $controller = $this->makeController(); @@ -187,7 +187,7 @@ public function testPHPtoArrayPayload() $this->assertSame($expected, $this->response->getBody()); } - public function testRespondSets404WithNoData() + public function testRespondSets404WithNoData(): void { $controller = $this->makeController(); @@ -197,7 +197,7 @@ public function testRespondSets404WithNoData() $this->assertNull($this->response->getBody()); } - public function testRespondSetsStatusWithEmptyData() + public function testRespondSetsStatusWithEmptyData(): void { $controller = $this->makeController(); @@ -207,7 +207,7 @@ public function testRespondSetsStatusWithEmptyData() $this->assertNull($this->response->getBody()); } - public function testRespondSetsCorrectBodyAndStatus() + public function testRespondSetsCorrectBodyAndStatus(): void { $controller = $this->makeController(); @@ -219,7 +219,7 @@ public function testRespondSetsCorrectBodyAndStatus() $this->assertSame('Created', $this->response->getReason()); } - public function testRespondWithCustomReason() + public function testRespondWithCustomReason(): void { $controller = $this->makeController(); @@ -229,7 +229,7 @@ public function testRespondWithCustomReason() $this->assertSame('A Custom Reason', $this->response->getReason()); } - public function testFailSingleMessage() + public function testFailSingleMessage(): void { $controller = $this->makeController(); @@ -248,7 +248,7 @@ public function testFailSingleMessage() $this->assertSame('A Custom Reason', $this->response->getReason()); } - public function testCreated() + public function testCreated(): void { $controller = $this->makeController(); @@ -259,7 +259,7 @@ public function testCreated() $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody()); } - public function testDeleted() + public function testDeleted(): void { $controller = $this->makeController(); @@ -270,7 +270,7 @@ public function testDeleted() $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody()); } - public function testUpdated() + public function testUpdated(): void { $controller = $this->makeController(); @@ -281,7 +281,7 @@ public function testUpdated() $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody()); } - public function testUnauthorized() + public function testUnauthorized(): void { $controller = $this->makeController(); @@ -299,7 +299,7 @@ public function testUnauthorized() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testForbidden() + public function testForbidden(): void { $controller = $this->makeController(); @@ -317,7 +317,7 @@ public function testForbidden() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testNoContent() + public function testNoContent(): void { $controller = $this->makeController(); @@ -328,7 +328,7 @@ public function testNoContent() $this->assertSame(204, $this->response->getStatusCode()); } - public function testNotFound() + public function testNotFound(): void { $controller = $this->makeController(); @@ -346,7 +346,7 @@ public function testNotFound() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testValidationError() + public function testValidationError(): void { $controller = $this->makeController(); @@ -364,7 +364,7 @@ public function testValidationError() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testValidationErrors() + public function testValidationErrors(): void { $controller = $this->makeController(); @@ -383,7 +383,7 @@ public function testValidationErrors() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testResourceExists() + public function testResourceExists(): void { $controller = $this->makeController(); @@ -401,7 +401,7 @@ public function testResourceExists() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testResourceGone() + public function testResourceGone(): void { $controller = $this->makeController(); @@ -419,7 +419,7 @@ public function testResourceGone() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testTooManyRequests() + public function testTooManyRequests(): void { $controller = $this->makeController(); @@ -437,7 +437,7 @@ public function testTooManyRequests() $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testServerError() + public function testServerError(): void { $controller = $this->makeController(); @@ -454,7 +454,7 @@ public function testServerError() ]), $this->response->getBody()); } - public function testValidContentTypes() + public function testValidContentTypes(): void { $chars = '; charset=UTF-8'; $goodMimes = [ @@ -469,7 +469,7 @@ public function testValidContentTypes() } } - private function tryValidContentType($mimeType, $contentType) + private function tryValidContentType($mimeType, $contentType): void { $original = $_SERVER; $_SERVER['CONTENT_TYPE'] = $mimeType; @@ -482,7 +482,7 @@ private function tryValidContentType($mimeType, $contentType) $_SERVER = $original; } - public function testValidResponses() + public function testValidResponses(): void { $chars = '; charset=UTF-8'; $goodMimes = [ @@ -497,7 +497,7 @@ public function testValidResponses() } } - public function testXMLFormatter() + public function testXMLFormatter(): void { $this->formatter = new XMLFormatter(); $controller = $this->makeController(); @@ -514,7 +514,7 @@ public function testXMLFormatter() $this->assertSame($expected, $this->response->getBody()); } - public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML() + public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML(): void { $config = new App(); @@ -559,7 +559,7 @@ public function __construct(&$request, &$response) $this->assertStringStartsWith(config('Format')->supportedResponseFormats[0], $response->getHeaderLine('Content-Type')); } - public function testResponseFormat() + public function testResponseFormat(): void { $data = ['foo' => 'something']; $controller = $this->makeController(); @@ -576,7 +576,7 @@ public function testResponseFormat() $this->assertStringStartsWith('application/xml', $this->response->getHeaderLine('Content-Type')); } - public function testXMLResponseFormat() + public function testXMLResponseFormat(): void { $data = ['foo' => 'bar']; $controller = $this->makeController(); diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index bfe7a0fac8da..a116bc9515d6 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -59,12 +59,12 @@ protected function tearDown(): void parent::tearDown(); } - public function testLoadStoredClass() + public function testLoadStoredClass(): void { $this->assertInstanceOf('UnnamespacedClass', new UnnamespacedClass()); } - public function testInitializeWithInvalidArguments() + public function testInitializeWithInvalidArguments(): void { $this->expectException('InvalidArgumentException'); $this->expectExceptionMessage("Config array must contain either the 'psr4' key or the 'classmap' key."); @@ -78,7 +78,7 @@ public function testInitializeWithInvalidArguments() (new Autoloader())->initialize($config, $modules); } - public function testInitializeTwice() + public function testInitializeTwice(): void { $loader = new Autoloader(); $loader->initialize(new Autoload(), new Modules()); @@ -94,7 +94,7 @@ public function testInitializeTwice() $this->assertSame('ROOTPATH/app', clean_path($ns['App'][0])); } - public function testServiceAutoLoaderFromShareInstances() + public function testServiceAutoLoaderFromShareInstances(): void { $autoloader = Services::autoloader(); // look for Home controller, as that should be in base repo @@ -103,7 +103,7 @@ public function testServiceAutoLoaderFromShareInstances() $this->assertSame($expected, realpath($actual) ?: $actual); } - public function testServiceAutoLoader() + public function testServiceAutoLoader(): void { $autoloader = Services::autoloader(false); $autoloader->initialize(new Autoload(), new Modules()); @@ -117,7 +117,7 @@ public function testServiceAutoLoader() $autoloader->unregister(); } - public function testExistingFile() + public function testExistingFile(): void { $actual = $this->loader->loadClass(Home::class); $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php'; @@ -128,26 +128,26 @@ public function testExistingFile() $this->assertSame($expected, $actual); } - public function testMatchesWithPrecedingSlash() + public function testMatchesWithPrecedingSlash(): void { $actual = $this->loader->loadClass(Home::class); $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php'; $this->assertSame($expected, $actual); } - public function testMatchesWithFileExtension() + public function testMatchesWithFileExtension(): void { $actual = $this->loader->loadClass('\App\Controllers\Home.php'); $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php'; $this->assertSame($expected, $actual); } - public function testMissingFile() + public function testMissingFile(): void { $this->assertFalse($this->loader->loadClass('\App\Missing\Classname')); } - public function testAddNamespaceWorks() + public function testAddNamespaceWorks(): void { $this->assertFalse($this->loader->loadClass('My\App\Class')); @@ -159,7 +159,7 @@ public function testAddNamespaceWorks() $this->assertSame($expected, $actual); } - public function testAddNamespaceMultiplePathsWorks() + public function testAddNamespaceMultiplePathsWorks(): void { $this->loader->addNamespace([ 'My\App' => [ @@ -177,7 +177,7 @@ public function testAddNamespaceMultiplePathsWorks() $this->assertSame($expected, $actual); } - public function testAddNamespaceStringToArray() + public function testAddNamespaceStringToArray(): void { $this->loader->addNamespace('App\Controllers', __DIR__); @@ -187,7 +187,7 @@ public function testAddNamespaceStringToArray() ); } - public function testGetNamespaceGivesArray() + public function testGetNamespaceGivesArray(): void { $this->assertSame([ 'App' => [APPPATH], @@ -198,7 +198,7 @@ public function testGetNamespaceGivesArray() $this->assertSame([], $this->loader->getNamespace('Foo')); } - public function testRemoveNamespace() + public function testRemoveNamespace(): void { $this->loader->addNamespace('My\App', __DIR__); $this->assertSame(__FILE__, $this->loader->loadClass('My\App\AutoloaderTest')); @@ -207,12 +207,12 @@ public function testRemoveNamespace() $this->assertFalse((bool) $this->loader->loadClass('My\App\AutoloaderTest')); } - public function testloadClassNonNamespaced() + public function testloadClassNonNamespaced(): void { $this->assertFalse($this->loader->loadClass('Modules')); } - public function testSanitizationContailsSpecialChars() + public function testSanitizationContailsSpecialChars(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage( @@ -224,7 +224,7 @@ public function testSanitizationContailsSpecialChars() $this->loader->sanitizeFilename($test); } - public function testSanitizationFilenameEdges() + public function testSanitizationFilenameEdges(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage( @@ -236,7 +236,7 @@ public function testSanitizationFilenameEdges() $this->loader->sanitizeFilename($test); } - public function testSanitizationRegexError() + public function testSanitizationRegexError(): void { $this->expectException(RuntimeException::class); @@ -245,21 +245,21 @@ public function testSanitizationRegexError() $this->loader->sanitizeFilename($test); } - public function testSanitizationAllowUnicodeChars() + public function testSanitizationAllowUnicodeChars(): void { $test = 'Ä/path/to/some/file.php'; $this->assertSame($test, $this->loader->sanitizeFilename($test)); } - public function testSanitizationAllowsWindowsFilepaths() + public function testSanitizationAllowsWindowsFilepaths(): void { $test = 'C:\path\to\some/file.php'; $this->assertSame($test, $this->loader->sanitizeFilename($test)); } - public function testFindsComposerRoutes() + public function testFindsComposerRoutes(): void { $config = new Autoload(); $modules = new Modules(); @@ -272,7 +272,7 @@ public function testFindsComposerRoutes() $this->assertArrayHasKey('Laminas\\Escaper', $namespaces); } - public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4() + public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4(): void { $config = new Autoload(); $config->psr4 = [ @@ -289,7 +289,7 @@ public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4() $this->assertStringContainsString(VENDORPATH, $namespaces['Psr\Log'][1]); } - public function testComposerPackagesOnly() + public function testComposerPackagesOnly(): void { $config = new Autoload(); $config->psr4 = []; @@ -306,7 +306,7 @@ public function testComposerPackagesOnly() $this->assertStringContainsString(VENDORPATH, $namespaces['Laminas\Escaper'][0]); } - public function testComposerPackagesExclude() + public function testComposerPackagesExclude(): void { $config = new Autoload(); $config->psr4 = []; @@ -328,7 +328,7 @@ public function testComposerPackagesExclude() $this->assertArrayNotHasKey('Laminas\\Escaper', $namespaces); } - public function testComposerPackagesOnlyAndExclude() + public function testComposerPackagesOnlyAndExclude(): void { $this->expectException(ConfigException::class); $this->expectExceptionMessage('Cannot use "only" and "exclude" at the same time in "Config\Modules::$composerPackages".'); @@ -346,7 +346,7 @@ public function testComposerPackagesOnlyAndExclude() $loader->initialize($config, $modules); } - public function testFindsComposerRoutesWithComposerPathNotFound() + public function testFindsComposerRoutesWithComposerPathNotFound(): void { $composerPath = COMPOSER_PATH; diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php index fc5f56a66d3b..1cf32cfa5ad1 100644 --- a/tests/system/Autoloader/FileLocatorTest.php +++ b/tests/system/Autoloader/FileLocatorTest.php @@ -51,7 +51,7 @@ protected function setUp(): void $this->locator = new FileLocator($autoloader); } - public function testLocateFileNotNamespacedFindsInAppDirectory() + public function testLocateFileNotNamespacedFindsInAppDirectory(): void { $file = 'Controllers/Home'; // not namespaced @@ -60,14 +60,14 @@ public function testLocateFileNotNamespacedFindsInAppDirectory() $this->assertSame($expected, $this->locator->locateFile($file)); } - public function testLocateFileNotNamespacedNotFound() + public function testLocateFileNotNamespacedNotFound(): void { $file = 'Unknown'; // not namespaced $this->assertFalse($this->locator->locateFile($file)); } - public function testLocateFileNotNamespacedFindsWithFolderInAppDirectory() + public function testLocateFileNotNamespacedFindsWithFolderInAppDirectory(): void { $file = 'welcome_message'; // not namespaced @@ -76,7 +76,7 @@ public function testLocateFileNotNamespacedFindsWithFolderInAppDirectory() $this->assertSame($expected, $this->locator->locateFile($file, 'Views')); } - public function testLocateFileNotNamespacedFindesWithoutFolderInAppDirectory() + public function testLocateFileNotNamespacedFindesWithoutFolderInAppDirectory(): void { $file = 'Common'; // not namespaced @@ -85,7 +85,7 @@ public function testLocateFileNotNamespacedFindesWithoutFolderInAppDirectory() $this->assertSame($expected, $this->locator->locateFile($file)); } - public function testLocateFileNotNamespacedWorksInNestedAppDirectory() + public function testLocateFileNotNamespacedWorksInNestedAppDirectory(): void { $file = 'Controllers/Home'; // not namespaced @@ -95,7 +95,7 @@ public function testLocateFileNotNamespacedWorksInNestedAppDirectory() $this->assertSame($expected, $this->locator->locateFile($file, 'Controllers')); } - public function testLocateFileWithFolderNameInFile() + public function testLocateFileWithFolderNameInFile(): void { $file = '\App\Views/errors/html/error_404.php'; @@ -105,7 +105,7 @@ public function testLocateFileWithFolderNameInFile() $this->assertSame($expected, $this->locator->locateFile($file, 'Views')); } - public function testLocateFileNotNamespacedWithFolderNameInFile() + public function testLocateFileNotNamespacedWithFolderNameInFile(): void { $file = 'Views/welcome_message.php'; // not namespaced @@ -115,7 +115,7 @@ public function testLocateFileNotNamespacedWithFolderNameInFile() $this->assertSame($expected, $this->locator->locateFile($file, 'Views')); } - public function testLocateFileCanFindNamespacedView() + public function testLocateFileCanFindNamespacedView(): void { $file = '\Errors\error_404'; @@ -125,7 +125,7 @@ public function testLocateFileCanFindNamespacedView() $this->assertSame($expected, $this->locator->locateFile($file, 'html')); } - public function testLocateFileCanFindNestedNamespacedView() + public function testLocateFileCanFindNestedNamespacedView(): void { $file = '\Errors\html/error_404'; @@ -134,7 +134,7 @@ public function testLocateFileCanFindNestedNamespacedView() $this->assertSame($expected, $this->locator->locateFile($file, 'html')); } - public function testLocateFileCanFindNamespacedViewWhenVendorHasTwoNamespaces() + public function testLocateFileCanFindNamespacedViewWhenVendorHasTwoNamespaces(): void { $file = '\CodeIgniter\Devkit\View\Views/simple'; @@ -143,21 +143,21 @@ public function testLocateFileCanFindNamespacedViewWhenVendorHasTwoNamespaces() $this->assertSame($expected, $this->locator->locateFile($file, 'Views')); } - public function testLocateFileNotFoundExistingNamespace() + public function testLocateFileNotFoundExistingNamespace(): void { $file = '\App\Views/unexistence-file.php'; $this->assertFalse($this->locator->locateFile($file, 'Views')); } - public function testLocateFileNotFoundWithBadNamespace() + public function testLocateFileNotFoundWithBadNamespace(): void { $file = '\Blogger\admin/posts.php'; $this->assertFalse($this->locator->locateFile($file, 'Views')); } - public function testLocateFileWithProperNamespace() + public function testLocateFileWithProperNamespace(): void { $file = 'Acme\SampleProject\View\Views\simple'; @@ -166,7 +166,7 @@ public function testLocateFileWithProperNamespace() $this->assertSame($expected, $this->locator->locateFile($file, 'Views')); } - public function testSearchSimple() + public function testSearchSimple(): void { $expected = APPPATH . 'Config/App.php'; @@ -175,7 +175,7 @@ public function testSearchSimple() $this->assertSame($expected, $foundFiles[0]); } - public function testSearchWithFileExtension() + public function testSearchWithFileExtension(): void { $expected = APPPATH . 'Config/App.php'; @@ -184,7 +184,7 @@ public function testSearchWithFileExtension() $this->assertSame($expected, $foundFiles[0]); } - public function testSearchWithMultipleFilesFound() + public function testSearchWithMultipleFilesFound(): void { $foundFiles = $this->locator->search('index', 'html'); @@ -195,14 +195,14 @@ public function testSearchWithMultipleFilesFound() $this->assertContains($expected, $foundFiles); } - public function testSearchForFileNotExist() + public function testSearchForFileNotExist(): void { $foundFiles = $this->locator->search('Views/Fake.html'); $this->assertArrayNotHasKey(0, $foundFiles); } - public function testSearchPrioritizeSystemOverApp() + public function testSearchPrioritizeSystemOverApp(): void { $foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false); @@ -215,12 +215,12 @@ public function testSearchPrioritizeSystemOverApp() ); } - public function testListNamespaceFilesEmptyPrefixAndPath() + public function testListNamespaceFilesEmptyPrefixAndPath(): void { $this->assertEmpty($this->locator->listNamespaceFiles('', '')); } - public function testListFilesSimple() + public function testListFilesSimple(): void { $files = $this->locator->listFiles('Config/'); @@ -229,7 +229,7 @@ public function testListFilesSimple() $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true)); } - public function testListFilesDoesNotContainDirectories() + public function testListFilesDoesNotContainDirectories(): void { $files = $this->locator->listFiles('Config/'); @@ -241,14 +241,14 @@ public function testListFilesDoesNotContainDirectories() $this->assertNotContains($directory, $files); } - public function testListFilesWithFileAsInput() + public function testListFilesWithFileAsInput(): void { $files = $this->locator->listFiles('Config/App.php'); $this->assertEmpty($files); } - public function testListFilesFromMultipleDir() + public function testListFilesFromMultipleDir(): void { $files = $this->locator->listFiles('Filters/'); @@ -261,21 +261,21 @@ public function testListFilesFromMultipleDir() $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true)); } - public function testListFilesWithPathNotExist() + public function testListFilesWithPathNotExist(): void { $files = $this->locator->listFiles('Fake/'); $this->assertEmpty($files); } - public function testListFilesWithoutPath() + public function testListFilesWithoutPath(): void { $files = $this->locator->listFiles(''); $this->assertEmpty($files); } - public function testFindQNameFromPathSimple() + public function testFindQNameFromPathSimple(): void { $ClassName = $this->locator->findQualifiedNameFromPath(SYSTEMPATH . 'HTTP/Header.php'); $expected = '\\' . Header::class; @@ -283,21 +283,21 @@ public function testFindQNameFromPathSimple() $this->assertSame($expected, $ClassName); } - public function testFindQNameFromPathWithFileNotExist() + public function testFindQNameFromPathWithFileNotExist(): void { $ClassName = $this->locator->findQualifiedNameFromPath('modules/blog/Views/index.php'); $this->assertFalse($ClassName); } - public function testFindQNameFromPathWithoutCorrespondingNamespace() + public function testFindQNameFromPathWithoutCorrespondingNamespace(): void { $ClassName = $this->locator->findQualifiedNameFromPath('/etc/hosts'); $this->assertFalse($ClassName); } - public function testGetClassNameFromClassFile() + public function testGetClassNameFromClassFile(): void { $this->assertSame( self::class, @@ -305,7 +305,7 @@ public function testGetClassNameFromClassFile() ); } - public function testGetClassNameFromNonClassFile() + public function testGetClassNameFromNonClassFile(): void { $this->assertSame( '', diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 3068328aa9a8..e02db8d97515 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -26,21 +26,21 @@ final class CLITest extends CIUnitTestCase { use StreamFilterTrait; - public function testNew() + public function testNew(): void { $actual = new CLI(); $this->assertInstanceOf(CLI::class, $actual); } - public function testBeep() + public function testBeep(): void { $this->expectOutputString("\x07"); CLI::beep(); } - public function testBeep4() + public function testBeep4(): void { $this->expectOutputString("\x07\x07\x07\x07"); @@ -53,7 +53,7 @@ public function testBeep4() * * @timeLimit 2.5 */ - public function testWait() + public function testWait(): void { $time = time(); CLI::wait(1, true); @@ -64,7 +64,7 @@ public function testWait() $this->assertCloseEnough(1, time() - $time); } - public function testWaitZero() + public function testWaitZero(): void { PhpStreamWrapper::register(); PhpStreamWrapper::setContent(' '); @@ -78,7 +78,7 @@ public function testWaitZero() PhpStreamWrapper::restore(); } - public function testPrompt() + public function testPrompt(): void { PhpStreamWrapper::register(); @@ -92,7 +92,7 @@ public function testPrompt() PhpStreamWrapper::restore(); } - public function testPromptByMultipleKeys() + public function testPromptByMultipleKeys(): void { PhpStreamWrapper::register(); @@ -112,14 +112,14 @@ public function testPromptByMultipleKeys() PhpStreamWrapper::restore(); } - public function testNewLine() + public function testNewLine(): void { $this->expectOutputString(''); CLI::newLine(); } - public function testColorExceptionForeground() + public function testColorExceptionForeground(): void { $this->expectException(RuntimeException::class); $this->expectExceptionMessage('Invalid "foreground" color: "Foreground"'); @@ -127,7 +127,7 @@ public function testColorExceptionForeground() CLI::color('test', 'Foreground'); } - public function testColorExceptionBackground() + public function testColorExceptionBackground(): void { $this->expectException(RuntimeException::class); $this->expectExceptionMessage('Invalid "background" color: "Background"'); @@ -135,7 +135,7 @@ public function testColorExceptionBackground() CLI::color('test', 'white', 'Background'); } - public function testColorSupportOnNoColor() + public function testColorSupportOnNoColor(): void { $nocolor = getenv('NO_COLOR'); putenv('NO_COLOR=1'); @@ -146,7 +146,7 @@ public function testColorSupportOnNoColor() putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR'); } - public function testColorSupportOnHyperTerminals() + public function testColorSupportOnHyperTerminals(): void { $termProgram = getenv('TERM_PROGRAM'); putenv('TERM_PROGRAM=Hyper'); @@ -157,13 +157,13 @@ public function testColorSupportOnHyperTerminals() putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM'); } - public function testStreamSupports() + public function testStreamSupports(): void { $this->assertTrue(CLI::streamSupports('stream_isatty', STDOUT)); $this->assertIsBool(CLI::streamSupports('sapi_windows_vt100_support', STDOUT)); } - public function testColor() + public function testColor(): void { // After the tests on NO_COLOR and TERM_PROGRAM above, // the $isColored variable is rigged. So we reset this. @@ -175,7 +175,7 @@ public function testColor() ); } - public function testColorEmtpyString() + public function testColorEmtpyString(): void { $this->assertSame( '', @@ -183,7 +183,7 @@ public function testColorEmtpyString() ); } - public function testPrint() + public function testPrint(): void { CLI::print('test'); @@ -191,7 +191,7 @@ public function testPrint() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testPrintForeground() + public function testPrintForeground(): void { CLI::print('test', 'red'); @@ -199,7 +199,7 @@ public function testPrintForeground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testPrintBackground() + public function testPrintBackground(): void { CLI::print('test', 'red', 'green'); @@ -207,7 +207,7 @@ public function testPrintBackground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWrite() + public function testWrite(): void { CLI::write('test'); @@ -215,7 +215,7 @@ public function testWrite() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWriteForeground() + public function testWriteForeground(): void { CLI::write('test', 'red'); @@ -223,7 +223,7 @@ public function testWriteForeground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWriteForegroundWithColorBefore() + public function testWriteForegroundWithColorBefore(): void { CLI::write(CLI::color('green', 'green') . ' red', 'red'); @@ -231,7 +231,7 @@ public function testWriteForegroundWithColorBefore() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWriteForegroundWithColorAfter() + public function testWriteForegroundWithColorAfter(): void { CLI::write('red ' . CLI::color('green', 'green'), 'red'); @@ -242,7 +242,7 @@ public function testWriteForegroundWithColorAfter() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5892 */ - public function testWriteForegroundWithColorTwice() + public function testWriteForegroundWithColorTwice(): void { CLI::write( CLI::color('green', 'green') . ' red ' . CLI::color('green', 'green'), @@ -253,7 +253,7 @@ public function testWriteForegroundWithColorTwice() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWriteBackground() + public function testWriteBackground(): void { CLI::write('test', 'red', 'green'); @@ -261,7 +261,7 @@ public function testWriteBackground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testError() + public function testError(): void { CLI::error('test'); @@ -270,7 +270,7 @@ public function testError() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testErrorForeground() + public function testErrorForeground(): void { CLI::error('test', 'purple'); @@ -278,7 +278,7 @@ public function testErrorForeground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testErrorBackground() + public function testErrorBackground(): void { CLI::error('test', 'purple', 'green'); @@ -286,7 +286,7 @@ public function testErrorBackground() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testShowProgress() + public function testShowProgress(): void { CLI::write('first.'); CLI::showProgress(1, 20); @@ -312,7 +312,7 @@ public function testShowProgress() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testShowProgressWithoutBar() + public function testShowProgressWithoutBar(): void { CLI::write('first.'); CLI::showProgress(false, 20); @@ -323,7 +323,7 @@ public function testShowProgressWithoutBar() $this->assertSame($expected, $this->getStreamFilterBuffer()); } - public function testWrap() + public function testWrap(): void { $this->assertSame('', CLI::wrap('')); $this->assertSame( @@ -340,7 +340,7 @@ public function testWrap() ); } - public function testParseCommand() + public function testParseCommand(): void { $_SERVER['argv'] = [ 'ignored', @@ -359,7 +359,7 @@ public function testParseCommand() $this->assertSame(['b', 'c'], CLI::getSegments()); } - public function testParseCommandMixed() + public function testParseCommandMixed(): void { $_SERVER['argv'] = [ 'ignored', @@ -388,7 +388,7 @@ public function testParseCommandMixed() $this->assertSame('--parm pvalue --fix --opt-in sure', CLI::getOptionString(true, true)); } - public function testParseCommandOption() + public function testParseCommandOption(): void { $_SERVER['argv'] = [ 'ignored', @@ -410,7 +410,7 @@ public function testParseCommandOption() $this->assertSame(['b', 'c', 'd'], CLI::getSegments()); } - public function testParseCommandMultipleOptions() + public function testParseCommandMultipleOptions(): void { $_SERVER['argv'] = [ 'ignored', @@ -434,7 +434,7 @@ public function testParseCommandMultipleOptions() $this->assertSame(['b', 'c', 'd'], CLI::getSegments()); } - public function testWindow() + public function testWindow(): void { $height = new ReflectionProperty(CLI::class, 'height'); $height->setAccessible(true); @@ -456,7 +456,7 @@ public function testWindow() * @param array $thead * @param array $expected */ - public function testTable($tbody, $thead, $expected) + public function testTable($tbody, $thead, $expected): void { CLI::table($tbody, $thead); @@ -548,7 +548,7 @@ public function tableProvider(): iterable ]; } - public function testStrlen() + public function testStrlen(): void { $this->assertSame(18, mb_strlen(CLI::color('success', 'green'))); $this->assertSame(7, CLI::strlen(CLI::color('success', 'green'))); diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php index ec1198287906..78bc5415b8ed 100644 --- a/tests/system/CLI/ConsoleTest.php +++ b/tests/system/CLI/ConsoleTest.php @@ -45,7 +45,7 @@ protected function setUp(): void $this->app->initialize(); } - public function testHeader() + public function testHeader(): void { $console = new Console(); $console->showHeader(); @@ -58,14 +58,14 @@ public function testHeader() ); } - public function testNoHeader() + public function testNoHeader(): void { $console = new Console(); $console->showHeader(true); $this->assertSame('', $this->getStreamFilterBuffer()); } - public function testRun() + public function testRun(): void { $this->initCLI(); @@ -77,7 +77,7 @@ public function testRun() $this->assertStringContainsString('Displays basic usage information.', $this->getStreamFilterBuffer()); } - public function testBadCommand() + public function testBadCommand(): void { $this->initCLI('bogus'); @@ -88,7 +88,7 @@ public function testBadCommand() $this->assertStringContainsString('Command "bogus" not found', $this->getStreamFilterBuffer()); } - public function testHelpCommandDetails() + public function testHelpCommandDetails(): void { $this->initCLI('help', 'session:migration'); @@ -101,7 +101,7 @@ public function testHelpCommandDetails() $this->assertStringContainsString('Options:', $this->getStreamFilterBuffer()); } - public function testHelpCommandUsingHelpOption() + public function testHelpCommandUsingHelpOption(): void { $this->initCLI('env', '--help'); @@ -114,7 +114,7 @@ public function testHelpCommandUsingHelpOption() ); } - public function testHelpOptionIsOnlyPassed() + public function testHelpOptionIsOnlyPassed(): void { $this->initCLI('--help'); @@ -125,7 +125,7 @@ public function testHelpOptionIsOnlyPassed() $this->assertStringContainsString('Lists the available commands.', $this->getStreamFilterBuffer()); } - public function testHelpArgumentAndHelpOptionCombined() + public function testHelpArgumentAndHelpOptionCombined(): void { $this->initCLI('help', '--help'); diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php index 3b1288c157bd..1ca778b28faa 100644 --- a/tests/system/Cache/CacheFactoryTest.php +++ b/tests/system/Cache/CacheFactoryTest.php @@ -46,12 +46,12 @@ protected function tearDown(): void } } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(CacheFactory::class, $this->cacheFactory); } - public function testGetHandlerExceptionCacheInvalidHandlers() + public function testGetHandlerExceptionCacheInvalidHandlers(): void { $this->expectException(CacheException::class); $this->expectExceptionMessage('Cache config must have an array of $validHandlers.'); @@ -61,7 +61,7 @@ public function testGetHandlerExceptionCacheInvalidHandlers() $this->cacheFactory->getHandler($this->config); } - public function testGetHandlerExceptionCacheHandlerNotFound() + public function testGetHandlerExceptionCacheHandlerNotFound(): void { $this->expectException(CacheException::class); $this->expectExceptionMessage('Cache config has an invalid handler or backup handler specified.'); @@ -71,7 +71,7 @@ public function testGetHandlerExceptionCacheHandlerNotFound() $this->cacheFactory->getHandler($this->config); } - public function testGetDummyHandler() + public function testGetDummyHandler(): void { if (! is_dir($this->config->storePath)) { mkdir($this->config->storePath, 0555, true); @@ -86,7 +86,7 @@ public function testGetDummyHandler() $this->config->storePath .= self::$directory; } - public function testHandlesBadHandler() + public function testHandlesBadHandler(): void { if (! is_dir($this->config->storePath)) { mkdir($this->config->storePath, 0555, true); diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php index 492bef9264b8..72a901aa36aa 100644 --- a/tests/system/Cache/CacheMockTest.php +++ b/tests/system/Cache/CacheMockTest.php @@ -22,7 +22,7 @@ */ final class CacheMockTest extends CIUnitTestCase { - public function testMockReturnsMockCacheClass() + public function testMockReturnsMockCacheClass(): void { $this->assertInstanceOf(BaseHandler::class, service('cache')); @@ -31,7 +31,7 @@ public function testMockReturnsMockCacheClass() $this->assertInstanceOf(MockCache::class, service('cache')); } - public function testMockCaching() + public function testMockCaching(): void { $mock = mock(CacheFactory::class); diff --git a/tests/system/Cache/Handlers/AbstractHandlerTest.php b/tests/system/Cache/Handlers/AbstractHandlerTest.php index e426e02eb3c5..fbb27971628e 100644 --- a/tests/system/Cache/Handlers/AbstractHandlerTest.php +++ b/tests/system/Cache/Handlers/AbstractHandlerTest.php @@ -25,12 +25,12 @@ abstract class AbstractHandlerTest extends CIUnitTestCase protected static $key3 = 'key3'; protected static $dummy = 'dymmy'; - public function testGetMetaDataMiss() + public function testGetMetaDataMiss(): void { $this->assertNull($this->handler->getMetaData(self::$dummy)); } - public function testGetMetaData() + public function testGetMetaData(): void { $time = Time::now()->getTimestamp(); $this->handler->save(self::$key1, 'value'); diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php index ba1dd0b2491f..2e835760e9e4 100644 --- a/tests/system/Cache/Handlers/BaseHandlerTest.php +++ b/tests/system/Cache/Handlers/BaseHandlerTest.php @@ -27,7 +27,7 @@ final class BaseHandlerTest extends CIUnitTestCase * * @param mixed $input */ - public function testValidateKeyInvalidType($input) + public function testValidateKeyInvalidType($input): void { $this->expectException('InvalidArgumentException'); $this->expectExceptionMessage('Cache key must be a string'); @@ -46,7 +46,7 @@ public function invalidTypeProvider(): iterable ]; } - public function testValidateKeyUsesConfig() + public function testValidateKeyUsesConfig(): void { config('Cache')->reservedCharacters = 'b'; @@ -56,7 +56,7 @@ public function testValidateKeyUsesConfig() BaseHandler::validateKey('banana'); } - public function testValidateKeySuccess() + public function testValidateKeySuccess(): void { $string = 'banana'; $result = BaseHandler::validateKey($string); @@ -64,7 +64,7 @@ public function testValidateKeySuccess() $this->assertSame($string, $result); } - public function testValidateKeySuccessWithPrefix() + public function testValidateKeySuccessWithPrefix(): void { $string = 'banana'; $result = BaseHandler::validateKey($string, 'prefix'); @@ -72,7 +72,7 @@ public function testValidateKeySuccessWithPrefix() $this->assertSame('prefix' . $string, $result); } - public function testValidateExcessiveLength() + public function testValidateExcessiveLength(): void { $string = 'MoreThanTenCharacters'; $expected = md5($string); @@ -82,7 +82,7 @@ public function testValidateExcessiveLength() $this->assertSame($expected, $result); } - public function testValidateExcessiveLengthWithPrefix() + public function testValidateExcessiveLengthWithPrefix(): void { $string = 'MoreThanTenCharacters'; $expected = 'prefix' . md5($string); diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php index 71ca66a907d0..79dfda094acf 100644 --- a/tests/system/Cache/Handlers/DummyHandlerTest.php +++ b/tests/system/Cache/Handlers/DummyHandlerTest.php @@ -28,64 +28,64 @@ protected function setUp(): void $this->handler->initialize(); } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(DummyHandler::class, $this->handler); } - public function testGet() + public function testGet(): void { $this->assertNull($this->handler->get('key')); } - public function testRemember() + public function testRemember(): void { $dummyHandler = $this->handler->remember('key', 2, static fn () => 'value'); $this->assertNull($dummyHandler); } - public function testSave() + public function testSave(): void { $this->assertTrue($this->handler->save('key', 'value')); } - public function testDelete() + public function testDelete(): void { $this->assertTrue($this->handler->delete('key')); } - public function testDeleteMatching() + public function testDeleteMatching(): void { $this->assertSame(0, $this->handler->deleteMatching('key*')); } - public function testIncrement() + public function testIncrement(): void { $this->assertTrue($this->handler->increment('key')); } - public function testDecrement() + public function testDecrement(): void { $this->assertTrue($this->handler->decrement('key')); } - public function testClean() + public function testClean(): void { $this->assertTrue($this->handler->clean()); } - public function testGetCacheInfo() + public function testGetCacheInfo(): void { $this->assertNull($this->handler->getCacheInfo()); } - public function testGetMetaData() + public function testGetMetaData(): void { $this->assertNull($this->handler->getMetaData('key')); } - public function testIsSupported() + public function testIsSupported(): void { $this->assertTrue($this->handler->isSupported()); } diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index 6f5e6b82f8c5..db8387b8c9cf 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -73,7 +73,7 @@ protected function tearDown(): void } } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(FileHandler::class, $this->handler); } @@ -83,7 +83,7 @@ public function testNew() * * @requires OS Linux|Darwin */ - public function testNewWithNonWritablePath() + public function testNewWithNonWritablePath(): void { $this->expectException(CacheException::class); @@ -91,7 +91,7 @@ public function testNewWithNonWritablePath() new FileHandler($this->config); } - public function testSetDefaultPath() + public function testSetDefaultPath(): void { // Initialize path $config = new Cache(); @@ -109,7 +109,7 @@ public function testSetDefaultPath() * * @timeLimit 3.5 */ - public function testGet() + public function testGet(): void { $this->handler->save(self::$key1, 'value', 2); @@ -126,7 +126,7 @@ public function testGet() * * @timeLimit 3.5 */ - public function testRemember() + public function testRemember(): void { $this->handler->remember(self::$key1, 2, static fn () => 'value'); @@ -142,7 +142,7 @@ public function testRemember() * * @requires OS Linux|Darwin */ - public function testSave() + public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); @@ -150,7 +150,7 @@ public function testSave() $this->assertFalse($this->handler->save(self::$key2, 'value')); } - public function testSaveExcessiveKeyLength() + public function testSaveExcessiveKeyLength(): void { $key = str_repeat('a', 260); $file = $this->config->file['storePath'] . DIRECTORY_SEPARATOR . md5($key); @@ -161,7 +161,7 @@ public function testSaveExcessiveKeyLength() unlink($file); } - public function testSavePermanent() + public function testSavePermanent(): void { $this->assertTrue($this->handler->save(self::$key1, 'value', 0)); $metaData = $this->handler->getMetaData(self::$key1); @@ -173,7 +173,7 @@ public function testSavePermanent() $this->assertTrue($this->handler->delete(self::$key1)); } - public function testDelete() + public function testDelete(): void { $this->handler->save(self::$key1, 'value'); @@ -181,7 +181,7 @@ public function testDelete() $this->assertFalse($this->handler->delete(self::$dummy)); } - public function testDeleteMatchingPrefix() + public function testDeleteMatchingPrefix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -202,7 +202,7 @@ public function testDeleteMatchingPrefix() $this->handler->clean(); } - public function testDeleteMatchingSuffix() + public function testDeleteMatchingSuffix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -223,7 +223,7 @@ public function testDeleteMatchingSuffix() $this->handler->clean(); } - public function testIncrement() + public function testIncrement(): void { $this->handler->save(self::$key1, 1); $this->handler->save(self::$key2, 'value'); @@ -233,7 +233,7 @@ public function testIncrement() $this->assertSame(10, $this->handler->increment(self::$key3, 10)); } - public function testDecrement() + public function testDecrement(): void { $this->handler->save(self::$key1, 10); $this->handler->save(self::$key2, 'value'); @@ -246,7 +246,7 @@ public function testDecrement() $this->assertSame(-1, $this->handler->decrement(self::$key3, 1)); } - public function testClean() + public function testClean(): void { $this->handler->save(self::$key1, 1); $this->handler->save(self::$key2, 'value'); @@ -257,7 +257,7 @@ public function testClean() $this->handler->save(self::$key2, 'value'); } - public function testGetCacheInfo() + public function testGetCacheInfo(): void { $this->handler->save(self::$key1, 'value'); @@ -267,7 +267,7 @@ public function testGetCacheInfo() $this->assertArrayHasKey('server_path', $actual[self::$key1]); } - public function testIsSupported() + public function testIsSupported(): void { $this->assertTrue($this->handler->isSupported()); } @@ -318,7 +318,7 @@ public function modeProvider(): iterable ]; } - public function testFileHandler() + public function testFileHandler(): void { $fileHandler = new BaseTestFileHandler(); @@ -333,7 +333,7 @@ public function testFileHandler() $this->assertArrayHasKey('fileperms', $actual); } - public function testGetMetaDataMiss() + public function testGetMetaDataMiss(): void { $this->assertFalse($this->handler->getMetaData(self::$dummy)); } diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index 24465af9e7de..986507d3e180 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -56,7 +56,7 @@ protected function tearDown(): void } } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(MemcachedHandler::class, $this->handler); } @@ -67,7 +67,7 @@ public function testNew() * * @timeLimit 3.5 */ - public function testGet() + public function testGet(): void { $this->handler->save(self::$key1, 'value', 2); @@ -84,7 +84,7 @@ public function testGet() * * @timeLimit 3.5 */ - public function testRemember() + public function testRemember(): void { $this->handler->remember(self::$key1, 2, static fn () => 'value'); @@ -95,12 +95,12 @@ public function testRemember() $this->assertNull($this->handler->get(self::$key1)); } - public function testSave() + public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); } - public function testSavePermanent() + public function testSavePermanent(): void { $this->assertTrue($this->handler->save(self::$key1, 'value', 0)); $metaData = $this->handler->getMetaData(self::$key1); @@ -112,7 +112,7 @@ public function testSavePermanent() $this->assertTrue($this->handler->delete(self::$key1)); } - public function testDelete() + public function testDelete(): void { $this->handler->save(self::$key1, 'value'); @@ -120,7 +120,7 @@ public function testDelete() $this->assertFalse($this->handler->delete(self::$dummy)); } - public function testDeleteMatching() + public function testDeleteMatching(): void { // Not implemented for Memcached, should throw an exception $this->expectException(Exception::class); @@ -128,7 +128,7 @@ public function testDeleteMatching() $this->handler->deleteMatching('key*'); } - public function testIncrement() + public function testIncrement(): void { $this->handler->save(self::$key1, 1); @@ -147,7 +147,7 @@ public function testIncrement() $this->assertSame(10, $memcachedHandler->increment(self::$key3, 10)); } - public function testDecrement() + public function testDecrement(): void { $this->handler->save(self::$key1, 10); @@ -166,7 +166,7 @@ public function testDecrement() $this->assertSame(1, $memcachedHandler->decrement(self::$key3, 1)); } - public function testClean() + public function testClean(): void { $this->handler->save(self::$key1, 1); $this->handler->save(self::$key2, 'value'); @@ -174,19 +174,19 @@ public function testClean() $this->assertTrue($this->handler->clean()); } - public function testGetCacheInfo() + public function testGetCacheInfo(): void { $this->handler->save(self::$key1, 'value'); $this->assertIsArray($this->handler->getCacheInfo()); } - public function testIsSupported() + public function testIsSupported(): void { $this->assertTrue($this->handler->isSupported()); } - public function testGetMetaDataMiss() + public function testGetMetaDataMiss(): void { $this->assertFalse($this->handler->getMetaData(self::$dummy)); } diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php index 17a43e36263f..e1677ba6a1b0 100644 --- a/tests/system/Cache/Handlers/PredisHandlerTest.php +++ b/tests/system/Cache/Handlers/PredisHandlerTest.php @@ -51,12 +51,12 @@ protected function tearDown(): void } } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(PredisHandler::class, $this->handler); } - public function testDestruct() + public function testDestruct(): void { $this->handler = new PredisHandler($this->config); $this->handler->initialize(); @@ -70,7 +70,7 @@ public function testDestruct() * * @timeLimit 3.5 */ - public function testGet() + public function testGet(): void { $this->handler->save(self::$key1, 'value', 2); @@ -87,7 +87,7 @@ public function testGet() * * @timeLimit 3.5 */ - public function testRemember() + public function testRemember(): void { $this->handler->remember(self::$key1, 2, static fn () => 'value'); @@ -98,12 +98,12 @@ public function testRemember() $this->assertNull($this->handler->get(self::$key1)); } - public function testSave() + public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); } - public function testSavePermanent() + public function testSavePermanent(): void { $this->assertTrue($this->handler->save(self::$key1, 'value', 0)); $metaData = $this->handler->getMetaData(self::$key1); @@ -115,7 +115,7 @@ public function testSavePermanent() $this->assertTrue($this->handler->delete(self::$key1)); } - public function testDelete() + public function testDelete(): void { $this->handler->save(self::$key1, 'value'); @@ -123,7 +123,7 @@ public function testDelete() $this->assertFalse($this->handler->delete(self::$dummy)); } - public function testDeleteMatchingPrefix() + public function testDeleteMatchingPrefix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -141,7 +141,7 @@ public function testDeleteMatchingPrefix() $this->assertSame('88', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']); } - public function testDeleteMatchingSuffix() + public function testDeleteMatchingSuffix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -159,7 +159,7 @@ public function testDeleteMatchingSuffix() $this->assertSame('90', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']); } - public function testClean() + public function testClean(): void { $this->handler->save(self::$key1, 1); $this->handler->save(self::$key2, 'value'); @@ -167,14 +167,14 @@ public function testClean() $this->assertTrue($this->handler->clean()); } - public function testGetCacheInfo() + public function testGetCacheInfo(): void { $this->handler->save(self::$key1, 'value'); $this->assertIsArray($this->handler->getCacheInfo()); } - public function testIsSupported() + public function testIsSupported(): void { $this->assertTrue($this->handler->isSupported()); } diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php index 83a30a0de362..45f35df3f718 100644 --- a/tests/system/Cache/Handlers/RedisHandlerTest.php +++ b/tests/system/Cache/Handlers/RedisHandlerTest.php @@ -55,12 +55,12 @@ protected function tearDown(): void } } - public function testNew() + public function testNew(): void { $this->assertInstanceOf(RedisHandler::class, $this->handler); } - public function testDestruct() + public function testDestruct(): void { $this->handler = new RedisHandler($this->config); $this->handler->initialize(); @@ -74,7 +74,7 @@ public function testDestruct() * * @timeLimit 3.5 */ - public function testGet() + public function testGet(): void { $this->handler->save(self::$key1, 'value', 2); @@ -91,7 +91,7 @@ public function testGet() * * @timeLimit 3.5 */ - public function testRemember() + public function testRemember(): void { $this->handler->remember(self::$key1, 2, static fn () => 'value'); @@ -102,12 +102,12 @@ public function testRemember() $this->assertNull($this->handler->get(self::$key1)); } - public function testSave() + public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); } - public function testSavePermanent() + public function testSavePermanent(): void { $this->assertTrue($this->handler->save(self::$key1, 'value', 0)); $metaData = $this->handler->getMetaData(self::$key1); @@ -119,7 +119,7 @@ public function testSavePermanent() $this->assertTrue($this->handler->delete(self::$key1)); } - public function testDelete() + public function testDelete(): void { $this->handler->save(self::$key1, 'value'); @@ -127,7 +127,7 @@ public function testDelete() $this->assertFalse($this->handler->delete(self::$dummy)); } - public function testDeleteMatchingPrefix() + public function testDeleteMatchingPrefix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -147,7 +147,7 @@ public function testDeleteMatchingPrefix() $this->assertSame('keys=88', $dbInfo[0]); } - public function testDeleteMatchingSuffix() + public function testDeleteMatchingSuffix(): void { // Save 101 items to match on for ($i = 1; $i <= 101; $i++) { @@ -167,7 +167,7 @@ public function testDeleteMatchingSuffix() $this->assertSame('keys=90', $dbInfo[0]); } - public function testIncrementAndDecrement() + public function testIncrementAndDecrement(): void { $this->handler->save('counter', 100); @@ -184,14 +184,14 @@ public function testIncrementAndDecrement() $this->assertSame(140, $this->handler->get('counter')); } - public function testClean() + public function testClean(): void { $this->handler->save(self::$key1, 1); $this->assertTrue($this->handler->clean()); } - public function testGetCacheInfo() + public function testGetCacheInfo(): void { $this->handler->save(self::$key1, 'value'); @@ -208,7 +208,7 @@ public function testGetMetadataNotNull(): void $this->assertIsArray($metadata); } - public function testIsSupported() + public function testIsSupported(): void { $this->assertTrue($this->handler->isSupported()); } diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index ae88e6f2f3a1..a593fb279db3 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -59,7 +59,7 @@ protected function tearDown(): void $this->resetServices(); } - public function testRunEmptyDefaultRoute() + public function testRunEmptyDefaultRoute(): void { $_SERVER['argv'] = ['index.php']; $_SERVER['argc'] = 1; @@ -71,7 +71,7 @@ public function testRunEmptyDefaultRoute() $this->assertStringContainsString('Welcome to CodeIgniter', $output); } - public function testRunEmptyDefaultRouteReturnResponse() + public function testRunEmptyDefaultRouteReturnResponse(): void { $_SERVER['argv'] = ['index.php']; $_SERVER['argc'] = 1; @@ -81,7 +81,7 @@ public function testRunEmptyDefaultRouteReturnResponse() $this->assertStringContainsString('Welcome to CodeIgniter', $response->getBody()); } - public function testRunClosureRoute() + public function testRunClosureRoute(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -90,7 +90,7 @@ public function testRunClosureRoute() // Inject mock router. $routes = Services::routes(); - $routes->add('pages/(:segment)', static function ($segment) { + $routes->add('pages/(:segment)', static function ($segment): void { echo 'You want to see "' . esc($segment) . '" page.'; }); $router = Services::router($routes, Services::incomingrequest()); @@ -103,7 +103,7 @@ public function testRunClosureRoute() $this->assertStringContainsString('You want to see "about" page.', $output); } - public function testRun404Override() + public function testRun404Override(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -122,7 +122,7 @@ public function testRun404Override() $this->assertStringContainsString('Hello', $output); } - public function testRun404OverrideControllerReturnsResponse() + public function testRun404OverrideControllerReturnsResponse(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -141,7 +141,7 @@ public function testRun404OverrideControllerReturnsResponse() $this->assertStringContainsString('Oops', $output); } - public function testRun404OverrideReturnResponse() + public function testRun404OverrideReturnResponse(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -158,7 +158,7 @@ public function testRun404OverrideReturnResponse() $this->assertStringContainsString('Oops', $response->getBody()); } - public function testRun404OverrideByClosure() + public function testRun404OverrideByClosure(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -166,7 +166,7 @@ public function testRun404OverrideByClosure() // Inject mock router. $routes = new RouteCollection(Services::locator(), new Modules()); $routes->setAutoRoute(false); - $routes->set404Override(static function () { + $routes->set404Override(static function (): void { echo '404 Override by Closure.'; }); $router = Services::router($routes, Services::incomingrequest()); @@ -179,7 +179,7 @@ public function testRun404OverrideByClosure() $this->assertStringContainsString('404 Override by Closure.', $output); } - public function testControllersCanReturnString() + public function testControllersCanReturnString(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -199,7 +199,7 @@ public function testControllersCanReturnString() $this->assertStringContainsString('You want to see "about" page.', $output); } - public function testControllersCanReturnResponseObject() + public function testControllersCanReturnResponseObject(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -227,7 +227,7 @@ public function testControllersCanReturnResponseObject() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/6358 */ - public function testControllersCanReturnDownloadResponseObject() + public function testControllersCanReturnDownloadResponseObject(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -251,7 +251,7 @@ public function testControllersCanReturnDownloadResponseObject() $this->assertSame('some text', $output); } - public function testControllersRunFilterByClassName() + public function testControllersRunFilterByClassName(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -274,7 +274,7 @@ public function testControllersRunFilterByClassName() $this->resetServices(); } - public function testDisableControllerFilters() + public function testDisableControllerFilters(): void { $_SERVER['argv'] = ['index.php', 'pages/about']; $_SERVER['argc'] = 2; @@ -301,7 +301,7 @@ public function testDisableControllerFilters() $this->resetServices(); } - public function testResponseConfigEmpty() + public function testResponseConfigEmpty(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -311,7 +311,7 @@ public function testResponseConfigEmpty() $this->assertInstanceOf(Response::class, $response); } - public function testRoutesIsEmpty() + public function testRoutesIsEmpty(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -327,7 +327,7 @@ public function testRoutesIsEmpty() $this->assertStringContainsString('Welcome to CodeIgniter', $output); } - public function testTransfersCorrectHTTPVersion() + public function testTransfersCorrectHTTPVersion(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -343,7 +343,7 @@ public function testTransfersCorrectHTTPVersion() $this->assertSame('2.0', $response->getProtocolVersion()); } - public function testSupportsHttp3() + public function testSupportsHttp3(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -359,7 +359,7 @@ public function testSupportsHttp3() $this->assertSame('3.0', $response->getProtocolVersion()); } - public function testIgnoringErrorSuppressedByAt() + public function testIgnoringErrorSuppressedByAt(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -372,7 +372,7 @@ public function testIgnoringErrorSuppressedByAt() $this->assertStringContainsString('Welcome to CodeIgniter', $output); } - public function testRunForceSecure() + public function testRunForceSecure(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -397,7 +397,7 @@ public function testRunForceSecure() $this->assertSame('https://example.com/', $response->header('Location')->getValue()); } - public function testRunRedirectionWithNamed() + public function testRunRedirectionWithNamed(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -406,7 +406,7 @@ public function testRunRedirectionWithNamed() // Inject mock router. $routes = Services::routes(); - $routes->add('pages/named', static function () { + $routes->add('pages/named', static function (): void { }, ['as' => 'name']); $routes->addRedirect('example', 'name'); @@ -420,7 +420,7 @@ public function testRunRedirectionWithNamed() $this->assertSame('http://example.com/pages/named', $response->header('Location')->getValue()); } - public function testRunRedirectionWithURI() + public function testRunRedirectionWithURI(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -429,7 +429,7 @@ public function testRunRedirectionWithURI() // Inject mock router. $routes = Services::routes(); - $routes->add('pages/uri', static function () { + $routes->add('pages/uri', static function (): void { }); $routes->addRedirect('example', 'pages/uri'); @@ -446,7 +446,7 @@ public function testRunRedirectionWithURI() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/3041 */ - public function testRunRedirectionWithGET() + public function testRunRedirectionWithGET(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -472,7 +472,7 @@ public function testRunRedirectionWithGET() $this->assertSame(302, $response->getStatusCode()); } - public function testRunRedirectionWithGETAndHTTPCode301() + public function testRunRedirectionWithGETAndHTTPCode301(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -496,7 +496,7 @@ public function testRunRedirectionWithGETAndHTTPCode301() $this->assertSame(301, $response->getStatusCode()); } - public function testRunRedirectionWithPOSTAndHTTPCode301() + public function testRunRedirectionWithPOSTAndHTTPCode301(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -520,7 +520,7 @@ public function testRunRedirectionWithPOSTAndHTTPCode301() $this->assertSame(301, $response->getStatusCode()); } - public function testStoresPreviousURL() + public function testStoresPreviousURL(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -537,7 +537,7 @@ public function testStoresPreviousURL() $this->assertSame('http://example.com/index.php', $_SESSION['_ci_previous_url']); } - public function testNotStoresPreviousURL() + public function testNotStoresPreviousURL(): void { $_SERVER['argv'] = ['index.php', 'example']; $_SERVER['argc'] = 2; @@ -560,7 +560,7 @@ public function testNotStoresPreviousURL() $this->assertArrayNotHasKey('_ci_previous_url', $_SESSION); } - public function testNotStoresPreviousURLByCheckingContentType() + public function testNotStoresPreviousURLByCheckingContentType(): void { $_SERVER['argv'] = ['index.php', 'image']; $_SERVER['argc'] = 2; @@ -589,7 +589,7 @@ public function testNotStoresPreviousURLByCheckingContentType() * Can't use static::tearDownAfterClass. This will cause a buffer exception * need improve */ - public function testRunDefaultRoute() + public function testRunDefaultRoute(): void { $_SERVER['argv'] = ['index.php', '/']; $_SERVER['argc'] = 2; @@ -601,7 +601,7 @@ public function testRunDefaultRoute() $this->assertStringContainsString('Welcome to CodeIgniter', $output); } - public function testRunCLIRoute() + public function testRunCLIRoute(): void { $_SERVER['argv'] = ['index.php', 'cli']; $_SERVER['argc'] = 2; @@ -620,7 +620,7 @@ public function testRunCLIRoute() $this->assertStringContainsString('Method Not Allowed', $output); } - public function testSpoofRequestMethodCanUsePUT() + public function testSpoofRequestMethodCanUsePUT(): void { $_SERVER['argv'] = ['index.php']; $_SERVER['argc'] = 1; @@ -644,7 +644,7 @@ public function testSpoofRequestMethodCanUsePUT() $this->assertSame('put', Services::incomingrequest()->getMethod()); } - public function testSpoofRequestMethodCannotUseGET() + public function testSpoofRequestMethodCannotUseGET(): void { $_SERVER['argv'] = ['index.php']; $_SERVER['argc'] = 1; @@ -671,7 +671,7 @@ public function testSpoofRequestMethodCannotUseGET() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/6281 */ - public function testPageCacheSendSecureHeaders() + public function testPageCacheSendSecureHeaders(): void { // Suppress command() output CITestStreamFilter::registration(); @@ -735,7 +735,7 @@ public function testPageCacheSendSecureHeaders() * * @see https://github.com/codeigniter4/CodeIgniter4/pull/6410 */ - public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $expectedPagesInCache, array $testingUrls) + public function testPageCacheWithCacheQueryString($cacheQueryStringValue, int $expectedPagesInCache, array $testingUrls): void { // Suppress command() output CITestStreamFilter::registration(); diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php index 068a8d832924..c486edb55679 100644 --- a/tests/system/Commands/BaseCommandTest.php +++ b/tests/system/Commands/BaseCommandTest.php @@ -31,28 +31,28 @@ protected function setUp(): void $this->logger = Services::logger(); } - public function testMagicIssetTrue() + public function testMagicIssetTrue(): void { $command = new AppInfo($this->logger, service('commands')); $this->assertTrue(isset($command->group)); } - public function testMagicIssetFalse() + public function testMagicIssetFalse(): void { $command = new AppInfo($this->logger, service('commands')); $this->assertFalse(isset($command->foobar)); } - public function testMagicGet() + public function testMagicGet(): void { $command = new AppInfo($this->logger, service('commands')); $this->assertSame('demo', $command->group); } - public function testMagicGetMissing() + public function testMagicGetMissing(): void { $command = new AppInfo($this->logger, service('commands')); diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php index 1ada8b55f3ca..52afbfabd4d1 100644 --- a/tests/system/Commands/ClearCacheTest.php +++ b/tests/system/Commands/ClearCacheTest.php @@ -33,14 +33,14 @@ protected function setUp(): void Services::injectMock('cache', CacheFactory::getHandler(config('Cache'))); } - public function testClearCacheInvalidHandler() + public function testClearCacheInvalidHandler(): void { command('cache:clear junk'); $this->assertStringContainsString('junk is not a valid cache handler.', $this->getStreamFilterBuffer()); } - public function testClearCacheWorks() + public function testClearCacheWorks(): void { cache()->save('foo', 'bar'); $this->assertSame('bar', cache('foo')); diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php index 4a398e4f4016..b8f6fa13e535 100644 --- a/tests/system/Commands/ClearDebugbarTest.php +++ b/tests/system/Commands/ClearDebugbarTest.php @@ -32,7 +32,7 @@ protected function setUp(): void $this->time = time(); } - protected function createDummyDebugbarJson() + protected function createDummyDebugbarJson(): void { $time = $this->time; $path = WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$time}.json"; @@ -46,7 +46,7 @@ protected function createDummyDebugbarJson() } } - public function testClearDebugbarWorks() + public function testClearDebugbarWorks(): void { // test clean debugbar dir $this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json"); diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php index daeb0461acec..406393020343 100644 --- a/tests/system/Commands/ClearLogsTest.php +++ b/tests/system/Commands/ClearLogsTest.php @@ -34,7 +34,7 @@ protected function setUp(): void $this->date = date('Y-m-d', strtotime('+1 year')); } - protected function createDummyLogFiles() + protected function createDummyLogFiles(): void { $date = $this->date; $path = WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$date}.log"; @@ -49,7 +49,7 @@ protected function createDummyLogFiles() } } - public function testClearLogsWorks() + public function testClearLogsWorks(): void { // test clean logs dir $this->assertFileDoesNotExist(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log"); diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php index d72ba1b36aab..64ab5a21d2d9 100644 --- a/tests/system/Commands/CommandGeneratorTest.php +++ b/tests/system/Commands/CommandGeneratorTest.php @@ -46,7 +46,7 @@ protected function getFileContents(string $filepath): string return file_get_contents($filepath) ?: ''; } - public function testGenerateCommand() + public function testGenerateCommand(): void { command('make:command deliver'); $file = APPPATH . 'Commands/Deliver.php'; @@ -56,7 +56,7 @@ public function testGenerateCommand() $this->assertStringContainsString('protected $name = \'command:name\';', $contents); } - public function testGenerateCommandWithOptionCommand() + public function testGenerateCommandWithOptionCommand(): void { command('make:command deliver -command clear:sessions'); $file = APPPATH . 'Commands/Deliver.php'; @@ -66,7 +66,7 @@ public function testGenerateCommandWithOptionCommand() $this->assertStringContainsString('protected $usage = \'clear:sessions [arguments] [options]\';', $contents); } - public function testGenerateCommandWithOptionTypeBasic() + public function testGenerateCommandWithOptionTypeBasic(): void { command('make:command deliver -type basic'); $file = APPPATH . 'Commands/Deliver.php'; @@ -76,7 +76,7 @@ public function testGenerateCommandWithOptionTypeBasic() $this->assertStringContainsString('protected $name = \'command:name\';', $contents); } - public function testGenerateCommandWithOptionTypeGenerator() + public function testGenerateCommandWithOptionTypeGenerator(): void { command('make:command deliver -type generator'); $file = APPPATH . 'Commands/Deliver.php'; @@ -86,7 +86,7 @@ public function testGenerateCommandWithOptionTypeGenerator() $this->assertStringContainsString('protected $name = \'command:name\';', $contents); } - public function testGenerateCommandWithOptionGroup() + public function testGenerateCommandWithOptionGroup(): void { command('make:command deliver -group Deliverables'); $file = APPPATH . 'Commands/Deliver.php'; @@ -97,7 +97,7 @@ public function testGenerateCommandWithOptionGroup() $this->assertStringContainsString('protected $group = \'Deliverables\';', $contents); } - public function testGenerateCommandWithOptionSuffix() + public function testGenerateCommandWithOptionSuffix(): void { command('make:command publish -suffix'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php index 1101e08ef5b6..90da337c11a0 100644 --- a/tests/system/Commands/CommandTest.php +++ b/tests/system/Commands/CommandTest.php @@ -45,7 +45,7 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - public function testListCommands() + public function testListCommands(): void { command('list'); @@ -54,7 +54,7 @@ public function testListCommands() $this->assertStringContainsString('Displays basic usage information.', $this->getBuffer()); } - public function testListCommandsSimple() + public function testListCommandsSimple(): void { command('list --simple'); @@ -62,13 +62,13 @@ public function testListCommandsSimple() $this->assertStringNotContainsString('Lists the available commands.', $this->getBuffer()); } - public function testCustomCommand() + public function testCustomCommand(): void { command('app:info'); $this->assertStringContainsString('CI Version:', $this->getBuffer()); } - public function testShowError() + public function testShowError(): void { command('app:info'); $commands = $this->commands->getCommands(); @@ -78,7 +78,7 @@ public function testShowError() $this->assertStringContainsString('Displays basic usage information.', $this->getBuffer()); } - public function testCommandCall() + public function testCommandCall(): void { command('app:info'); $commands = $this->commands->getCommands(); @@ -88,13 +88,13 @@ public function testCommandCall() $this->assertStringContainsString('Invalid "background" color:', $this->getBuffer()); } - public function testAbstractCommand() + public function testAbstractCommand(): void { command('app:pablo'); $this->assertStringContainsString('not found', $this->getBuffer()); } - public function testNamespacesCommand() + public function testNamespacesCommand(): void { command('namespaces'); @@ -103,13 +103,13 @@ public function testNamespacesCommand() $this->assertStringContainsString('| Yes', $this->getBuffer()); } - public function testInexistentCommandWithNoAlternatives() + public function testInexistentCommandWithNoAlternatives(): void { command('app:oops'); $this->assertStringContainsString('Command "app:oops" not found', $this->getBuffer()); } - public function testInexistentCommandsButWithOneAlternative() + public function testInexistentCommandsButWithOneAlternative(): void { command('namespace'); @@ -118,7 +118,7 @@ public function testInexistentCommandsButWithOneAlternative() $this->assertStringContainsString('namespaces', $this->getBuffer()); } - public function testInexistentCommandsButWithManyAlternatives() + public function testInexistentCommandsButWithManyAlternatives(): void { command('clear'); @@ -130,7 +130,7 @@ public function testInexistentCommandsButWithManyAlternatives() /** * @dataProvider commandArgsProvider */ - public function testCommandParsesArgsCorrectly(string $input, array $expected) + public function testCommandParsesArgsCorrectly(string $input, array $expected): void { ParamsReveal::$args = null; command($input); diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php index 08ad58a25d9c..f4036a24e65e 100644 --- a/tests/system/Commands/ConfigGeneratorTest.php +++ b/tests/system/Commands/ConfigGeneratorTest.php @@ -32,13 +32,13 @@ protected function tearDown(): void } } - public function testGenerateConfig() + public function testGenerateConfig(): void { command('make:config auth'); $this->assertFileExists(APPPATH . 'Config/Auth.php'); } - public function testGenerateConfigWithOptionSuffix() + public function testGenerateConfigWithOptionSuffix(): void { command('make:config auth -suffix'); $this->assertFileExists(APPPATH . 'Config/AuthConfig.php'); diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php index 6e98a73cd62c..0bc5b9498c17 100644 --- a/tests/system/Commands/ConfigurableSortImportsTest.php +++ b/tests/system/Commands/ConfigurableSortImportsTest.php @@ -23,7 +23,7 @@ final class ConfigurableSortImportsTest extends CIUnitTestCase { use StreamFilterTrait; - public function testPublishLanguageWithoutOptions() + public function testPublishLanguageWithoutOptions(): void { command('publish:language'); @@ -36,7 +36,7 @@ public function testPublishLanguageWithoutOptions() } } - public function testEnabledSortImportsWillDisruptLanguageFilePublish() + public function testEnabledSortImportsWillDisruptLanguageFilePublish(): void { command('publish:language --lang es'); @@ -53,7 +53,7 @@ public function testEnabledSortImportsWillDisruptLanguageFilePublish() } } - public function testDisabledSortImportsWillNotAffectLanguageFilesPublish() + public function testDisabledSortImportsWillNotAffectLanguageFilesPublish(): void { command('publish:language --lang ar --sort off'); diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php index 9ff4d027b45c..9567280f1d34 100644 --- a/tests/system/Commands/ControllerGeneratorTest.php +++ b/tests/system/Commands/ControllerGeneratorTest.php @@ -41,7 +41,7 @@ protected function getFileContents(string $filepath): string return file_get_contents($filepath) ?: ''; } - public function testGenerateController() + public function testGenerateController(): void { command('make:controller user'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -50,7 +50,7 @@ public function testGenerateController() $this->assertStringContainsString('extends BaseController', $this->getFileContents($file)); } - public function testGenerateControllerWithOptionBare() + public function testGenerateControllerWithOptionBare(): void { command('make:controller blog -bare'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -59,7 +59,7 @@ public function testGenerateControllerWithOptionBare() $this->assertStringContainsString('extends Controller', $this->getFileContents($file)); } - public function testGenerateControllerWithOptionRestful() + public function testGenerateControllerWithOptionRestful(): void { command('make:controller order -restful'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -68,7 +68,7 @@ public function testGenerateControllerWithOptionRestful() $this->assertStringContainsString('extends ResourceController', $this->getFileContents($file)); } - public function testGenerateControllerWithOptionRestfulPresenter() + public function testGenerateControllerWithOptionRestfulPresenter(): void { command('make:controller pay -restful presenter'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -77,7 +77,7 @@ public function testGenerateControllerWithOptionRestfulPresenter() $this->assertStringContainsString('extends ResourcePresenter', $this->getFileContents($file)); } - public function testGenerateControllerWithOptionSuffix() + public function testGenerateControllerWithOptionSuffix(): void { command('make:controller dashboard -suffix'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php index 7ee07a2d936d..a1468f1184dc 100644 --- a/tests/system/Commands/CreateDatabaseTest.php +++ b/tests/system/Commands/CreateDatabaseTest.php @@ -67,7 +67,7 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - public function testCreateDatabase() + public function testCreateDatabase(): void { if ($this->connection instanceof OCI8Connection) { $this->markTestSkipped('Needs to run on non-OCI8 drivers.'); @@ -77,7 +77,7 @@ public function testCreateDatabase() $this->assertStringContainsString('successfully created.', $this->getBuffer()); } - public function testSqliteDatabaseDuplicated() + public function testSqliteDatabaseDuplicated(): void { if (! $this->connection instanceof SQLite3Connection) { $this->markTestSkipped('Needs to run on SQLite3.'); @@ -90,7 +90,7 @@ public function testSqliteDatabaseDuplicated() $this->assertStringContainsString('already exists.', $this->getBuffer()); } - public function testOtherDriverDuplicatedDatabase() + public function testOtherDriverDuplicatedDatabase(): void { if ($this->connection instanceof SQLite3Connection || $this->connection instanceof OCI8Connection) { $this->markTestSkipped('Needs to run on non-SQLite3 and non-OCI8 drivers.'); diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php index 9d025d38517b..f0832f429efd 100644 --- a/tests/system/Commands/DatabaseCommandsTest.php +++ b/tests/system/Commands/DatabaseCommandsTest.php @@ -40,7 +40,7 @@ protected function clearBuffer(): void $this->resetStreamFilterBuffer(); } - public function testMigrate() + public function testMigrate(): void { command('migrate --all'); $this->assertStringContainsString('Migrations complete.', $this->getBuffer()); @@ -51,7 +51,7 @@ public function testMigrate() $this->assertStringContainsString('Migrations complete.', $this->getBuffer()); } - public function testMigrateRollback() + public function testMigrateRollback(): void { command('migrate --all -g tests'); $this->clearBuffer(); @@ -60,7 +60,7 @@ public function testMigrateRollback() $this->assertStringContainsString('Done rolling back migrations.', $this->getBuffer()); } - public function testMigrateRefresh() + public function testMigrateRefresh(): void { command('migrate --all'); $this->clearBuffer(); @@ -69,7 +69,7 @@ public function testMigrateRefresh() $this->assertStringContainsString('Migrations complete.', $this->getBuffer()); } - public function testMigrateStatus() + public function testMigrateStatus(): void { command('migrate --all'); $this->clearBuffer(); @@ -80,7 +80,7 @@ public function testMigrateStatus() $this->assertStringContainsString('Filename', $this->getBuffer()); } - public function testSeed() + public function testSeed(): void { command('migrate --all'); $this->clearBuffer(); diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php index 5d14ddfeaf06..47146b027056 100644 --- a/tests/system/Commands/EntityGeneratorTest.php +++ b/tests/system/Commands/EntityGeneratorTest.php @@ -36,13 +36,13 @@ protected function tearDown(): void } } - public function testGenerateEntity() + public function testGenerateEntity(): void { command('make:entity user'); $this->assertFileExists(APPPATH . 'Entities/User.php'); } - public function testGenerateEntityWithOptionSuffix() + public function testGenerateEntityWithOptionSuffix(): void { command('make:entity user -suffix'); $this->assertFileExists(APPPATH . 'Entities/UserEntity.php'); diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php index 84c796ecb669..4b7a4a473dfa 100644 --- a/tests/system/Commands/EnvironmentCommandTest.php +++ b/tests/system/Commands/EnvironmentCommandTest.php @@ -72,7 +72,7 @@ public function testProvidingUnknownEnvGivesErrorMessage(): void $this->assertStringContainsString('Invalid environment type "foobar".', $this->getStreamFilterBuffer()); } - public function testDefaultShippedEnvIsMissing() + public function testDefaultShippedEnvIsMissing(): void { rename(ROOTPATH . 'env', ROOTPATH . 'lostenv'); command('env development'); diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php index 4959afb0826c..a0b74099f818 100644 --- a/tests/system/Commands/FilterCheckTest.php +++ b/tests/system/Commands/FilterCheckTest.php @@ -40,7 +40,7 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - public function testFilterCheckDefinedRoute() + public function testFilterCheckDefinedRoute(): void { command('filter:check get /'); @@ -50,7 +50,7 @@ public function testFilterCheckDefinedRoute() ); } - public function testFilterCheckInvalidRoute() + public function testFilterCheckInvalidRoute(): void { command('filter:check put product/123'); diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php index 148c7031ce3e..7f697e21c9dc 100644 --- a/tests/system/Commands/FilterGeneratorTest.php +++ b/tests/system/Commands/FilterGeneratorTest.php @@ -32,13 +32,13 @@ protected function tearDown(): void } } - public function testGenerateFilter() + public function testGenerateFilter(): void { command('make:filter admin'); $this->assertFileExists(APPPATH . 'Filters/Admin.php'); } - public function testGenerateFilterWithOptionSuffix() + public function testGenerateFilterWithOptionSuffix(): void { command('make:filter admin -suffix'); $this->assertFileExists(APPPATH . 'Filters/AdminFilter.php'); diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php index 6c313e648cff..dd0f8bc91f0a 100644 --- a/tests/system/Commands/GenerateKeyTest.php +++ b/tests/system/Commands/GenerateKeyTest.php @@ -62,13 +62,13 @@ protected function getBuffer(): string return $this->getStreamFilterBuffer(); } - protected function resetEnvironment() + protected function resetEnvironment(): void { putenv('encryption.key'); unset($_ENV['encryption.key'], $_SERVER['encryption.key']); } - public function testGenerateKeyShowsEncodedKey() + public function testGenerateKeyShowsEncodedKey(): void { command('key:generate --show'); $this->assertStringContainsString('hex2bin:', $this->getBuffer()); @@ -84,7 +84,7 @@ public function testGenerateKeyShowsEncodedKey() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testGenerateKeyCreatesNewKey() + public function testGenerateKeyCreatesNewKey(): void { command('key:generate'); $this->assertStringContainsString('successfully set.', $this->getBuffer()); @@ -102,7 +102,7 @@ public function testGenerateKeyCreatesNewKey() $this->assertStringContainsString('hex2bin:', file_get_contents($this->envPath)); } - public function testDefaultShippedEnvIsMissing() + public function testDefaultShippedEnvIsMissing(): void { rename(ROOTPATH . 'env', ROOTPATH . 'lostenv'); command('key:generate'); @@ -115,7 +115,7 @@ public function testDefaultShippedEnvIsMissing() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/6838 */ - public function testKeyGenerateWhenKeyIsMissingInDotEnvFile() + public function testKeyGenerateWhenKeyIsMissingInDotEnvFile(): void { file_put_contents($this->envPath, ''); @@ -125,7 +125,7 @@ public function testKeyGenerateWhenKeyIsMissingInDotEnvFile() $this->assertSame("\nencryption.key = " . env('encryption.key'), file_get_contents($this->envPath)); } - public function testKeyGenerateWhenNewHexKeyIsSubsequentlyCommentedOut() + public function testKeyGenerateWhenNewHexKeyIsSubsequentlyCommentedOut(): void { command('key:generate'); $key = env('encryption.key', ''); @@ -143,7 +143,7 @@ public function testKeyGenerateWhenNewHexKeyIsSubsequentlyCommentedOut() $this->assertNotSame($key, env('encryption.key', $key), 'Failed replacing the commented out key.'); } - public function testKeyGenerateWhenNewBase64KeyIsSubsequentlyCommentedOut() + public function testKeyGenerateWhenNewBase64KeyIsSubsequentlyCommentedOut(): void { command('key:generate --prefix base64'); $key = env('encryption.key', ''); diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php index d02fd2eea78b..2e5162b074a8 100644 --- a/tests/system/Commands/GeneratorsTest.php +++ b/tests/system/Commands/GeneratorsTest.php @@ -23,7 +23,7 @@ final class GeneratorsTest extends CIUnitTestCase { use StreamFilterTrait; - public function testGenerateFileCreated() + public function testGenerateFileCreated(): void { command('make:seeder categories'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -33,7 +33,7 @@ public function testGenerateFileCreated() } } - public function testGenerateFileExists() + public function testGenerateFileExists(): void { command('make:filter items'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -46,7 +46,7 @@ public function testGenerateFileExists() } } - public function testGenerateFileOverwritten() + public function testGenerateFileOverwritten(): void { command('make:controller products'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -59,7 +59,7 @@ public function testGenerateFileOverwritten() } } - public function testGenerateFileFailsOnUnwritableDirectory() + public function testGenerateFileFailsOnUnwritableDirectory(): void { if (is_windows()) { $this->markTestSkipped('chmod does not work as expected on Windows'); @@ -73,13 +73,13 @@ public function testGenerateFileFailsOnUnwritableDirectory() chmod(APPPATH . 'Filters', 0755); } - public function testGenerateFailsOnUndefinedNamespace() + public function testGenerateFailsOnUndefinedNamespace(): void { command('make:model cars -namespace CodeIgnite'); $this->assertStringContainsString('Namespace "CodeIgnite" is not defined.', $this->getStreamFilterBuffer()); } - public function testGenerateFileInSubfolders() + public function testGenerateFileInSubfolders(): void { command('make:controller admin/user'); $file = APPPATH . 'Controllers/Admin/User.php'; diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php index 3b56b3c92130..c51a286e5bbf 100644 --- a/tests/system/Commands/HelpCommandTest.php +++ b/tests/system/Commands/HelpCommandTest.php @@ -28,7 +28,7 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - public function testHelpCommand() + public function testHelpCommand(): void { command('help'); @@ -37,25 +37,25 @@ public function testHelpCommand() $this->assertStringContainsString('command_name', $this->getBuffer()); } - public function testHelpCommandWithMissingUsage() + public function testHelpCommandWithMissingUsage(): void { command('help app:info'); $this->assertStringContainsString('app:info [arguments]', $this->getBuffer()); } - public function testHelpCommandOnSpecificCommand() + public function testHelpCommandOnSpecificCommand(): void { command('help cache:clear'); $this->assertStringContainsString('Clears the current system caches.', $this->getBuffer()); } - public function testHelpCommandOnInexistentCommand() + public function testHelpCommandOnInexistentCommand(): void { command('help fixme'); $this->assertStringContainsString('Command "fixme" not found', $this->getBuffer()); } - public function testHelpCommandOnInexistentCommandButWithAlternatives() + public function testHelpCommandOnInexistentCommandButWithAlternatives(): void { command('help clear'); $this->assertStringContainsString('Command "clear" not found.', $this->getBuffer()); diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php index 91312a6e36cd..fc0337087b3a 100644 --- a/tests/system/Commands/InfoCacheTest.php +++ b/tests/system/Commands/InfoCacheTest.php @@ -44,7 +44,7 @@ protected function getBuffer() return $this->getStreamFilterBuffer(); } - public function testInfoCacheErrorsOnInvalidHandler() + public function testInfoCacheErrorsOnInvalidHandler(): void { config('Cache')->handler = 'redis'; cache()->save('foo', 'bar'); @@ -53,7 +53,7 @@ public function testInfoCacheErrorsOnInvalidHandler() $this->assertStringContainsString('This command only supports the file cache handler.', $this->getBuffer()); } - public function testInfoCacheCanSeeFoo() + public function testInfoCacheCanSeeFoo(): void { cache()->save('foo', 'bar'); command('cache:info'); @@ -61,7 +61,7 @@ public function testInfoCacheCanSeeFoo() $this->assertStringContainsString('foo', $this->getBuffer()); } - public function testInfoCacheCanSeeTable() + public function testInfoCacheCanSeeTable(): void { command('cache:info'); @@ -71,7 +71,7 @@ public function testInfoCacheCanSeeTable() $this->assertStringContainsString('Date', $this->getBuffer()); } - public function testInfoCacheCannotSeeFoo() + public function testInfoCacheCannotSeeFoo(): void { cache()->delete('foo'); command('cache:info'); diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php index b07c69726791..890c36c56fe7 100644 --- a/tests/system/Commands/MigrationGeneratorTest.php +++ b/tests/system/Commands/MigrationGeneratorTest.php @@ -32,25 +32,25 @@ protected function tearDown(): void } } - public function testGenerateMigration() + public function testGenerateMigration(): void { command('make:migration database'); $this->assertStringContainsString('_Database.php', $this->getStreamFilterBuffer()); } - public function testGenerateMigrationWithOptionSession() + public function testGenerateMigrationWithOptionSession(): void { command('make:migration -session'); $this->assertStringContainsString('_CreateCiSessionsTable.php', $this->getStreamFilterBuffer()); } - public function testGenerateMigrationWithOptionTable() + public function testGenerateMigrationWithOptionTable(): void { command('make:migration -session -table logger'); $this->assertStringContainsString('_CreateLoggerTable.php', $this->getStreamFilterBuffer()); } - public function testGenerateMigrationWithOptionSuffix() + public function testGenerateMigrationWithOptionSuffix(): void { command('make:migration database -suffix'); $this->assertStringContainsString('_DatabaseMigration.php', $this->getStreamFilterBuffer()); diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php index 0e193d62702c..e6ca050d553b 100644 --- a/tests/system/Commands/ModelGeneratorTest.php +++ b/tests/system/Commands/ModelGeneratorTest.php @@ -44,7 +44,7 @@ private function getFileContent(string $filepath): string return file_get_contents($filepath) ?: ''; } - public function testGenerateModel() + public function testGenerateModel(): void { command('make:model user --table users'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -56,7 +56,7 @@ public function testGenerateModel() $this->assertStringContainsString('protected $returnType = \'array\';', $this->getFileContent($file)); } - public function testGenerateModelWithOptionTable() + public function testGenerateModelWithOptionTable(): void { command('make:model cars -table utilisateur'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -65,7 +65,7 @@ public function testGenerateModelWithOptionTable() $this->assertStringContainsString('protected $table = \'utilisateur\';', $this->getFileContent($file)); } - public function testGenerateModelWithOptionDBGroup() + public function testGenerateModelWithOptionDBGroup(): void { command('make:model user -dbgroup testing'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -74,7 +74,7 @@ public function testGenerateModelWithOptionDBGroup() $this->assertStringContainsString('protected $DBGroup = \'testing\';', $this->getFileContent($file)); } - public function testGenerateModelWithOptionReturnArray() + public function testGenerateModelWithOptionReturnArray(): void { command('make:model user --return array'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -83,7 +83,7 @@ public function testGenerateModelWithOptionReturnArray() $this->assertStringContainsString('protected $returnType = \'array\';', $this->getFileContent($file)); } - public function testGenerateModelWithOptionReturnObject() + public function testGenerateModelWithOptionReturnObject(): void { command('make:model user --return object'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -92,7 +92,7 @@ public function testGenerateModelWithOptionReturnObject() $this->assertStringContainsString('protected $returnType = \'object\';', $this->getFileContent($file)); } - public function testGenerateModelWithOptionReturnEntity() + public function testGenerateModelWithOptionReturnEntity(): void { command('make:model user --return entity'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -118,7 +118,7 @@ public function testGenerateModelWithOptionReturnEntity() } } - public function testGenerateModelWithOptionSuffix() + public function testGenerateModelWithOptionSuffix(): void { command('make:model user --suffix --return entity'); @@ -136,7 +136,7 @@ public function testGenerateModelWithOptionSuffix() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5050 */ - public function testGenerateModelWithSuffixAndMixedPascalCasedName() + public function testGenerateModelWithSuffixAndMixedPascalCasedName(): void { command('make:model MyTable --suffix --return entity'); diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php index a56e7661505a..b176a03c42c5 100644 --- a/tests/system/Commands/PublishCommandTest.php +++ b/tests/system/Commands/PublishCommandTest.php @@ -31,7 +31,7 @@ protected function tearDown(): void TestPublisher::setResult(true); } - public function testDefault() + public function testDefault(): void { command('publish'); @@ -42,7 +42,7 @@ public function testDefault() ]), $this->getStreamFilterBuffer()); } - public function testFailure() + public function testFailure(): void { TestPublisher::setResult(false); diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index bb89d35bb96d..d1625dcfc1bc 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -51,7 +51,7 @@ private function getCleanRoutes(): RouteCollection return $routes; } - public function testRoutesCommand() + public function testRoutesCommand(): void { $this->getCleanRoutes(); @@ -77,7 +77,7 @@ public function testRoutesCommand() $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testRoutesCommandSortByHandler() + public function testRoutesCommandSortByHandler(): void { $this->getCleanRoutes(); @@ -103,7 +103,7 @@ public function testRoutesCommandSortByHandler() $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testRoutesCommandAutoRouteImproved() + public function testRoutesCommandAutoRouteImproved(): void { $routes = $this->getCleanRoutes(); @@ -136,7 +136,7 @@ public function testRoutesCommandAutoRouteImproved() $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testRoutesCommandRouteLegacy() + public function testRoutesCommandRouteLegacy(): void { $routes = $this->getCleanRoutes(); diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php index 113710725143..4caa26fd123f 100644 --- a/tests/system/Commands/ScaffoldGeneratorTest.php +++ b/tests/system/Commands/ScaffoldGeneratorTest.php @@ -43,7 +43,7 @@ protected function getFileContents(string $filepath): string return file_get_contents($filepath) ?: ''; } - public function testCreateComponentProducesManyFiles() + public function testCreateComponentProducesManyFiles(): void { command('make:scaffold people'); @@ -66,7 +66,7 @@ public function testCreateComponentProducesManyFiles() unlink(APPPATH . 'Database/Seeds/People.php'); } - public function testCreateComponentWithManyOptions() + public function testCreateComponentWithManyOptions(): void { command('make:scaffold user -restful -return entity'); @@ -95,7 +95,7 @@ public function testCreateComponentWithManyOptions() unlink(APPPATH . 'Models/User.php'); } - public function testCreateComponentWithOptionSuffix() + public function testCreateComponentWithOptionSuffix(): void { command('make:scaffold order -suffix'); @@ -118,7 +118,7 @@ public function testCreateComponentWithOptionSuffix() unlink(APPPATH . 'Models/OrderModel.php'); } - public function testCreateComponentWithOptionForce() + public function testCreateComponentWithOptionForce(): void { command('make:controller fixer'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); @@ -151,7 +151,7 @@ public function testCreateComponentWithOptionForce() unlink(APPPATH . 'Models/Fixer.php'); } - public function testCreateComponentWithOptionNamespace() + public function testCreateComponentWithOptionNamespace(): void { command('make:scaffold product -namespace App'); diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php index 57586084f402..035168759f52 100644 --- a/tests/system/Commands/SeederGeneratorTest.php +++ b/tests/system/Commands/SeederGeneratorTest.php @@ -34,14 +34,14 @@ protected function tearDown(): void } } - public function testGenerateSeeder() + public function testGenerateSeeder(): void { command('make:seeder cars'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); $this->assertFileExists(APPPATH . 'Database/Seeds/Cars.php'); } - public function testGenerateSeederWithOptionSuffix() + public function testGenerateSeederWithOptionSuffix(): void { command('make:seeder cars -suffix'); $this->assertStringContainsString('File created: ', $this->getStreamFilterBuffer()); diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index 26eabd32895f..755dd70f7cc6 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -47,7 +47,7 @@ protected function getBuffer() }, str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer())); } - public function testNamespacesCommandCodeIgniterOnly() + public function testNamespacesCommandCodeIgniterOnly(): void { command('namespaces -c'); @@ -65,7 +65,7 @@ public function testNamespacesCommandCodeIgniterOnly() $this->assertStringContainsString($expected, $this->getBuffer()); } - public function testNamespacesCommandAllNamespaces() + public function testNamespacesCommandAllNamespaces(): void { command('namespaces'); diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 9279bd47b70c..2db5a603fb95 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -20,7 +20,7 @@ */ final class AutoRouteCollectorTest extends CIUnitTestCase { - public function testGet() + public function testGet(): void { $namespace = 'Tests\Support\Controllers'; $collector = new AutoRouteCollector( diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index 4b99de7dbb07..d9dfee3e98ad 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -52,7 +52,7 @@ private function createAutoRouteCollector(array $filterConfigFilters): AutoRoute ); } - public function testGetFilterMatches() + public function testGetFilterMatches(): void { $filterConfigFilters = ['honeypot' => ['before' => ['newautorouting/save*']]]; $collector = $this->createAutoRouteCollector($filterConfigFilters); @@ -80,7 +80,7 @@ public function testGetFilterMatches() $this->assertSame($expected, $routes); } - public function testGetFilterDoesNotMatch() + public function testGetFilterDoesNotMatch(): void { $filterConfigFilters = ['honeypot' => ['before' => ['newautorouting/save/*/*']]]; $collector = $this->createAutoRouteCollector($filterConfigFilters); diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php index 5df8c4f8ff0d..e3e23c29dc7a 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php @@ -34,7 +34,7 @@ private function createControllerMethodReader( return new ControllerMethodReader($namespace, $methods); } - public function testRead() + public function testRead(): void { $reader = $this->createControllerMethodReader(); @@ -64,7 +64,7 @@ public function testRead() $this->assertSame($expected, $routes); } - public function testReadDefaultController() + public function testReadDefaultController(): void { $reader = $this->createControllerMethodReader( 'CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers' @@ -99,7 +99,7 @@ public function testReadDefaultController() $this->assertSame($expected, $routes); } - public function testReadControllerWithRemap() + public function testReadControllerWithRemap(): void { $reader = $this->createControllerMethodReader(); diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Home.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Home.php index 4666a709a07b..f4836ffc7f6a 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Home.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/Controllers/Home.php @@ -18,18 +18,18 @@ */ class Home extends Controller { - public function getIndex() + public function getIndex(): void { } - public function postIndex() + public function postIndex(): void { } /** * This method cannot be accessible. */ - public function getFoo() + public function getFoo(): void { } } diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php index 32a2bd54ab1c..fecc080d8705 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php @@ -21,7 +21,7 @@ */ final class ControllerFinderTest extends CIUnitTestCase { - public function testFind() + public function testFind(): void { $namespace = 'Tests\Support\Controllers'; $finder = new ControllerFinder($namespace); diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php index ee315135304d..349d814b23c7 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php @@ -22,7 +22,7 @@ */ final class ControllerMethodReaderTest extends CIUnitTestCase { - public function testRead() + public function testRead(): void { $namespace = 'Tests\Support\Controllers'; $reader = new ControllerMethodReader($namespace); @@ -90,7 +90,7 @@ public function testRead() $this->assertSame($expected, $routes); } - public function testReadControllerWithRemap() + public function testReadControllerWithRemap(): void { $namespace = 'Tests\Support\Controllers'; $reader = new ControllerMethodReader($namespace); diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php index ff4df4090c4c..1363d468a49d 100644 --- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php @@ -21,7 +21,7 @@ */ final class FilterCollectorTest extends CIUnitTestCase { - public function testGet() + public function testGet(): void { $routes = Services::routes(); $routes->resetRoutes(); diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php index ace71d9d7e2d..15b970cd4351 100644 --- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php @@ -96,7 +96,7 @@ private function createFilters(array $config = []): Filters return new Filters($filtersConfig, $this->request, $this->response, $this->moduleConfig); } - public function testFindGlobalsFilters() + public function testFindGlobalsFilters(): void { $collection = $this->createRouteCollection(); $router = $this->createRouter($collection); @@ -113,7 +113,7 @@ public function testFindGlobalsFilters() $this->assertSame($expected, $filters); } - public function testFindGlobalsFiltersWithRedirectRoute() + public function testFindGlobalsFiltersWithRedirectRoute(): void { $collection = $this->createRouteCollection(); $collection->addRedirect('users/about', 'profile'); @@ -132,7 +132,7 @@ public function testFindGlobalsFiltersWithRedirectRoute() $this->assertSame($expected, $filters); } - public function testFindGlobalsAndRouteFilters() + public function testFindGlobalsAndRouteFilters(): void { $collection = $this->createRouteCollection(); $collection->get('admin', ' AdminController::index', ['filter' => 'honeypot']); @@ -150,7 +150,7 @@ public function testFindGlobalsAndRouteFilters() $this->assertSame($expected, $filters); } - public function testFindGlobalsAndRouteClassnameFilters() + public function testFindGlobalsAndRouteClassnameFilters(): void { $collection = $this->createRouteCollection(); $collection->get('admin', ' AdminController::index', ['filter' => InvalidChars::class]); @@ -168,7 +168,7 @@ public function testFindGlobalsAndRouteClassnameFilters() $this->assertSame($expected, $filters); } - public function testFindGlobalsAndRouteMultipleFilters() + public function testFindGlobalsAndRouteMultipleFilters(): void { config('Feature')->multipleFilters = true; diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php index fe7bf12613a7..ec4acc47259e 100644 --- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php +++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php @@ -24,7 +24,7 @@ final class SampleURIGeneratorTest extends CIUnitTestCase /** * @dataProvider routeKeyProvider */ - public function testGet(string $routeKey, string $expected) + public function testGet(string $routeKey, string $expected): void { $generator = new SampleURIGenerator(); @@ -44,7 +44,7 @@ public function routeKeyProvider(): iterable ]; } - public function testGetFromPlaceholderCustomPlaceholder() + public function testGetFromPlaceholderCustomPlaceholder(): void { $routes = Services::routes(); $routes->addPlaceholder( diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php index 39c3fd833a5f..ec208179be79 100644 --- a/tests/system/Commands/ValidationGeneratorTest.php +++ b/tests/system/Commands/ValidationGeneratorTest.php @@ -38,13 +38,13 @@ protected function tearDown(): void } } - public function testGenerateValidation() + public function testGenerateValidation(): void { command('make:validation user'); $this->assertFileExists(APPPATH . 'Validation/User.php'); } - public function testGenerateValidationWithOptionSuffix() + public function testGenerateValidationWithOptionSuffix(): void { command('make:validation admin -suffix'); $this->assertFileExists(APPPATH . 'Validation/AdminValidation.php'); diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php index 365049315778..a580366277fb 100644 --- a/tests/system/CommonFunctionsSendTest.php +++ b/tests/system/CommonFunctionsSendTest.php @@ -34,7 +34,7 @@ protected function setUp(): void * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testRedirectResponseCookiesSent() + public function testRedirectResponseCookiesSent(): void { $loginTime = time(); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index b304eeab69eb..8d4f7199d0e1 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -56,7 +56,7 @@ protected function setUp(): void parent::setUp(); } - public function testStringifyAttributes() + public function testStringifyAttributes(): void { $this->assertSame(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar'])); @@ -73,7 +73,7 @@ public function testStringifyAttributes() $this->assertSame('', stringify_attributes([])); } - public function testStringifyJsAttributes() + public function testStringifyJsAttributes(): void { $this->assertSame('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true)); @@ -83,26 +83,26 @@ public function testStringifyJsAttributes() $this->assertSame('width=800,height=600', stringify_attributes($atts, true)); } - public function testEnvReturnsDefault() + public function testEnvReturnsDefault(): void { $this->assertSame('baz', env('foo', 'baz')); } - public function testEnvGetsFromSERVER() + public function testEnvGetsFromSERVER(): void { $_SERVER['foo'] = 'bar'; $this->assertSame('bar', env('foo', 'baz')); } - public function testEnvGetsFromENV() + public function testEnvGetsFromENV(): void { $_ENV['foo'] = 'bar'; $this->assertSame('bar', env('foo', 'baz')); } - public function testEnvBooleans() + public function testEnvBooleans(): void { $_ENV['p1'] = 'true'; $_ENV['p2'] = 'false'; @@ -115,7 +115,7 @@ public function testEnvBooleans() $this->assertNull(env('p4')); } - public function testRedirectReturnsRedirectResponse() + public function testRedirectReturnsRedirectResponse(): void { $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -133,12 +133,12 @@ public function testRedirectReturnsRedirectResponse() $this->assertInstanceOf(RedirectResponse::class, redirect('base')); } - public function testRedirectDefault() + public function testRedirectDefault(): void { $this->assertInstanceOf(RedirectResponse::class, redirect()); } - public function testRequestIncomingRequest() + public function testRequestIncomingRequest(): void { Services::createRequest(new App()); @@ -147,7 +147,7 @@ public function testRequestIncomingRequest() $this->assertInstanceOf(IncomingRequest::class, $request); } - public function testRequestCLIRequest() + public function testRequestCLIRequest(): void { Services::createRequest(new App(), true); @@ -156,19 +156,19 @@ public function testRequestCLIRequest() $this->assertInstanceOf(CLIRequest::class, $request); } - public function testResponse() + public function testResponse(): void { $response = response(); $this->assertInstanceOf(Response::class, $response); } - public function testSolidusElement() + public function testSolidusElement(): void { $this->assertSame('', _solidus()); } - public function testSolidusElementXHTML() + public function testSolidusElementXHTML(): void { $doctypes = config('DocTypes'); $default = $doctypes->html5; @@ -180,7 +180,7 @@ public function testSolidusElementXHTML() $doctypes->html5 = $default; } - public function testView() + public function testView(): void { $data = [ 'testString' => 'bar', @@ -190,7 +190,7 @@ public function testView() $this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple', $data)); } - public function testViewSavedData() + public function testViewSavedData(): void { $data = [ 'testString' => 'bar', @@ -201,26 +201,26 @@ public function testViewSavedData() $this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple')); } - public function testViewCell() + public function testViewCell(): void { $expected = 'Hello'; $this->assertSame($expected, view_cell('\Tests\Support\View\SampleClass::hello')); } - public function testEscapeWithDifferentEncodings() + public function testEscapeWithDifferentEncodings(): void { $this->assertSame('<x', esc('assertSame('<x', esc('assertSame('<x', esc('expectException('InvalidArgumentException'); esc(['width' => '800', 'height' => '600'], 'bogus'); } - public function testEscapeBadContextZero() + public function testEscapeBadContextZero(): void { $this->expectException('InvalidArgumentException'); esc('', 'http://example.com'); @@ -337,7 +337,7 @@ public function testRequestMethodGetsSanitized() $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]); } - public function testRequestSetsBasicCurlOptions() + public function testRequestSetsBasicCurlOptions(): void { $this->request->request('get', 'http://example.com'); @@ -362,7 +362,7 @@ public function testRequestSetsBasicCurlOptions() $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]); } - public function testAuthBasicOption() + public function testAuthBasicOption(): void { $this->request->request('get', 'http://example.com', [ 'auth' => [ @@ -380,7 +380,7 @@ public function testAuthBasicOption() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testAuthBasicOptionExplicit() + public function testAuthBasicOptionExplicit(): void { $this->request->request('get', 'http://example.com', [ 'auth' => [ @@ -399,7 +399,7 @@ public function testAuthBasicOptionExplicit() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testAuthDigestOption() + public function testAuthDigestOption(): void { $output = "HTTP/1.1 401 Unauthorized Server: ddos-guard @@ -439,7 +439,7 @@ public function testAuthDigestOption() $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); } - public function testSetAuthBasic() + public function testSetAuthBasic(): void { $this->request->setAuth('username', 'password')->get('http://example.com'); @@ -452,7 +452,7 @@ public function testSetAuthBasic() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testSetAuthDigest() + public function testSetAuthDigest(): void { $output = "HTTP/1.1 401 Unauthorized Server: ddos-guard @@ -486,7 +486,7 @@ public function testSetAuthDigest() $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); } - public function testCertOption() + public function testCertOption(): void { $file = __FILE__; @@ -500,7 +500,7 @@ public function testCertOption() $this->assertSame($file, $options[CURLOPT_SSLCERT]); } - public function testCertOptionWithPassword() + public function testCertOptionWithPassword(): void { $file = __FILE__; @@ -520,7 +520,7 @@ public function testCertOptionWithPassword() $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]); } - public function testMissingCertOption() + public function testMissingCertOption(): void { $file = 'something_obviously_bogus'; $this->expectException(HTTPException::class); @@ -530,7 +530,7 @@ public function testMissingCertOption() ]); } - public function testSSLVerification() + public function testSSLVerification(): void { $file = __FILE__; @@ -548,7 +548,7 @@ public function testSSLVerification() $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]); } - public function testSSLWithBadKey() + public function testSSLWithBadKey(): void { $file = 'something_obviously_bogus'; $this->expectException(HTTPException::class); @@ -559,7 +559,7 @@ public function testSSLWithBadKey() ]); } - public function testDebugOptionTrue() + public function testDebugOptionTrue(): void { $this->request->request('get', 'http://example.com', [ 'debug' => true, @@ -574,7 +574,7 @@ public function testDebugOptionTrue() $this->assertIsResource($options[CURLOPT_STDERR]); } - public function testDebugOptionFalse() + public function testDebugOptionFalse(): void { $this->request->request('get', 'http://example.com', [ 'debug' => false, @@ -586,7 +586,7 @@ public function testDebugOptionFalse() $this->assertArrayNotHasKey(CURLOPT_STDERR, $options); } - public function testDebugOptionFile() + public function testDebugOptionFile(): void { $file = SUPPORTPATH . 'Files/baker/banana.php'; @@ -603,7 +603,7 @@ public function testDebugOptionFile() $this->assertIsResource($options[CURLOPT_STDERR]); } - public function testDecodeContent() + public function testDecodeContent(): void { $this->request->setHeader('Accept-Encoding', 'cobol'); $this->request->request('get', 'http://example.com', [ @@ -616,7 +616,7 @@ public function testDecodeContent() $this->assertSame('cobol', $options[CURLOPT_ENCODING]); } - public function testDecodeContentWithoutAccept() + public function testDecodeContentWithoutAccept(): void { // $this->request->setHeader('Accept-Encoding', 'cobol'); $this->request->request('get', 'http://example.com', [ @@ -631,7 +631,7 @@ public function testDecodeContentWithoutAccept() $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]); } - public function testAllowRedirectsOptionFalse() + public function testAllowRedirectsOptionFalse(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => false, @@ -646,7 +646,7 @@ public function testAllowRedirectsOptionFalse() $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options); } - public function testAllowRedirectsOptionTrue() + public function testAllowRedirectsOptionTrue(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => true, @@ -663,7 +663,7 @@ public function testAllowRedirectsOptionTrue() $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]); } - public function testAllowRedirectsOptionDefaults() + public function testAllowRedirectsOptionDefaults(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => true, @@ -678,7 +678,7 @@ public function testAllowRedirectsOptionDefaults() $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options); } - public function testAllowRedirectsArray() + public function testAllowRedirectsArray(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => ['max' => 2], @@ -693,7 +693,7 @@ public function testAllowRedirectsArray() $this->assertSame(2, $options[CURLOPT_MAXREDIRS]); } - public function testSendWithQuery() + public function testSendWithQuery(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -710,7 +710,7 @@ public function testSendWithQuery() $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]); } - public function testSendWithDelay() + public function testSendWithDelay(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -723,7 +723,7 @@ public function testSendWithDelay() $this->assertSame(0.1, $request->getDelay()); } - public function testSendContinued() + public function testSendContinued(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -738,7 +738,7 @@ public function testSendContinued() /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261 */ - public function testSendContinuedWithManyHeaders() + public function testSendContinuedWithManyHeaders(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -785,7 +785,7 @@ public function testSendContinuedWithManyHeaders() /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/7394 */ - public function testResponseHeadersWithMultipleRequests() + public function testResponseHeadersWithMultipleRequests(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -838,7 +838,7 @@ public function testResponseHeadersWithMultipleRequests() $this->assertSame(200, $response->getStatusCode()); } - public function testSplitResponse() + public function testSplitResponse(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -850,7 +850,7 @@ public function testSplitResponse() $this->assertSame('Hi there', $response->getBody()); } - public function testApplyBody() + public function testApplyBody(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -865,7 +865,7 @@ public function testApplyBody() $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); } - public function testApplyBodyByOptions() + public function testApplyBodyByOptions(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -881,7 +881,7 @@ public function testApplyBodyByOptions() $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); } - public function testBodyIsResetOnSecondRequest() + public function testBodyIsResetOnSecondRequest(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -896,7 +896,7 @@ public function testBodyIsResetOnSecondRequest() $this->assertArrayNotHasKey(CURLOPT_POSTFIELDS, $request->curl_options); } - public function testResponseHeaders() + public function testResponseHeaders(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -910,7 +910,7 @@ public function testResponseHeaders() $this->assertSame(234, $response->getStatusCode()); } - public function testResponseHeadersShortProtocol() + public function testResponseHeadersShortProtocol(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -924,7 +924,7 @@ public function testResponseHeadersShortProtocol() $this->assertSame(235, $response->getStatusCode()); } - public function testPostFormEncoded() + public function testPostFormEncoded(): void { $params = [ 'foo' => 'bar', @@ -946,7 +946,7 @@ public function testPostFormEncoded() $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]); } - public function testPostFormMultipart() + public function testPostFormMultipart(): void { $params = [ 'foo' => 'bar', @@ -968,7 +968,7 @@ public function testPostFormMultipart() $this->assertSame($params, $options[CURLOPT_POSTFIELDS]); } - public function testSetForm() + public function testSetForm(): void { $params = [ 'foo' => 'bar', @@ -995,7 +995,7 @@ public function testSetForm() ); } - public function testJSONData() + public function testJSONData(): void { $params = [ 'foo' => 'bar', @@ -1017,7 +1017,7 @@ public function testJSONData() ); } - public function testSetJSON() + public function testSetJSON(): void { $params = [ 'foo' => 'bar', @@ -1040,7 +1040,7 @@ public function testSetJSON() ); } - public function testHTTPv1() + public function testHTTPv1(): void { $this->request->request('POST', '/post', [ 'version' => 1.0, @@ -1052,7 +1052,7 @@ public function testHTTPv1() $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]); } - public function testHTTPv11() + public function testHTTPv11(): void { $this->request->request('POST', '/post', [ 'version' => 1.1, @@ -1064,7 +1064,7 @@ public function testHTTPv11() $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]); } - public function testCookieOption() + public function testCookieOption(): void { $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt'; $this->request->request('POST', '/post', [ @@ -1079,7 +1079,7 @@ public function testCookieOption() $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]); } - public function testUserAgentOption() + public function testUserAgentOption(): void { $agent = 'CodeIgniter Framework'; diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index d90b8847cbb6..415032d19628 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -52,7 +52,7 @@ protected function getRequest(array $options = []) /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707 */ - public function testPrepareURLIgnoresAppConfig() + public function testPrepareURLIgnoresAppConfig(): void { config('App')->baseURL = 'http://example.com/fruit/'; @@ -66,7 +66,7 @@ public function testPrepareURLIgnoresAppConfig() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029 */ - public function testGetRemembersBaseURI() + public function testGetRemembersBaseURI(): void { $request = $this->getRequest(['base_uri' => 'http://www.foo.com/api/v1/']); @@ -80,7 +80,7 @@ public function testGetRemembersBaseURI() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029 */ - public function testGetRemembersBaseURIWithHelperMethod() + public function testGetRemembersBaseURIWithHelperMethod(): void { $request = Services::curlrequest(['base_uri' => 'http://www.foo.com/api/v1/']); @@ -89,7 +89,7 @@ public function testGetRemembersBaseURIWithHelperMethod() $this->assertSame('/api/v1/', $uri->getPath()); } - public function testSendReturnsResponse() + public function testSendReturnsResponse(): void { $output = 'Howdy Stranger.'; @@ -99,7 +99,7 @@ public function testSendReturnsResponse() $this->assertSame($output, $response->getBody()); } - public function testGetSetsCorrectMethod() + public function testGetSetsCorrectMethod(): void { $this->request->get('http://example.com'); @@ -111,7 +111,7 @@ public function testGetSetsCorrectMethod() $this->assertSame('GET', $options[CURLOPT_CUSTOMREQUEST]); } - public function testDeleteSetsCorrectMethod() + public function testDeleteSetsCorrectMethod(): void { $this->request->delete('http://example.com'); @@ -123,7 +123,7 @@ public function testDeleteSetsCorrectMethod() $this->assertSame('DELETE', $options[CURLOPT_CUSTOMREQUEST]); } - public function testHeadSetsCorrectMethod() + public function testHeadSetsCorrectMethod(): void { $this->request->head('http://example.com'); @@ -135,7 +135,7 @@ public function testHeadSetsCorrectMethod() $this->assertSame('HEAD', $options[CURLOPT_CUSTOMREQUEST]); } - public function testOptionsSetsCorrectMethod() + public function testOptionsSetsCorrectMethod(): void { $this->request->options('http://example.com'); @@ -147,7 +147,7 @@ public function testOptionsSetsCorrectMethod() $this->assertSame('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]); } - public function testOptionsBaseURIOption() + public function testOptionsBaseURIOption(): void { $options = ['base_uri' => 'http://www.foo.com/api/v1/']; $request = $this->getRequest($options); @@ -155,7 +155,7 @@ public function testOptionsBaseURIOption() $this->assertSame('http://www.foo.com/api/v1/', $request->getBaseURI()->__toString()); } - public function testOptionsBaseURIOverride() + public function testOptionsBaseURIOverride(): void { $options = [ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -166,7 +166,7 @@ public function testOptionsBaseURIOverride() $this->assertSame('http://bogus/com', $request->getBaseURI()->__toString()); } - public function testOptionsHeaders() + public function testOptionsHeaders(): void { $options = [ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -182,7 +182,7 @@ public function testOptionsHeaders() /** * @backupGlobals enabled */ - public function testOptionsHeadersNotUsingPopulate() + public function testOptionsHeadersNotUsingPopulate(): void { $_SERVER['HTTP_HOST'] = 'site1.com'; $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US'; @@ -203,7 +203,7 @@ public function testOptionsHeadersNotUsingPopulate() $this->assertSame('', $request->header('Accept-Encoding')->getValue()); } - public function testOptionsAreSharedBetweenRequests() + public function testOptionsAreSharedBetweenRequests(): void { $options = [ 'form_params' => ['studio' => 1], @@ -227,7 +227,7 @@ public function testOptionsAreSharedBetweenRequests() /** * @backupGlobals enabled */ - public function testHeaderContentLengthNotSharedBetweenClients() + public function testHeaderContentLengthNotSharedBetweenClients(): void { $_SERVER['HTTP_CONTENT_LENGTH'] = '10'; @@ -247,7 +247,7 @@ public function testHeaderContentLengthNotSharedBetweenClients() $this->assertNull($request->header('Content-Length')); } - public function testOptionsDelay() + public function testOptionsDelay(): void { $request = $this->getRequest(); $this->assertSame(0.0, $request->getDelay()); @@ -260,7 +260,7 @@ public function testOptionsDelay() $this->assertSame(2.0, $request->getDelay()); } - public function testPatchSetsCorrectMethod() + public function testPatchSetsCorrectMethod(): void { $this->request->patch('http://example.com'); @@ -272,7 +272,7 @@ public function testPatchSetsCorrectMethod() $this->assertSame('PATCH', $options[CURLOPT_CUSTOMREQUEST]); } - public function testPostSetsCorrectMethod() + public function testPostSetsCorrectMethod(): void { $this->request->post('http://example.com'); @@ -284,7 +284,7 @@ public function testPostSetsCorrectMethod() $this->assertSame('POST', $options[CURLOPT_CUSTOMREQUEST]); } - public function testPutSetsCorrectMethod() + public function testPutSetsCorrectMethod(): void { $this->request->put('http://example.com'); @@ -296,7 +296,7 @@ public function testPutSetsCorrectMethod() $this->assertSame('PUT', $options[CURLOPT_CUSTOMREQUEST]); } - public function testCustomMethodSetsCorrectMethod() + public function testCustomMethodSetsCorrectMethod(): void { $this->request->request('custom', 'http://example.com'); @@ -308,7 +308,7 @@ public function testCustomMethodSetsCorrectMethod() $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]); } - public function testRequestMethodGetsSanitized() + public function testRequestMethodGetsSanitized(): void { $this->request->request('', 'http://example.com'); @@ -320,7 +320,7 @@ public function testRequestMethodGetsSanitized() $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]); } - public function testRequestSetsBasicCurlOptions() + public function testRequestSetsBasicCurlOptions(): void { $this->request->request('get', 'http://example.com'); @@ -345,7 +345,7 @@ public function testRequestSetsBasicCurlOptions() $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]); } - public function testAuthBasicOption() + public function testAuthBasicOption(): void { $this->request->request('get', 'http://example.com', [ 'auth' => [ @@ -363,7 +363,7 @@ public function testAuthBasicOption() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testAuthBasicOptionExplicit() + public function testAuthBasicOptionExplicit(): void { $this->request->request('get', 'http://example.com', [ 'auth' => [ @@ -382,7 +382,7 @@ public function testAuthBasicOptionExplicit() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testAuthDigestOption() + public function testAuthDigestOption(): void { $output = "HTTP/1.1 401 Unauthorized Server: ddos-guard @@ -422,7 +422,7 @@ public function testAuthDigestOption() $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); } - public function testSetAuthBasic() + public function testSetAuthBasic(): void { $this->request->setAuth('username', 'password')->get('http://example.com'); @@ -435,7 +435,7 @@ public function testSetAuthBasic() $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); } - public function testSetAuthDigest() + public function testSetAuthDigest(): void { $output = "HTTP/1.1 401 Unauthorized Server: ddos-guard @@ -469,7 +469,7 @@ public function testSetAuthDigest() $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); } - public function testCertOption() + public function testCertOption(): void { $file = __FILE__; @@ -483,7 +483,7 @@ public function testCertOption() $this->assertSame($file, $options[CURLOPT_SSLCERT]); } - public function testCertOptionWithPassword() + public function testCertOptionWithPassword(): void { $file = __FILE__; @@ -503,7 +503,7 @@ public function testCertOptionWithPassword() $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]); } - public function testMissingCertOption() + public function testMissingCertOption(): void { $file = 'something_obviously_bogus'; $this->expectException(HTTPException::class); @@ -513,7 +513,7 @@ public function testMissingCertOption() ]); } - public function testSSLVerification() + public function testSSLVerification(): void { $file = __FILE__; @@ -531,7 +531,7 @@ public function testSSLVerification() $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]); } - public function testSSLWithBadKey() + public function testSSLWithBadKey(): void { $file = 'something_obviously_bogus'; $this->expectException(HTTPException::class); @@ -542,7 +542,7 @@ public function testSSLWithBadKey() ]); } - public function testDebugOptionTrue() + public function testDebugOptionTrue(): void { $this->request->request('get', 'http://example.com', [ 'debug' => true, @@ -557,7 +557,7 @@ public function testDebugOptionTrue() $this->assertIsResource($options[CURLOPT_STDERR]); } - public function testDebugOptionFalse() + public function testDebugOptionFalse(): void { $this->request->request('get', 'http://example.com', [ 'debug' => false, @@ -569,7 +569,7 @@ public function testDebugOptionFalse() $this->assertArrayNotHasKey(CURLOPT_STDERR, $options); } - public function testDebugOptionFile() + public function testDebugOptionFile(): void { $file = SUPPORTPATH . 'Files/baker/banana.php'; @@ -586,7 +586,7 @@ public function testDebugOptionFile() $this->assertIsResource($options[CURLOPT_STDERR]); } - public function testDecodeContent() + public function testDecodeContent(): void { $this->request->setHeader('Accept-Encoding', 'cobol'); $this->request->request('get', 'http://example.com', [ @@ -599,7 +599,7 @@ public function testDecodeContent() $this->assertSame('cobol', $options[CURLOPT_ENCODING]); } - public function testDecodeContentWithoutAccept() + public function testDecodeContentWithoutAccept(): void { // $this->request->setHeader('Accept-Encoding', 'cobol'); $this->request->request('get', 'http://example.com', [ @@ -614,7 +614,7 @@ public function testDecodeContentWithoutAccept() $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]); } - public function testAllowRedirectsOptionFalse() + public function testAllowRedirectsOptionFalse(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => false, @@ -629,7 +629,7 @@ public function testAllowRedirectsOptionFalse() $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options); } - public function testAllowRedirectsOptionTrue() + public function testAllowRedirectsOptionTrue(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => true, @@ -646,7 +646,7 @@ public function testAllowRedirectsOptionTrue() $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]); } - public function testAllowRedirectsOptionDefaults() + public function testAllowRedirectsOptionDefaults(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => true, @@ -661,7 +661,7 @@ public function testAllowRedirectsOptionDefaults() $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options); } - public function testAllowRedirectsArray() + public function testAllowRedirectsArray(): void { $this->request->request('get', 'http://example.com', [ 'allow_redirects' => ['max' => 2], @@ -676,7 +676,7 @@ public function testAllowRedirectsArray() $this->assertSame(2, $options[CURLOPT_MAXREDIRS]); } - public function testSendWithQuery() + public function testSendWithQuery(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -693,7 +693,7 @@ public function testSendWithQuery() $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]); } - public function testSendWithDelay() + public function testSendWithDelay(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -706,7 +706,7 @@ public function testSendWithDelay() $this->assertSame(0.1, $request->getDelay()); } - public function testSendContinued() + public function testSendContinued(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -721,7 +721,7 @@ public function testSendContinued() /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261 */ - public function testSendContinuedWithManyHeaders() + public function testSendContinuedWithManyHeaders(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -765,7 +765,7 @@ public function testSendContinuedWithManyHeaders() $this->assertSame(200, $response->getStatusCode()); } - public function testSendProxied() + public function testSendProxied(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -783,7 +783,7 @@ public function testSendProxied() /** * See: https://github.com/codeigniter4/CodeIgniter4/issues/7394 */ - public function testResponseHeadersWithMultipleRequests() + public function testResponseHeadersWithMultipleRequests(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -836,7 +836,7 @@ public function testResponseHeadersWithMultipleRequests() $this->assertSame(200, $response->getStatusCode()); } - public function testSplitResponse() + public function testSplitResponse(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -848,7 +848,7 @@ public function testSplitResponse() $this->assertSame('Hi there', $response->getBody()); } - public function testApplyBody() + public function testApplyBody(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -863,7 +863,7 @@ public function testApplyBody() $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); } - public function testApplyBodyByOptions() + public function testApplyBodyByOptions(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -879,7 +879,7 @@ public function testApplyBodyByOptions() $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); } - public function testResponseHeaders() + public function testResponseHeaders(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -893,7 +893,7 @@ public function testResponseHeaders() $this->assertSame(234, $response->getStatusCode()); } - public function testResponseHeadersShortProtocol() + public function testResponseHeadersShortProtocol(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', @@ -907,7 +907,7 @@ public function testResponseHeadersShortProtocol() $this->assertSame(235, $response->getStatusCode()); } - public function testPostFormEncoded() + public function testPostFormEncoded(): void { $params = [ 'foo' => 'bar', @@ -929,7 +929,7 @@ public function testPostFormEncoded() $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]); } - public function testPostFormMultipart() + public function testPostFormMultipart(): void { $params = [ 'foo' => 'bar', @@ -951,7 +951,7 @@ public function testPostFormMultipart() $this->assertSame($params, $options[CURLOPT_POSTFIELDS]); } - public function testSetForm() + public function testSetForm(): void { $params = [ 'foo' => 'bar', @@ -978,7 +978,7 @@ public function testSetForm() ); } - public function testJSONData() + public function testJSONData(): void { $params = [ 'foo' => 'bar', @@ -997,7 +997,7 @@ public function testJSONData() $this->assertSame($expected, $this->request->getBody()); } - public function testSetJSON() + public function testSetJSON(): void { $params = [ 'foo' => 'bar', @@ -1015,7 +1015,7 @@ public function testSetJSON() ); } - public function testHTTPv1() + public function testHTTPv1(): void { $this->request->request('POST', '/post', [ 'version' => 1.0, @@ -1027,7 +1027,7 @@ public function testHTTPv1() $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]); } - public function testHTTPv11() + public function testHTTPv11(): void { $this->request->request('POST', '/post', [ 'version' => 1.1, @@ -1039,7 +1039,7 @@ public function testHTTPv11() $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]); } - public function testHTTPv2() + public function testHTTPv2(): void { $this->request->request('POST', '/post', [ 'version' => 2.0, @@ -1051,7 +1051,7 @@ public function testHTTPv2() $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]); } - public function testCookieOption() + public function testCookieOption(): void { $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt'; $this->request->request('POST', '/post', [ @@ -1066,7 +1066,7 @@ public function testCookieOption() $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]); } - public function testUserAgentOption() + public function testUserAgentOption(): void { $agent = 'CodeIgniter Framework'; diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 4b4d7a1a4975..81fd2d998602 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -32,7 +32,7 @@ final class ContentSecurityPolicyTest extends CIUnitTestCase private ?ContentSecurityPolicy $csp = null; // Having this method as setUp() doesn't work - can't find Config\App !? - protected function prepare(bool $CSPEnabled = true) + protected function prepare(bool $CSPEnabled = true): void { $this->resetServices(); @@ -63,7 +63,7 @@ protected function work(string $parm = 'Hello') * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testExistence() + public function testExistence(): void { $this->prepare(); $this->work(); @@ -75,7 +75,7 @@ public function testExistence() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testReportOnly() + public function testReportOnly(): void { $this->prepare(); $this->csp->reportOnly(false); @@ -88,7 +88,7 @@ public function testReportOnly() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testDefaults() + public function testDefaults(): void { $this->prepare(); @@ -107,7 +107,7 @@ public function testDefaults() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testChildSrc() + public function testChildSrc(): void { $this->prepare(); $this->csp->addChildSrc('evil.com', true); @@ -124,7 +124,7 @@ public function testChildSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testConnectSrc() + public function testConnectSrc(): void { $this->prepare(); $this->csp->reportOnly(true); @@ -140,7 +140,7 @@ public function testConnectSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testFontSrc() + public function testFontSrc(): void { $this->prepare(); $this->csp->reportOnly(true); @@ -158,7 +158,7 @@ public function testFontSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testFormAction() + public function testFormAction(): void { $this->prepare(); $this->csp->reportOnly(true); @@ -176,7 +176,7 @@ public function testFormAction() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testFrameAncestor() + public function testFrameAncestor(): void { $this->prepare(); $this->csp->addFrameAncestor('self'); @@ -193,7 +193,7 @@ public function testFrameAncestor() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testFrameSrc() + public function testFrameSrc(): void { $this->prepare(); $this->csp->addFrameSrc('self'); @@ -210,7 +210,7 @@ public function testFrameSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testImageSrc() + public function testImageSrc(): void { $this->prepare(); $this->csp->addImageSrc('cdn.cloudy.com'); @@ -227,7 +227,7 @@ public function testImageSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testMediaSrc() + public function testMediaSrc(): void { $this->prepare(); $this->csp->addMediaSrc('self'); @@ -244,7 +244,7 @@ public function testMediaSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testManifestSrc() + public function testManifestSrc(): void { $this->prepare(); $this->csp->addManifestSrc('cdn.cloudy.com'); @@ -261,7 +261,7 @@ public function testManifestSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testPluginType() + public function testPluginType(): void { $this->prepare(); $this->csp->addPluginType('self'); @@ -278,7 +278,7 @@ public function testPluginType() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testPluginArray() + public function testPluginArray(): void { $this->prepare(); $this->csp->addPluginType('application/x-shockwave-flash'); @@ -293,7 +293,7 @@ public function testPluginArray() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testObjectSrc() + public function testObjectSrc(): void { $this->prepare(); $this->csp->addObjectSrc('cdn.cloudy.com'); @@ -310,7 +310,7 @@ public function testObjectSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testScriptSrc() + public function testScriptSrc(): void { $this->prepare(); $this->csp->addScriptSrc('cdn.cloudy.com'); @@ -327,7 +327,7 @@ public function testScriptSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testStyleSrc() + public function testStyleSrc(): void { $this->prepare(); $this->csp->addStyleSrc('cdn.cloudy.com'); @@ -344,7 +344,7 @@ public function testStyleSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBaseURIDefault() + public function testBaseURIDefault(): void { $this->prepare(); $result = $this->work(); @@ -357,7 +357,7 @@ public function testBaseURIDefault() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBaseURI() + public function testBaseURI(): void { $this->prepare(); $this->csp->addBaseURI('example.com'); @@ -371,7 +371,7 @@ public function testBaseURI() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBaseURIRich() + public function testBaseURIRich(): void { $this->prepare(); $this->csp->addBaseURI(['self', 'example.com']); @@ -385,7 +385,7 @@ public function testBaseURIRich() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testDefaultSrc() + public function testDefaultSrc(): void { $this->prepare(); $this->csp->reportOnly(false); @@ -401,7 +401,7 @@ public function testDefaultSrc() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testReportURI() + public function testReportURI(): void { $this->prepare(); $this->csp->reportOnly(false); @@ -416,7 +416,7 @@ public function testReportURI() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testSandboxFlags() + public function testSandboxFlags(): void { $this->prepare(); $this->csp->reportOnly(false); @@ -432,7 +432,7 @@ public function testSandboxFlags() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testUpgradeInsecureRequests() + public function testUpgradeInsecureRequests(): void { $this->prepare(); $this->csp->upgradeInsecureRequests(); @@ -446,7 +446,7 @@ public function testUpgradeInsecureRequests() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBodyEmpty() + public function testBodyEmpty(): void { $this->prepare(); $body = ''; @@ -459,7 +459,7 @@ public function testBodyEmpty() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBodyScriptNonce() + public function testBodyScriptNonce(): void { $this->prepare(); $body = 'Blah blah {csp-script-nonce} blah blah'; @@ -478,7 +478,7 @@ public function testBodyScriptNonce() $this->assertSame([], $nonceStyle); } - public function testBodyScriptNonceCustomScriptTag() + public function testBodyScriptNonceCustomScriptTag(): void { $config = new CSPConfig(); $config->scriptNonceTag = '{custom-script-nonce-tag}'; @@ -494,7 +494,7 @@ public function testBodyScriptNonceCustomScriptTag() $this->assertStringContainsString('nonce=', $response->getBody()); } - public function testBodyScriptNonceDisableAutoNonce() + public function testBodyScriptNonceDisableAutoNonce(): void { $config = new CSPConfig(); $config->autoNonce = false; @@ -513,7 +513,7 @@ public function testBodyScriptNonceDisableAutoNonce() $result->assertHeader('Content-Security-Policy'); } - public function testBodyStyleNonceDisableAutoNonce() + public function testBodyStyleNonceDisableAutoNonce(): void { $config = new CSPConfig(); $config->autoNonce = false; @@ -536,7 +536,7 @@ public function testBodyStyleNonceDisableAutoNonce() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testBodyStyleNonce() + public function testBodyStyleNonce(): void { $this->prepare(); $body = 'Blah blah {csp-style-nonce} blah blah'; @@ -555,7 +555,7 @@ public function testBodyStyleNonce() $this->assertSame([], $nonceScript); } - public function testBodyStyleNonceCustomStyleTag() + public function testBodyStyleNonceCustomStyleTag(): void { $config = new CSPConfig(); $config->styleNonceTag = '{custom-style-nonce-tag}'; @@ -575,7 +575,7 @@ public function testBodyStyleNonceCustomStyleTag() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testHeaderWrongCaseNotFound() + public function testHeaderWrongCaseNotFound(): void { $this->prepare(); $result = $this->work(); @@ -588,7 +588,7 @@ public function testHeaderWrongCaseNotFound() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testHeaderIgnoreCase() + public function testHeaderIgnoreCase(): void { $this->prepare(); $result = $this->work(); @@ -601,7 +601,7 @@ public function testHeaderIgnoreCase() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testCSPDisabled() + public function testCSPDisabled(): void { $this->prepare(false); $this->work(); @@ -610,7 +610,7 @@ public function testCSPDisabled() $this->assertHeaderNotEmitted('content-security-policy', true); } - public function testGetScriptNonce() + public function testGetScriptNonce(): void { $this->prepare(); @@ -619,7 +619,7 @@ public function testGetScriptNonce() $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce); } - public function testGetStyleNonce() + public function testGetStyleNonce(): void { $this->prepare(); @@ -632,7 +632,7 @@ public function testGetStyleNonce() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled() + public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled(): void { $this->prepare(); diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index fe320705b290..6bd699375a63 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -31,14 +31,14 @@ protected function tearDown(): void } } - public function testCanGetStatusCode() + public function testCanGetStatusCode(): void { $response = new DownloadResponse('unit-test.txt', true); $this->assertSame(200, $response->getStatusCode()); } - public function testCantSetStatusCode() + public function testCantSetStatusCode(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -46,7 +46,7 @@ public function testCantSetStatusCode() $response->setStatusCode(200); } - public function testSetDateRemembersDateInUTC() + public function testSetDateRemembersDateInUTC(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -61,7 +61,7 @@ public function testSetDateRemembersDateInUTC() $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header); } - public function testSetLastModifiedWithDateTimeObject() + public function testSetLastModifiedWithDateTimeObject(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -75,7 +75,7 @@ public function testSetLastModifiedWithDateTimeObject() $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header); } - public function testSetLastModifiedWithString() + public function testSetLastModifiedWithString(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -86,14 +86,14 @@ public function testSetLastModifiedWithString() $this->assertSame('2000-03-10 10:23:45', $header); } - public function testsentMethodSouldReturnRedirectResponse() + public function testsentMethodSouldReturnRedirectResponse(): void { $response = new DownloadResponse('unit-test.txt', true); $this->assertInstanceOf(DownloadResponse::class, $response); } - public function testSetContentType() + public function testSetContentType(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -102,7 +102,7 @@ public function testSetContentType() $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type')); } - public function testSetContentTypeNoCharSet() + public function testSetContentTypeNoCharSet(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -111,7 +111,7 @@ public function testSetContentTypeNoCharSet() $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type')); } - public function testSetFileName() + public function testSetFileName(): void { $response = new DownloadResponse('unit-test.txt', true); $response->setFileName('myFile.txt'); @@ -120,7 +120,7 @@ public function testSetFileName() $this->assertSame('attachment; filename="myFile.txt"; filename*=UTF-8\'\'myFile.txt', $response->getHeaderLine('Content-Disposition')); } - public function testNoCache() + public function testNoCache(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -129,7 +129,7 @@ public function testNoCache() $this->assertSame('private, no-transform, no-store, must-revalidate', $response->getHeaderLine('Cache-control')); } - public function testCantSetCache() + public function testCantSetCache(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -137,7 +137,7 @@ public function testCantSetCache() $response->setCache(); } - public function testWhenFilepathIsSetBinaryCanNotBeSet() + public function testWhenFilepathIsSetBinaryCanNotBeSet(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -146,7 +146,7 @@ public function testWhenFilepathIsSetBinaryCanNotBeSet() $response->setBinary('test'); } - public function testWhenBinaryIsSetFilepathCanNotBeSet() + public function testWhenBinaryIsSetFilepathCanNotBeSet(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -155,7 +155,7 @@ public function testWhenBinaryIsSetFilepathCanNotBeSet() $response->setFilePath(__FILE__); } - public function testCanNotSetNoFilepath() + public function testCanNotSetNoFilepath(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -163,7 +163,7 @@ public function testCanNotSetNoFilepath() $response->setFilePath('unit test'); } - public function testCanGetContentLength() + public function testCanGetContentLength(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -181,7 +181,7 @@ public function testCanGetContentLength() $this->assertSame($size, $response->getContentLength()); } - public function testIsSetDownloadableHeadlersFromBinary() + public function testIsSetDownloadableHeadlersFromBinary(): void { $response = new DownloadResponse('unit test.txt', false); @@ -195,7 +195,7 @@ public function testIsSetDownloadableHeadlersFromBinary() $this->assertSame('4', $response->getHeaderLine('Content-Length')); } - public function testIsSetDownloadableHeadlersFromFile() + public function testIsSetDownloadableHeadlersFromFile(): void { $response = new DownloadResponse('unit-test.php', false); @@ -209,7 +209,7 @@ public function testIsSetDownloadableHeadlersFromFile() $this->assertSame(filesize(__FILE__), (int) $response->getHeaderLine('Content-Length')); } - public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurlencode() + public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurlencode(): void { $response = new DownloadResponse(mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8'), false); @@ -220,7 +220,7 @@ public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurle $this->assertSame('attachment; filename="' . mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8') . '"; filename*=UTF-8\'\'%E3%83%86%E3%82%B9%E3%83%88.php', $response->getHeaderLine('Content-Disposition')); } - public function testFileExtensionIsUpperCaseWhenAndroidOSIs2() + public function testFileExtensionIsUpperCaseWhenAndroidOSIs2(): void { $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Linux; U; Android 2.0.3; ja-jp; SC-02C Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'; $response = new DownloadResponse('unit-test.php', false); @@ -231,7 +231,7 @@ public function testFileExtensionIsUpperCaseWhenAndroidOSIs2() $this->assertSame('attachment; filename="unit-test.PHP"; filename*=UTF-8\'\'unit-test.PHP', $response->getHeaderLine('Content-Disposition')); } - public function testIsSetContentTypeFromFilename() + public function testIsSetContentTypeFromFilename(): void { $response = new DownloadResponse('unit-test.txt', true); @@ -241,7 +241,7 @@ public function testIsSetContentTypeFromFilename() $this->assertSame('text/plain; charset=UTF-8', $response->getHeaderLine('Content-Type')); } - public function testCanOutputFileBodyFromBinary() + public function testCanOutputFileBodyFromBinary(): void { $response = new DownloadResponse('unit-test.txt', false); @@ -255,7 +255,7 @@ public function testCanOutputFileBodyFromBinary() $this->assertSame('test', $actual); } - public function testCanOutputFileBodyFromFile() + public function testCanOutputFileBodyFromFile(): void { $response = new DownloadResponse('unit-test.php', false); @@ -269,7 +269,7 @@ public function testCanOutputFileBodyFromFile() $this->assertSame(file_get_contents(__FILE__), $actual); } - public function testThrowExceptionWhenNoSetDownloadSource() + public function testThrowExceptionWhenNoSetDownloadSource(): void { $response = new DownloadResponse('unit-test.php', false); @@ -277,13 +277,13 @@ public function testThrowExceptionWhenNoSetDownloadSource() $response->sendBody(); } - public function testGetReason() + public function testGetReason(): void { $response = new DownloadResponse('unit-test.php', false); $this->assertSame('OK', $response->getReasonPhrase()); } - public function testPretendOutput() + public function testPretendOutput(): void { $response = new DownloadResponse('unit-test.php', false); $response->pretend(true); @@ -302,7 +302,7 @@ public function testPretendOutput() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testRealOutput() + public function testRealOutput(): void { $response = new DownloadResponse('unit-test.php', false); $response->pretend(false); diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php index c9d2c0123acf..6c9983effb84 100644 --- a/tests/system/HTTP/Files/FileCollectionTest.php +++ b/tests/system/HTTP/Files/FileCollectionTest.php @@ -27,14 +27,14 @@ protected function setUp(): void $_FILES = []; } - public function testAllReturnsArrayWithNoFiles() + public function testAllReturnsArrayWithNoFiles(): void { $files = new FileCollection(); $this->assertSame([], $files->all()); } - public function testAllReturnsValidSingleFile() + public function testAllReturnsValidSingleFile(): void { $_FILES = [ 'userfile' => [ @@ -57,7 +57,7 @@ public function testAllReturnsValidSingleFile() $this->assertSame(124, $file->getSize()); } - public function testAllReturnsValidMultipleFilesSameName() + public function testAllReturnsValidMultipleFilesSameName(): void { $_FILES = [ 'userfile' => [ @@ -99,7 +99,7 @@ public function testAllReturnsValidMultipleFilesSameName() $this->assertSame(124, $file->getSize()); } - public function testAllReturnsValidMultipleFilesDifferentName() + public function testAllReturnsValidMultipleFilesDifferentName(): void { $_FILES = [ 'userfile1' => [ @@ -144,7 +144,7 @@ public function testAllReturnsValidMultipleFilesDifferentName() $this->assertSame(248, $file->getSize()); } - public function testExtensionGuessing() + public function testExtensionGuessing(): void { $_FILES = [ 'userfile1' => [ @@ -218,7 +218,7 @@ public function testExtensionGuessing() $this->assertSame('zip', $file->guessExtension()); } - public function testAllReturnsValidSingleFileNestedName() + public function testAllReturnsValidSingleFileNestedName(): void { $_FILES = [ 'userfile' => [ @@ -263,7 +263,7 @@ public function testAllReturnsValidSingleFileNestedName() $this->assertSame(124, $file->getSize()); } - public function testHasFileWithSingleFile() + public function testHasFileWithSingleFile(): void { $_FILES = [ 'userfile' => [ @@ -281,7 +281,7 @@ public function testHasFileWithSingleFile() $this->assertFalse($collection->hasFile('foo')); } - public function testHasFileWithMultipleFilesWithDifferentNames() + public function testHasFileWithMultipleFilesWithDifferentNames(): void { $_FILES = [ 'userfile1' => [ @@ -306,7 +306,7 @@ public function testHasFileWithMultipleFilesWithDifferentNames() $this->assertTrue($collection->hasFile('userfile2')); } - public function testHasFileWithSingleFileNestedName() + public function testHasFileWithSingleFileNestedName(): void { $_FILES = [ 'userfile' => [ @@ -341,7 +341,7 @@ public function testHasFileWithSingleFileNestedName() $this->assertTrue($collection->hasFile('userfile.foo.bar')); } - public function testErrorString() + public function testErrorString(): void { $_FILES = [ 'userfile' => [ @@ -361,7 +361,7 @@ public function testErrorString() $this->assertSame($expected, $file->getErrorString()); } - public function testErrorStringWithUnknownError() + public function testErrorStringWithUnknownError(): void { $_FILES = [ 'userfile' => [ @@ -381,7 +381,7 @@ public function testErrorStringWithUnknownError() $this->assertSame($expected, $file->getErrorString()); } - public function testErrorStringWithNoError() + public function testErrorStringWithNoError(): void { $_FILES = [ 'userfile' => [ @@ -400,7 +400,7 @@ public function testErrorStringWithNoError() $this->assertSame($expected, $file->getErrorString()); } - public function testError() + public function testError(): void { $_FILES = [ 'userfile' => [ @@ -418,7 +418,7 @@ public function testError() $this->assertSame(UPLOAD_ERR_INI_SIZE, $file->getError()); } - public function testErrorWithUnknownError() + public function testErrorWithUnknownError(): void { $_FILES = [ 'userfile' => [ @@ -435,7 +435,7 @@ public function testErrorWithUnknownError() $this->assertSame(0, $file->getError()); } - public function testErrorWithNoError() + public function testErrorWithNoError(): void { $_FILES = [ 'userfile' => [ @@ -453,7 +453,7 @@ public function testErrorWithNoError() $this->assertSame(UPLOAD_ERR_OK, $file->getError()); } - public function testFileReturnsValidSingleFile() + public function testFileReturnsValidSingleFile(): void { $_FILES = [ 'userfile' => [ @@ -473,7 +473,7 @@ public function testFileReturnsValidSingleFile() $this->assertSame(124, $file->getSize()); } - public function testFileNoExistSingleFile() + public function testFileNoExistSingleFile(): void { $_FILES = [ 'userfile' => [ @@ -490,7 +490,7 @@ public function testFileNoExistSingleFile() $this->AssertNull($file); } - public function testFileReturnValidMultipleFiles() + public function testFileReturnValidMultipleFiles(): void { $_FILES = [ 'userfile' => [ @@ -533,7 +533,7 @@ public function testFileReturnValidMultipleFiles() $this->assertSame(248, $file2->getSize()); } - public function testFileWithMultipleFilesNestedName() + public function testFileWithMultipleFilesNestedName(): void { $_FILES = [ 'my-form' => [ @@ -599,7 +599,7 @@ public function testFileWithMultipleFilesNestedName() $this->assertSame(243, $file2->getSize()); } - public function testDoesntHaveFile() + public function testDoesntHaveFile(): void { $_FILES = [ 'my-form' => [ @@ -652,7 +652,7 @@ public function testDoesntHaveFile() $this->assertNull($collection->getFile('my-form.detailz.avatars.0')); } - public function testGetFileMultipleHasNoFile() + public function testGetFileMultipleHasNoFile(): void { $_FILES = [ 'userfile' => [ @@ -683,7 +683,7 @@ public function testGetFileMultipleHasNoFile() $this->assertNull($files); } - public function testGetFileMultipleReturnValidDotNotationSyntax() + public function testGetFileMultipleReturnValidDotNotationSyntax(): void { $_FILES = [ 'my-form' => [ @@ -751,7 +751,7 @@ public function testGetFileMultipleReturnValidDotNotationSyntax() $this->assertSame(243, $files[1]->getSize()); } - public function testGetFileMultipleReturnInvalidDotNotationSyntax() + public function testGetFileMultipleReturnInvalidDotNotationSyntax(): void { $_FILES = [ 'my-form' => [ @@ -789,7 +789,7 @@ public function testGetFileMultipleReturnInvalidDotNotationSyntax() $this->assertNull($files); } - public function testGetFileMultipleReturnValidMultipleFiles() + public function testGetFileMultipleReturnValidMultipleFiles(): void { $_FILES = [ 'userfile' => [ @@ -834,7 +834,7 @@ public function testGetFileMultipleReturnValidMultipleFiles() $this->assertSame('text/csv', $files[1]->getClientMimeType()); } - public function testGetFileMultipleReturnInvalidSingleFile() + public function testGetFileMultipleReturnInvalidSingleFile(): void { $_FILES = [ 'userfile' => [ diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php index 2362d64296b7..5ec79796e136 100644 --- a/tests/system/HTTP/Files/FileMovingTest.php +++ b/tests/system/HTTP/Files/FileMovingTest.php @@ -60,7 +60,7 @@ protected function tearDown(): void } } - public function testMove() + public function testMove(): void { $finalFilename = 'fileA'; $_FILES = [ @@ -100,7 +100,7 @@ public function testMove() $this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '_1.txt')); } - public function testMoveOverwriting() + public function testMoveOverwriting(): void { $finalFilename = 'file_with_delimiters_underscore'; $_FILES = [ @@ -150,7 +150,7 @@ public function testMoveOverwriting() $this->assertFileExists($destination . '/' . $finalFilename . '.txt'); } - public function testMoved() + public function testMoved(): void { $finalFilename = 'fileA'; $_FILES = [ @@ -183,7 +183,7 @@ public function testMoved() $this->assertTrue($file->hasMoved()); } - public function testStore() + public function testStore(): void { $finalFilename = 'fileA'; $_FILES = [ @@ -215,7 +215,7 @@ public function testStore() $this->assertSame($destination . '/fileA.txt', $path); } - public function testAlreadyMoved() + public function testAlreadyMoved(): void { $finalFilename = 'fileA'; $_FILES = [ @@ -246,7 +246,7 @@ public function testAlreadyMoved() } } - public function testInvalidFile() + public function testInvalidFile(): void { $_FILES = [ 'userfile' => [ @@ -267,7 +267,7 @@ public function testInvalidFile() $file->move($destination, $file->getName(), false); } - public function testFailedMoveBecauseOfWarning() + public function testFailedMoveBecauseOfWarning(): void { $_FILES = [ 'userfile' => [ @@ -293,7 +293,7 @@ public function testFailedMoveBecauseOfWarning() $file->move($destination, $file->getName(), false); } - public function testFailedMoveBecauseOfFalseReturned() + public function testFailedMoveBecauseOfFalseReturned(): void { $_FILES = [ 'userfile1' => [ @@ -363,7 +363,7 @@ function move_uploaded_file($filename, $destination, ?bool $setReturnValue = nul return $return; } -function rrmdir($src) +function rrmdir($src): void { $dir = opendir($src); diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php index 43ccf91b3c26..34d6190ef2a6 100644 --- a/tests/system/HTTP/HeaderTest.php +++ b/tests/system/HTTP/HeaderTest.php @@ -22,7 +22,7 @@ */ final class HeaderTest extends CIUnitTestCase { - public function testHeaderStoresBasics() + public function testHeaderStoresBasics(): void { $name = 'foo'; $value = 'bar'; @@ -33,7 +33,7 @@ public function testHeaderStoresBasics() $this->assertSame($value, $header->getValue()); } - public function testHeaderStoresBasicsWithNull() + public function testHeaderStoresBasicsWithNull(): void { $name = 'foo'; $value = null; @@ -44,7 +44,7 @@ public function testHeaderStoresBasicsWithNull() $this->assertSame('', $header->getValue()); } - public function testHeaderStoresBasicWithInt() + public function testHeaderStoresBasicWithInt(): void { $name = 'foo'; $value = 123; @@ -55,7 +55,7 @@ public function testHeaderStoresBasicWithInt() $this->assertSame((string) $value, $header->getValue()); } - public function testHeaderStoresBasicWithObject() + public function testHeaderStoresBasicWithObject(): void { $this->expectException(Error::class); $this->expectExceptionMessage('Object of class stdClass could not be converted to string'); @@ -66,7 +66,7 @@ public function testHeaderStoresBasicWithObject() new Header($name, $value); } - public function testHeaderStoresArrayValues() + public function testHeaderStoresArrayValues(): void { $name = 'foo'; $value = [ @@ -80,7 +80,7 @@ public function testHeaderStoresArrayValues() $this->assertSame($value, $header->getValue()); } - public function testHeaderStoresArrayKeyValue() + public function testHeaderStoresArrayKeyValue(): void { $name = 'foo'; $value = [ @@ -94,7 +94,7 @@ public function testHeaderStoresArrayKeyValue() $this->assertSame('key=val', $header->getValueLine()); } - public function testHeaderSetters() + public function testHeaderSetters(): void { $name = 'foo'; $value = [ @@ -114,7 +114,7 @@ public function testHeaderSetters() $this->assertSame($name . ': bar, 123', (string) $header); } - public function testHeaderAppendsValueSkippedForNull() + public function testHeaderAppendsValueSkippedForNull(): void { $name = 'foo'; $value = 'bar'; @@ -128,7 +128,7 @@ public function testHeaderAppendsValueSkippedForNull() $this->assertSame($expected, $header->getValue()); } - public function testHeaderConvertsSingleToArray() + public function testHeaderConvertsSingleToArray(): void { $name = 'foo'; $value = 'bar'; @@ -146,7 +146,7 @@ public function testHeaderConvertsSingleToArray() $this->assertSame($expected, $header->getValue()); } - public function testHeaderPrependsValueSkippedForNull() + public function testHeaderPrependsValueSkippedForNull(): void { $name = 'foo'; $value = 'bar'; @@ -160,7 +160,7 @@ public function testHeaderPrependsValueSkippedForNull() $this->assertSame($expected, $header->getValue()); } - public function testHeaderPrependsValue() + public function testHeaderPrependsValue(): void { $name = 'foo'; $value = 'bar'; @@ -178,7 +178,7 @@ public function testHeaderPrependsValue() $this->assertSame($expected, $header->getValue()); } - public function testHeaderLineSimple() + public function testHeaderLineSimple(): void { $name = 'foo'; $value = [ @@ -194,7 +194,7 @@ public function testHeaderLineSimple() $this->assertSame($expected, $header->getValueLine()); } - public function testHeaderSetValueWithNullWillMarkAsEmptyString() + public function testHeaderSetValueWithNullWillMarkAsEmptyString(): void { $name = 'foo'; $expected = ''; @@ -206,7 +206,7 @@ public function testHeaderSetValueWithNullWillMarkAsEmptyString() $this->assertSame($expected, $header->getValueLine()); } - public function testHeaderLineWithArrayValues() + public function testHeaderLineWithArrayValues(): void { $name = 'foo'; @@ -220,7 +220,7 @@ public function testHeaderLineWithArrayValues() $this->assertSame($expected, $header->getValueLine()); } - public function testHeaderToStringShowsEntireHeader() + public function testHeaderToStringShowsEntireHeader(): void { $name = 'foo'; diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index cd220cbe0987..481821dd922b 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -36,7 +36,7 @@ protected function setUp(): void $this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent()); } - public function testPathDefault() + public function testPathDefault(): void { // /index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; @@ -46,7 +46,7 @@ public function testPathDefault() $this->assertSame($expected, $this->request->detectPath()); } - public function testPathDefaultEmpty() + public function testPathDefaultEmpty(): void { // / $_SERVER['REQUEST_URI'] = '/'; @@ -56,7 +56,7 @@ public function testPathDefaultEmpty() $this->assertSame($expected, $this->request->detectPath()); } - public function testPathRequestURI() + public function testPathRequestURI(): void { // /index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot'; @@ -66,7 +66,7 @@ public function testPathRequestURI() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURINested() + public function testPathRequestURINested(): void { // I'm not sure but this is a case of Apache config making such SERVER // values? @@ -84,7 +84,7 @@ public function testPathRequestURINested() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURISubfolder() + public function testPathRequestURISubfolder(): void { // /ci/index.php/popcorn/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot'; @@ -94,7 +94,7 @@ public function testPathRequestURISubfolder() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURINoIndex() + public function testPathRequestURINoIndex(): void { // /sub/example $_SERVER['REQUEST_URI'] = '/sub/example'; @@ -104,7 +104,7 @@ public function testPathRequestURINoIndex() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURINginx() + public function testPathRequestURINginx(): void { // /ci/index.php/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good'; @@ -114,7 +114,7 @@ public function testPathRequestURINginx() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURINginxRedirecting() + public function testPathRequestURINginxRedirecting(): void { // /?/ci/index.php/woot $_SERVER['REQUEST_URI'] = '/?/ci/woot'; @@ -124,7 +124,7 @@ public function testPathRequestURINginxRedirecting() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathRequestURISuppressed() + public function testPathRequestURISuppressed(): void { // /woot?code=good#pos $_SERVER['REQUEST_URI'] = '/woot'; @@ -134,7 +134,7 @@ public function testPathRequestURISuppressed() $this->assertSame($expected, $this->request->detectPath('REQUEST_URI')); } - public function testPathQueryString() + public function testPathQueryString(): void { // /index.php?/ci/woot $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot'; @@ -145,7 +145,7 @@ public function testPathQueryString() $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } - public function testPathQueryStringWithQueryString() + public function testPathQueryStringWithQueryString(): void { // /index.php?/ci/woot?code=good#pos $_SERVER['REQUEST_URI'] = '/index.php?/ci/woot?code=good'; @@ -156,7 +156,7 @@ public function testPathQueryStringWithQueryString() $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } - public function testPathQueryStringEmpty() + public function testPathQueryStringEmpty(): void { // /index.php? $_SERVER['REQUEST_URI'] = '/index.php?'; @@ -167,7 +167,7 @@ public function testPathQueryStringEmpty() $this->assertSame($expected, $this->request->detectPath('QUERY_STRING')); } - public function testPathPathInfo() + public function testPathPathInfo(): void { // /index.php/woot?code=good#pos $this->request->setGlobal('server', [ @@ -180,7 +180,7 @@ public function testPathPathInfo() $this->assertSame($expected, $this->request->detectPath('PATH_INFO')); } - public function testPathPathInfoGlobal() + public function testPathPathInfoGlobal(): void { // /index.php/woot?code=good#pos $this->request->setGlobal('server', [ diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index b4ab3606ed8b..b8015fab933e 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -39,7 +39,7 @@ protected function setUp(): void $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = []; } - public function testCanGrabRequestVars() + public function testCanGrabRequestVars(): void { $_REQUEST['TEST'] = 5; @@ -47,7 +47,7 @@ public function testCanGrabRequestVars() $this->assertNull($this->request->getVar('TESTY')); } - public function testCanGrabGetVars() + public function testCanGrabGetVars(): void { $_GET['TEST'] = 5; @@ -55,7 +55,7 @@ public function testCanGrabGetVars() $this->assertNull($this->request->getGet('TESTY')); } - public function testCanGrabPostVars() + public function testCanGrabPostVars(): void { $_POST['TEST'] = 5; @@ -63,7 +63,7 @@ public function testCanGrabPostVars() $this->assertNull($this->request->getPost('TESTY')); } - public function testCanGrabPostBeforeGet() + public function testCanGrabPostBeforeGet(): void { $_POST['TEST'] = 5; $_GET['TEST'] = 3; @@ -72,12 +72,12 @@ public function testCanGrabPostBeforeGet() $this->assertSame('3', $this->request->getGetPost('TEST')); } - public function testNoOldInput() + public function testNoOldInput(): void { $this->assertNull($this->request->getOldInput('name')); } - public function testCanGetOldInput() + public function testCanGetOldInput(): void { $_SESSION['_ci_old_input'] = [ 'get' => ['one' => 'two'], @@ -88,7 +88,7 @@ public function testCanGetOldInput() $this->assertSame('two', $this->request->getOldInput('one')); } - public function testCanGetOldInputDotted() + public function testCanGetOldInputDotted(): void { $_SESSION['_ci_old_input'] = [ 'get' => ['apple' => ['name' => 'two']], @@ -99,7 +99,7 @@ public function testCanGetOldInputDotted() $this->assertSame('two', $this->request->getOldInput('apple.name')); } - public function testMissingOldInput() + public function testMissingOldInput(): void { $_SESSION['_ci_old_input'] = [ 'get' => ['apple' => ['name' => 'two']], @@ -112,7 +112,7 @@ public function testMissingOldInput() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 */ - public function testCanGetOldInputArrayWithSESSION() + public function testCanGetOldInputArrayWithSESSION(): void { $_SESSION['_ci_old_input'] = [ 'get' => ['apple' => ['name' => 'two']], @@ -129,7 +129,7 @@ public function testCanGetOldInputArrayWithSESSION() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testCanGetOldInputArrayWithSessionService() + public function testCanGetOldInputArrayWithSessionService(): void { $locations = [ 'AB' => 'Alberta', @@ -142,7 +142,7 @@ public function testCanGetOldInputArrayWithSessionService() $this->assertSame($locations, $this->request->getOldInput('location')); } - public function testCanGrabServerVars() + public function testCanGrabServerVars(): void { $server = $this->getPrivateProperty($this->request, 'globals'); $server['server']['TEST'] = 5; @@ -152,7 +152,7 @@ public function testCanGrabServerVars() $this->assertNull($this->request->getServer('TESTY')); } - public function testCanGrabEnvVars() + public function testCanGrabEnvVars(): void { $server = $this->getPrivateProperty($this->request, 'globals'); $server['env']['TEST'] = 5; @@ -162,7 +162,7 @@ public function testCanGrabEnvVars() $this->assertNull($this->request->getEnv('TESTY')); } - public function testCanGrabCookieVars() + public function testCanGrabCookieVars(): void { $_COOKIE['TEST'] = 5; @@ -170,7 +170,7 @@ public function testCanGrabCookieVars() $this->assertNull($this->request->getCookie('TESTY')); } - public function testStoresDefaultLocale() + public function testStoresDefaultLocale(): void { $config = new App(); @@ -178,7 +178,7 @@ public function testStoresDefaultLocale() $this->assertSame($config->defaultLocale, $this->request->getLocale()); } - public function testSetLocaleSaves() + public function testSetLocaleSaves(): void { $config = new App(); $config->supportedLocales = ['en', 'es']; @@ -191,7 +191,7 @@ public function testSetLocaleSaves() $this->assertSame('en', $request->getLocale()); } - public function testSetBadLocale() + public function testSetBadLocale(): void { $config = new App(); $config->supportedLocales = ['en', 'es']; @@ -207,7 +207,7 @@ public function testSetBadLocale() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774 */ - public function testNegotiatesLocale() + public function testNegotiatesLocale(): void { $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr-FR; q=1.0, en; q=0.5'; @@ -222,7 +222,7 @@ public function testNegotiatesLocale() $this->assertSame('fr', $request->getLocale()); } - public function testNegotiatesLocaleOnlyBroad() + public function testNegotiatesLocaleOnlyBroad(): void { $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr; q=1.0, en; q=0.5'; @@ -241,7 +241,7 @@ public function testNegotiatesLocaleOnlyBroad() // that is up to the NegotiateTest. These are only to make sure that the requests // flow through to the negotiator - public function testNegotiatesNot() + public function testNegotiatesNot(): void { $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8'); @@ -249,7 +249,7 @@ public function testNegotiatesNot() $this->request->negotiate('something bogus', ['iso-8859-5', 'unicode-1-1']); } - public function testNegotiatesCharset() + public function testNegotiatesCharset(): void { // $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8'; $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8'); @@ -260,7 +260,7 @@ public function testNegotiatesCharset() ); } - public function testNegotiatesMedia() + public function testNegotiatesMedia(): void { $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c'); $this->assertSame( @@ -269,19 +269,19 @@ public function testNegotiatesMedia() ); } - public function testNegotiatesEncoding() + public function testNegotiatesEncoding(): void { $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5'); $this->assertSame('gzip', $this->request->negotiate('encoding', ['gzip', 'compress'])); } - public function testNegotiatesLanguage() + public function testNegotiatesLanguage(): void { $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7'); $this->assertSame('en', $this->request->negotiate('language', ['en', 'da'])); } - public function testCanGrabGetRawJSON() + public function testCanGrabGetRawJSON(): void { $json = '{"code":1, "message":"ok"}'; @@ -295,7 +295,7 @@ public function testCanGrabGetRawJSON() $this->assertSame($expected, $request->getJSON(true)); } - public function testCanGetAVariableFromJson() + public function testCanGetAVariableFromJson(): void { $jsonObj = [ 'foo' => 'bar', @@ -327,7 +327,7 @@ public function testCanGetAVariableFromJson() $this->assertNull($request->getJsonVar('null')); } - public function testGetJsonVarAsArray() + public function testGetJsonVarAsArray(): void { $jsonObj = [ 'baz' => [ @@ -358,7 +358,7 @@ public function testGetJsonVarAsArray() $this->assertNull($jsonVar['null']); } - public function testGetJsonVarCanFilter() + public function testGetJsonVarCanFilter(): void { $json = json_encode(['foo' => 'bar']); @@ -370,7 +370,7 @@ public function testGetJsonVarCanFilter() $this->assertFalse($request->getJsonVar('foo', false, FILTER_VALIDATE_INT)); } - public function testGetJsonVarCanFilterArray() + public function testGetJsonVarCanFilterArray(): void { $json = json_encode([ 'string' => 'hello123world', @@ -423,7 +423,7 @@ public function testGetJsonVarCanFilterArray() ); } - public function testGetVarWorksWithJson() + public function testGetVarWorksWithJson(): void { $json = json_encode(['foo' => 'bar', 'fizz' => 'buzz']); @@ -448,7 +448,7 @@ public function testGetVarWorksWithJson() $this->assertSame('buzz', $all->fizz); } - public function testGetVarWorksWithJsonAndGetParams() + public function testGetVarWorksWithJsonAndGetParams(): void { $config = new App(); $config->baseURL = 'http://example.com/'; @@ -480,7 +480,7 @@ public function testGetVarWorksWithJsonAndGetParams() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5391 */ - public function testGetJsonVarReturnsNullFromNullBody() + public function testGetJsonVarReturnsNullFromNullBody(): void { $config = new App(); $config->baseURL = 'http://example.com/'; @@ -490,7 +490,7 @@ public function testGetJsonVarReturnsNullFromNullBody() $this->assertNull($request->getJsonVar('myKey')); } - public function testgetJSONReturnsNullFromNullBody() + public function testgetJSONReturnsNullFromNullBody(): void { $config = new App(); $config->baseURL = 'http://example.com/'; @@ -500,7 +500,7 @@ public function testgetJSONReturnsNullFromNullBody() $this->assertNull($request->getJSON()); } - public function testCanGrabGetRawInput() + public function testCanGrabGetRawInput(): void { $rawstring = 'username=admin001&role=administrator&usepass=0'; @@ -606,7 +606,7 @@ public function provideRawInputVarChecks(): iterable * @param mixed $filter * @param mixed $flag */ - public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $flag) + public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $flag): void { $config = new App(); $config->baseURL = 'http://example.com/'; @@ -619,7 +619,7 @@ public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, /** * @dataProvider provideIsHTTPMethods */ - public function testIsHTTPMethodLowerCase(string $value) + public function testIsHTTPMethodLowerCase(string $value): void { $request = $this->request->withMethod($value); @@ -642,14 +642,14 @@ public function provideIsHTTPMethods(): iterable /** * @dataProvider provideIsHTTPMethods */ - public function testIsHTTPMethodUpperCase(string $value) + public function testIsHTTPMethodUpperCase(string $value): void { $request = $this->request->withMethod($value); $this->assertTrue($request->is($value)); } - public function testIsInvalidValue() + public function testIsInvalidValue(): void { $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Unknown type: invalid'); @@ -659,50 +659,50 @@ public function testIsInvalidValue() $request->is('invalid'); } - public function testIsJson() + public function testIsJson(): void { $request = $this->request->setHeader('Content-Type', 'application/json'); $this->assertTrue($request->is('json')); } - public function testIsWithAjax() + public function testIsWithAjax(): void { $request = $this->request->setHeader('X-Requested-With', 'XMLHttpRequest'); $this->assertTrue($request->is('ajax')); } - public function testIsCLI() + public function testIsCLI(): void { $this->assertFalse($this->request->isCLI()); } - public function testIsAJAX() + public function testIsAJAX(): void { $this->request->appendHeader('X-Requested-With', 'XMLHttpRequest'); $this->assertTrue($this->request->isAJAX()); } - public function testIsSecure() + public function testIsSecure(): void { $_SERVER['HTTPS'] = 'on'; $this->assertTrue($this->request->isSecure()); } - public function testIsSecureFrontEnd() + public function testIsSecureFrontEnd(): void { $this->request->appendHeader('Front-End-Https', 'on'); $this->assertTrue($this->request->isSecure()); } - public function testIsSecureForwarded() + public function testIsSecureForwarded(): void { $this->request->appendHeader('X-Forwarded-Proto', 'https'); $this->assertTrue($this->request->isSecure()); } - public function testUserAgent() + public function testUserAgent(): void { $_SERVER['HTTP_USER_AGENT'] = 'Mozilla'; @@ -712,7 +712,7 @@ public function testUserAgent() $this->assertSame('Mozilla', $request->getUserAgent()->__toString()); } - public function testFileCollectionFactory() + public function testFileCollectionFactory(): void { $_FILES = [ 'userfile' => [ @@ -734,7 +734,7 @@ public function testFileCollectionFactory() $this->assertSame(124, $file->getSize()); } - public function testGetFileMultiple() + public function testGetFileMultiple(): void { $_FILES = [ 'userfile' => [ @@ -766,7 +766,7 @@ public function testGetFileMultiple() $this->assertSame(125, $gotit[1]->getSize()); } - public function testGetFile() + public function testGetFile(): void { $_FILES = [ 'userfile' => [ @@ -782,7 +782,7 @@ public function testGetFile() $this->assertSame(124, $gotit->getSize()); } - public function testSpoofing() + public function testSpoofing(): void { $this->request->setMethod('WINK'); $this->assertSame('wink', $this->request->getMethod()); @@ -791,7 +791,7 @@ public function testSpoofing() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2839 */ - public function testGetPostEmpty() + public function testGetPostEmpty(): void { $_POST['TEST'] = '5'; $_GET['TEST'] = '3'; @@ -799,19 +799,19 @@ public function testGetPostEmpty() $this->assertSame($_GET, $this->request->getGetPost()); } - public function testPostGetSecondStream() + public function testPostGetSecondStream(): void { $_GET['get'] = '3'; $this->assertSame($_GET, $this->request->getPostGet()); } - public function testGetPostSecondStream() + public function testGetPostSecondStream(): void { $_POST['post'] = '5'; $this->assertSame($_POST, $this->request->getGetPost()); } - public function testGetPostSecondStreams() + public function testGetPostSecondStreams(): void { $_GET['get'] = '3'; $_POST['post'] = '5'; @@ -819,7 +819,7 @@ public function testGetPostSecondStreams() $this->assertSame(array_merge($_POST, $_GET), $this->request->getGetPost()); } - public function testWithFalseBody() + public function testWithFalseBody(): void { // Use `false` here to simulate file_get_contents returning a false value $request = new IncomingRequest(new App(), new URI(), false, new UserAgent()); @@ -831,7 +831,7 @@ public function testWithFalseBody() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/3020 */ - public function testGetPostIndexNotExists() + public function testGetPostIndexNotExists(): void { $_POST['TEST'] = 5; $_GET['TEST'] = 3; @@ -859,7 +859,7 @@ public function providePathChecks(): iterable * @param mixed $path * @param mixed $detectPath */ - public function testExtensionPHP($path, $detectPath) + public function testExtensionPHP($path, $detectPath): void { $config = new App(); $config->baseURL = 'http://example.com/'; @@ -870,7 +870,7 @@ public function testExtensionPHP($path, $detectPath) $this->assertSame($detectPath, $request->detectPath()); } - public function testGetPath() + public function testGetPath(): void { $_SERVER['REQUEST_URI'] = '/index.php/fruits/banana'; $_SERVER['SCRIPT_NAME'] = '/index.php'; @@ -880,7 +880,7 @@ public function testGetPath() $this->assertSame('fruits/banana', $request->getPath()); } - public function testGetPathIsRelative() + public function testGetPathIsRelative(): void { $_SERVER['REQUEST_URI'] = '/sub/folder/index.php/fruits/banana'; $_SERVER['SCRIPT_NAME'] = '/sub/folder/index.php'; @@ -890,7 +890,7 @@ public function testGetPathIsRelative() $this->assertSame('fruits/banana', $request->getPath()); } - public function testGetPathStoresDetectedValue() + public function testGetPathStoresDetectedValue(): void { $_SERVER['REQUEST_URI'] = '/fruits/banana'; $_SERVER['SCRIPT_NAME'] = '/index.php'; @@ -902,7 +902,7 @@ public function testGetPathStoresDetectedValue() $this->assertSame('fruits/banana', $request->getPath()); } - public function testGetPathIsRediscovered() + public function testGetPathIsRediscovered(): void { $_SERVER['REQUEST_URI'] = '/fruits/banana'; $_SERVER['SCRIPT_NAME'] = '/index.php'; @@ -915,7 +915,7 @@ public function testGetPathIsRediscovered() $this->assertSame('candy/snickers', $request->getPath()); } - public function testSetPath() + public function testSetPath(): void { $request = new IncomingRequest(new App(), new URI(), null, new UserAgent()); $this->assertSame('', $request->getPath()); @@ -924,7 +924,7 @@ public function testSetPath() $this->assertSame('foobar', $request->getPath()); } - public function testSetPathUpdatesURI() + public function testSetPathUpdatesURI(): void { $request = new IncomingRequest(new App(), new URI(), null, new UserAgent()); @@ -933,7 +933,7 @@ public function testSetPathUpdatesURI() $this->assertSame('apples', $request->getUri()->getPath()); } - public function testGetIPAddressNormal() + public function testGetIPAddressNormal(): void { $expected = '123.123.123.123'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -946,7 +946,7 @@ public function testGetIPAddressNormal() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxy() + public function testGetIPAddressThruProxy(): void { $expected = '123.123.123.123'; $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected; @@ -964,7 +964,7 @@ public function testGetIPAddressThruProxy() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyIPv6() + public function testGetIPAddressThruProxyIPv6(): void { $expected = '123.123.123.123'; $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected; @@ -981,7 +981,7 @@ public function testGetIPAddressThruProxyIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyInvalidIPAddress() + public function testGetIPAddressThruProxyInvalidIPAddress(): void { $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.456.23.123'; $expected = '10.0.1.200'; @@ -999,7 +999,7 @@ public function testGetIPAddressThruProxyInvalidIPAddress() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyInvalidIPAddressIPv6() + public function testGetIPAddressThruProxyInvalidIPAddressIPv6(): void { $_SERVER['HTTP_X_FORWARDED_FOR'] = '2001:xyz::1'; $expected = '2001:db8::2:1'; @@ -1016,7 +1016,7 @@ public function testGetIPAddressThruProxyInvalidIPAddressIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyNotWhitelisted() + public function testGetIPAddressThruProxyNotWhitelisted(): void { $expected = '10.10.1.200'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -1034,7 +1034,7 @@ public function testGetIPAddressThruProxyNotWhitelisted() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyNotWhitelistedIPv6() + public function testGetIPAddressThruProxyNotWhitelistedIPv6(): void { $expected = '2001:db8::2:2'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -1051,7 +1051,7 @@ public function testGetIPAddressThruProxyNotWhitelistedIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxySubnet() + public function testGetIPAddressThruProxySubnet(): void { $expected = '123.123.123.123'; $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected; @@ -1066,7 +1066,7 @@ public function testGetIPAddressThruProxySubnet() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxySubnetIPv6() + public function testGetIPAddressThruProxySubnetIPv6(): void { $expected = '123.123.123.123'; $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected; @@ -1081,7 +1081,7 @@ public function testGetIPAddressThruProxySubnetIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyOutOfSubnet() + public function testGetIPAddressThruProxyOutOfSubnet(): void { $expected = '192.168.5.21'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -1096,7 +1096,7 @@ public function testGetIPAddressThruProxyOutOfSubnet() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyOutOfSubnetIPv6() + public function testGetIPAddressThruProxyOutOfSubnetIPv6(): void { $expected = '2001:db8:1235:ffff:ffff:ffff:ffff:ffff'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -1111,7 +1111,7 @@ public function testGetIPAddressThruProxyOutOfSubnetIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyBothIPv4AndIPv6() + public function testGetIPAddressThruProxyBothIPv4AndIPv6(): void { $expected = '2001:db8:1235:ffff:ffff:ffff:ffff:ffff'; $_SERVER['REMOTE_ADDR'] = $expected; @@ -1129,7 +1129,7 @@ public function testGetIPAddressThruProxyBothIPv4AndIPv6() $this->assertSame($expected, $this->request->getIPAddress()); } - public function testGetIPAddressThruProxyInvalidConfigString() + public function testGetIPAddressThruProxyInvalidConfigString(): void { $this->expectException(TypeError::class); @@ -1141,7 +1141,7 @@ public function testGetIPAddressThruProxyInvalidConfigString() $this->request->getIPAddress(); } - public function testGetIPAddressThruProxyInvalidConfigArray() + public function testGetIPAddressThruProxyInvalidConfigArray(): void { $this->expectException(ConfigException::class); $this->expectExceptionMessage( diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index 86e870d3b073..67768aa7ea2c 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -32,7 +32,7 @@ protected function setUp(): void // We can only test the headers retrieved from $_SERVER // This test might fail under apache. - public function testHeadersRetrievesHeaders() + public function testHeadersRetrievesHeaders(): void { $this->message->setHeader('Host', 'daisyduke.com'); $this->message->setHeader('Referer', 'RoscoePekoTrain.com'); @@ -46,7 +46,7 @@ public function testHeadersRetrievesHeaders() $this->assertSame('RoscoePekoTrain.com', $headers['Referer']->getValue()); } - public function testCanGrabSingleHeader() + public function testCanGrabSingleHeader(): void { $this->message->setHeader('Host', 'daisyduke.com'); @@ -56,7 +56,7 @@ public function testCanGrabSingleHeader() $this->assertSame('daisyduke.com', $header->getValue()); } - public function testCaseInsensitiveheader() + public function testCaseInsensitiveheader(): void { $this->message->setHeader('Host', 'daisyduke.com'); @@ -64,7 +64,7 @@ public function testCaseInsensitiveheader() $this->assertSame('daisyduke.com', $this->message->header('HOST')->getValue()); } - public function testCanSetHeaders() + public function testCanSetHeaders(): void { $this->message->setHeader('first', 'kiss'); $this->message->setHeader('second', ['black', 'book']); @@ -73,7 +73,7 @@ public function testCanSetHeaders() $this->assertSame(['black', 'book'], $this->message->header('Second')->getValue()); } - public function testSetHeaderOverwritesPrevious() + public function testSetHeaderOverwritesPrevious(): void { $this->message->setHeader('Pragma', 'cache'); $this->message->setHeader('Pragma', 'no-cache'); @@ -81,7 +81,7 @@ public function testSetHeaderOverwritesPrevious() $this->assertSame('no-cache', $this->message->header('Pragma')->getValue()); } - public function testHeaderLineIsReadable() + public function testHeaderLineIsReadable(): void { $this->message->setHeader('Accept', ['json', 'html']); $this->message->setHeader('Host', 'daisyduke.com'); @@ -90,7 +90,7 @@ public function testHeaderLineIsReadable() $this->assertSame('daisyduke.com', $this->message->header('Host')->getValueLine()); } - public function testCanRemoveHeader() + public function testCanRemoveHeader(): void { $this->message->setHeader('Host', 'daisyduke.com'); @@ -99,7 +99,7 @@ public function testCanRemoveHeader() $this->assertNull($this->message->header('host')); } - public function testCanAppendHeader() + public function testCanAppendHeader(): void { $this->message->setHeader('accept', ['json', 'html']); @@ -108,7 +108,7 @@ public function testCanAppendHeader() $this->assertSame(['json', 'html', 'xml'], $this->message->header('accept')->getValue()); } - public function testCanPrependHeader() + public function testCanPrependHeader(): void { $this->message->setHeader('accept', ['json', 'html']); @@ -117,27 +117,27 @@ public function testCanPrependHeader() $this->assertSame(['xml', 'json', 'html'], $this->message->header('accept')->getValue()); } - public function testSetProtocolWorks() + public function testSetProtocolWorks(): void { $this->message->setProtocolVersion('1.1'); $this->assertSame('1.1', $this->message->getProtocolVersion()); } - public function testSetProtocolWorksWithNonNumericVersion() + public function testSetProtocolWorksWithNonNumericVersion(): void { $this->message->setProtocolVersion('HTTP/1.1'); $this->assertSame('1.1', $this->message->getProtocolVersion()); } - public function testSetProtocolThrowsExceptionWithInvalidProtocol() + public function testSetProtocolThrowsExceptionWithInvalidProtocol(): void { $this->expectException(HTTPException::class); $this->message->setProtocolVersion('1.2'); } - public function testBodyBasics() + public function testBodyBasics(): void { $body = 'a strange little fellow.'; @@ -146,7 +146,7 @@ public function testBodyBasics() $this->assertSame($body, $this->message->getBody()); } - public function testAppendBody() + public function testAppendBody(): void { $this->message->setBody('moo'); @@ -155,14 +155,14 @@ public function testAppendBody() $this->assertSame("moo\n", $this->message->getBody()); } - public function testSetHeaderReplacingHeader() + public function testSetHeaderReplacingHeader(): void { $this->message->setHeader('Accept', 'json'); $this->assertSame('json', $this->message->getHeaderLine('Accept')); } - public function testSetHeaderDuplicateSettings() + public function testSetHeaderDuplicateSettings(): void { $this->message->setHeader('Accept', 'json'); $this->message->setHeader('Accept', 'xml'); @@ -170,7 +170,7 @@ public function testSetHeaderDuplicateSettings() $this->assertSame('xml', $this->message->getHeaderLine('Accept')); } - public function testSetHeaderDuplicateSettingsInsensitive() + public function testSetHeaderDuplicateSettingsInsensitive(): void { $this->message->setHeader('Accept', 'json'); $this->message->setHeader('accept', 'xml'); @@ -178,7 +178,7 @@ public function testSetHeaderDuplicateSettingsInsensitive() $this->assertSame('xml', $this->message->getHeaderLine('Accept')); } - public function testSetHeaderArrayValues() + public function testSetHeaderArrayValues(): void { $this->message->setHeader('Accept', ['json', 'html', 'xml']); @@ -209,7 +209,7 @@ public function provideArrayHeaderValue(): iterable * * @param mixed $arrayHeaderValue */ - public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue) + public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); $this->message->setHeader('Accept', 'xml'); @@ -222,7 +222,7 @@ public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHead * * @param mixed $arrayHeaderValue */ - public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue) + public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); $this->message->setHeader('Accept', ['xml']); @@ -230,7 +230,7 @@ public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeade $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept')); } - public function testSetHeaderWithExistingArrayValuesAppendNullValue() + public function testSetHeaderWithExistingArrayValuesAppendNullValue(): void { $this->message->setHeader('Accept', ['json', 'html', 'xml']); $this->message->setHeader('Accept', null); @@ -238,7 +238,7 @@ public function testSetHeaderWithExistingArrayValuesAppendNullValue() $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept')); } - public function testPopulateHeadersWithoutContentType() + public function testPopulateHeadersWithoutContentType(): void { $original = $_SERVER; $originalEnv = getenv('CONTENT_TYPE'); @@ -255,7 +255,7 @@ public function testPopulateHeadersWithoutContentType() $_SERVER = $original; // restore so code coverage doesn't break } - public function testPopulateHeadersWithoutHTTP() + public function testPopulateHeadersWithoutHTTP(): void { // fail path, if argument doesn't have the HTTP_* $original = $_SERVER; @@ -272,7 +272,7 @@ public function testPopulateHeadersWithoutHTTP() $_SERVER = $original; // restore so code coverage doesn't break } - public function testPopulateHeadersKeyNotExists() + public function testPopulateHeadersKeyNotExists(): void { // Success path, if array key is not exists, assign empty string to it's value $original = $_SERVER; @@ -288,7 +288,7 @@ public function testPopulateHeadersKeyNotExists() $_SERVER = $original; // restore so code coverage doesn't break } - public function testPopulateHeaders() + public function testPopulateHeaders(): void { // success path $original = $_SERVER; diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php index 547b50ca8039..4323e80c2b42 100644 --- a/tests/system/HTTP/NegotiateTest.php +++ b/tests/system/HTTP/NegotiateTest.php @@ -33,7 +33,7 @@ protected function setUp(): void $this->negotiate = new Negotiate($this->request); } - public function testNegotiateMediaFindsHighestMatch() + public function testNegotiateMediaFindsHighestMatch(): void { $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c'); $this->negotiate->setRequest($this->request); @@ -47,7 +47,7 @@ public function testNegotiateMediaFindsHighestMatch() $this->assertSame('text/md', $this->negotiate->media(['text/md'])); } - public function testParseHeaderDeterminesCorrectPrecedence() + public function testParseHeaderDeterminesCorrectPrecedence(): void { $header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*'); @@ -57,14 +57,14 @@ public function testParseHeaderDeterminesCorrectPrecedence() $this->assertSame('*/*', $header[3]['value']); } - public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable() + public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable(): void { $this->request->setHeader('Accept', 'image/*, text/*'); $this->assertSame('text/plain', $this->negotiate->media(['text/plain'])); } - public function testNegotiateMediaRecognizesMediaTypes() + public function testNegotiateMediaRecognizesMediaTypes(): void { // Image has a higher specificity, but is the wrong type... $this->request->setHeader('Accept', 'text/*, image/jpeg'); @@ -72,7 +72,7 @@ public function testNegotiateMediaRecognizesMediaTypes() $this->assertSame('text/plain', $this->negotiate->media(['text/plain'])); } - public function testNegotiateMediaSupportsStrictMatching() + public function testNegotiateMediaSupportsStrictMatching(): void { // Image has a higher specificity, but is the wrong type... $this->request->setHeader('Accept', 'text/md, image/jpeg'); @@ -81,7 +81,7 @@ public function testNegotiateMediaSupportsStrictMatching() $this->assertSame('', $this->negotiate->media(['text/plain'], true)); } - public function testAcceptCharsetMatchesBasics() + public function testAcceptCharsetMatchesBasics(): void { $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8'); @@ -92,12 +92,12 @@ public function testAcceptCharsetMatchesBasics() $this->assertSame('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2'])); } - public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists() + public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists(): void { $this->assertSame('compress', $this->negotiate->encoding(['compress', 'gzip'])); } - public function testNegotiatesEncodingBasics() + public function testNegotiatesEncodingBasics(): void { $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5'); @@ -106,7 +106,7 @@ public function testNegotiatesEncodingBasics() $this->assertSame('identity', $this->negotiate->encoding()); } - public function testAcceptLanguageBasics() + public function testAcceptLanguageBasics(): void { $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7'); @@ -118,47 +118,47 @@ public function testAcceptLanguageBasics() /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774 */ - public function testAcceptLanguageMatchesBroadly() + public function testAcceptLanguageMatchesBroadly(): void { $this->request->setHeader('Accept-Language', 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7'); $this->assertSame('fr', $this->negotiate->language(['fr', 'en'])); } - public function testBestMatchEmpty() + public function testBestMatchEmpty(): void { $this->expectException(HTTPException::class); $this->negotiate->media([]); } - public function testBestMatchNoHeader() + public function testBestMatchNoHeader(): void { $this->request->setHeader('Accept', ''); $this->assertSame('', $this->negotiate->media(['apple', 'banana'], true)); $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false)); } - public function testBestMatchNotAcceptable() + public function testBestMatchNotAcceptable(): void { $this->request->setHeader('Accept', 'popcorn/cheddar'); $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false)); $this->assertSame('banana/yellow', $this->negotiate->media(['banana/yellow', 'apple/mac'], false)); } - public function testBestMatchFirstSupported() + public function testBestMatchFirstSupported(): void { $this->request->setHeader('Accept', 'popcorn/cheddar, */*'); $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false)); } - public function testBestMatchLowQuality() + public function testBestMatchLowQuality(): void { $this->request->setHeader('Accept', 'popcorn/cheddar;q=0, apple/mac, */*'); $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false)); $this->assertSame('apple/mac', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false)); } - public function testBestMatchOnlyLowQuality() + public function testBestMatchOnlyLowQuality(): void { $this->request->setHeader('Accept', 'popcorn/cheddar;q=0'); // the first supported should be returned, since nothing will make us happy @@ -166,7 +166,7 @@ public function testBestMatchOnlyLowQuality() $this->assertSame('popcorn/cheddar', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false)); } - public function testParameterMatching() + public function testParameterMatching(): void { $this->request->setHeader('Accept', 'popcorn/cheddar;a=0;b=1'); $this->assertSame('popcorn/cheddar;a=2', $this->negotiate->media(['popcorn/cheddar;a=2'], false)); diff --git a/tests/system/HTTP/OutgoingRequestTest.php b/tests/system/HTTP/OutgoingRequestTest.php index 8a6690772fa4..51b2bab6a3fe 100644 --- a/tests/system/HTTP/OutgoingRequestTest.php +++ b/tests/system/HTTP/OutgoingRequestTest.php @@ -20,7 +20,7 @@ */ final class OutgoingRequestTest extends CIUnitTestCase { - public function testCreateWithHeader() + public function testCreateWithHeader(): void { $uri = new URI('https://example.com/'); $headers = ['User-Agent' => 'Mozilla/5.0']; @@ -29,7 +29,7 @@ public function testCreateWithHeader() $this->assertSame('Mozilla/5.0', $request->header('User-Agent')->getValue()); } - public function testGetUri() + public function testGetUri(): void { $uri = new URI('https://example.com/'); $request = new OutgoingRequest('GET', $uri); @@ -37,7 +37,7 @@ public function testGetUri() $this->assertSame($uri, $request->getUri()); } - public function testWithMethod() + public function testWithMethod(): void { $uri = new URI('https://example.com/'); $request = new OutgoingRequest('GET', $uri); @@ -48,7 +48,7 @@ public function testWithMethod() $this->assertSame('POST', strtoupper($newRequest->getMethod())); } - public function testWithUri() + public function testWithUri(): void { $uri = new URI('https://example.com/'); $request = new OutgoingRequest('GET', $uri); @@ -65,7 +65,7 @@ public function testWithUri() * request. * https://www.php-fig.org/psr/psr-7/#32-psrhttpmessagerequestinterface */ - public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriContainsHost() + public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriContainsHost(): void { $uri = new URI(); $request = new OutgoingRequest('GET', $uri); @@ -82,7 +82,7 @@ public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriContainsHost( * request. * https://www.php-fig.org/psr/psr-7/#32-psrhttpmessagerequestinterface */ - public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriDoesNotContainsHost() + public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriDoesNotContainsHost(): void { $uri = new URI(); $request = new OutgoingRequest('GET', $uri); @@ -98,7 +98,7 @@ public function testWithUriPreserveHostHostHeaderIsMissingAndNewUriDoesNotContai * the Host header in the returned request. * https://www.php-fig.org/psr/psr-7/#32-psrhttpmessagerequestinterface */ - public function testWithUriPreserveHostHostHostIsNonEmpty() + public function testWithUriPreserveHostHostHostIsNonEmpty(): void { $uri = new URI('https://example.com/'); $request = new OutgoingRequest('GET', $uri); diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index 5f95b307d8cf..c775da828865 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -59,7 +59,7 @@ protected function setUp(): void Services::injectMock('request', $this->request); } - public function testRedirectToFullURI() + public function testRedirectToFullURI(): void { $response = new RedirectResponse(new App()); @@ -69,7 +69,7 @@ public function testRedirectToFullURI() $this->assertSame('http://example.com/foo', $response->getHeaderLine('Location')); } - public function testRedirectRoute() + public function testRedirectRoute(): void { $response = new RedirectResponse(new App()); @@ -88,7 +88,7 @@ public function testRedirectRoute() $this->assertSame('http://example.com/index.php/exampleRoute2', $response->getHeaderLine('Location')); } - public function testRedirectRouteBadNamedRoute() + public function testRedirectRouteBadNamedRoute(): void { $this->expectException(HTTPException::class); $this->expectExceptionMessage('The route for "differentRoute" cannot be found.'); @@ -100,7 +100,7 @@ public function testRedirectRouteBadNamedRoute() $response->route('differentRoute'); } - public function testRedirectRouteBadControllerMethod() + public function testRedirectRouteBadControllerMethod(): void { $this->expectException(HTTPException::class); $this->expectExceptionMessage('The route for "Bad::badMethod" cannot be found.'); @@ -112,7 +112,7 @@ public function testRedirectRouteBadControllerMethod() $response->route('Bad::badMethod'); } - public function testRedirectRelativeConvertsToFullURI() + public function testRedirectRelativeConvertsToFullURI(): void { $response = new RedirectResponse($this->config); @@ -126,7 +126,7 @@ public function testRedirectRelativeConvertsToFullURI() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testWithInput() + public function testWithInput(): void { $_SESSION = []; $_GET = ['foo' => 'bar']; @@ -146,7 +146,7 @@ public function testWithInput() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testWithValidationErrors() + public function testWithValidationErrors(): void { $_SESSION = []; @@ -166,7 +166,7 @@ public function testWithValidationErrors() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testWith() + public function testWith(): void { $_SESSION = []; @@ -182,7 +182,7 @@ public function testWith() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testRedirectBack() + public function testRedirectBack(): void { $_SERVER['HTTP_REFERER'] = 'http://somewhere.com'; $this->request = new MockIncomingRequest($this->config, new URI('http://somewhere.com'), null, new UserAgent()); @@ -198,7 +198,7 @@ public function testRedirectBack() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testRedirectBackMissing() + public function testRedirectBackMissing(): void { $_SESSION = []; @@ -215,7 +215,7 @@ public function testRedirectBackMissing() * * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119 */ - public function testRedirectRouteBaseUrl() + public function testRedirectRouteBaseUrl(): void { $config = new App(); $config->baseURL = 'http://example.com/test/'; @@ -236,7 +236,7 @@ public function testRedirectRouteBaseUrl() Factories::reset('config'); } - public function testWithCookies() + public function testWithCookies(): void { $_SESSION = []; @@ -254,7 +254,7 @@ public function testWithCookies() * @runInSeparateProcess * @preserveGlobalState disabled */ - public function testWithCookiesWithEmptyCookies() + public function testWithCookiesWithEmptyCookies(): void { $_SESSION = []; @@ -264,7 +264,7 @@ public function testWithCookiesWithEmptyCookies() $this->assertEmpty($response->getCookies()); } - public function testWithHeaders() + public function testWithHeaders(): void { $_SESSION = []; @@ -282,7 +282,7 @@ public function testWithHeaders() } } - public function testWithHeadersWithEmptyHeaders() + public function testWithHeadersWithEmptyHeaders(): void { $_SESSION = []; diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index ab19f05adfac..3eaea59ed1c2 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -35,7 +35,7 @@ protected function setUp(): void $_GET = []; } - public function testFetchGlobalsSingleValue() + public function testFetchGlobalsSingleValue(): void { $_POST['foo'] = 'bar'; $_GET['bar'] = 'baz'; @@ -44,12 +44,12 @@ public function testFetchGlobalsSingleValue() $this->assertSame('baz', $this->request->fetchGlobal('get', 'bar')); } - public function testFetchGlobalsReturnsNullWhenNotFound() + public function testFetchGlobalsReturnsNullWhenNotFound(): void { $this->assertNull($this->request->fetchGlobal('post', 'foo')); } - public function testFetchGlobalsFiltersValues() + public function testFetchGlobalsFiltersValues(): void { $this->request->setGlobal('post', [ 'foo' => 'bar'; $this->assertSame($expected, script_tag($target)); } - public function testScriptTagWithoutProtocol() + public function testScriptTagWithoutProtocol(): void { $target = 'js/mystyles.js'; $expected = ''; $this->assertSame($expected, script_tag($target)); } - public function testScriptTagWithIndexpage() + public function testScriptTagWithIndexpage(): void { $target = 'js/mystyles.js'; $expected = ''; $this->assertSame($expected, script_tag($target, true)); } - public function testScriptTagWithSrc() + public function testScriptTagWithSrc(): void { $target = ['src' => 'http://site.com/js/mystyles.js']; $expected = ''; $this->assertSame($expected, script_tag($target)); } - public function testScriptTagWithSrcWithoutProtocol() + public function testScriptTagWithSrcWithoutProtocol(): void { $target = ['src' => 'js/mystyles.js']; $expected = ''; $this->assertSame($expected, script_tag($target)); } - public function testScriptTagWithSrcAndAttributes() + public function testScriptTagWithSrcAndAttributes(): void { $target = ['src' => 'js/mystyles.js', 'charset' => 'UTF-8', 'defer' => '', 'async' => null]; $expected = ''; $this->assertSame($expected, script_tag($target)); } - public function testScriptTagWithCsp() + public function testScriptTagWithCsp(): void { // Reset CSP object $this->resetServices(); @@ -338,20 +338,20 @@ public function testScriptTagWithCsp() * This test has probably no real-world value but may help detecting * a change in the default behaviour. */ - public function testScriptTagWithoutAnyArg() + public function testScriptTagWithoutAnyArg(): void { $expected = ''; $this->assertSame($expected, script_tag()); } - public function testLinkTag() + public function testLinkTag(): void { $target = 'css/mystyles.css'; $expected = ''; $this->assertSame($expected, link_tag($target)); } - public function testLinkTagXHTML() + public function testLinkTagXHTML(): void { $doctypes = config('DocTypes'); $default = $doctypes->html5; @@ -365,7 +365,7 @@ public function testLinkTagXHTML() $doctypes->html5 = $default; } - public function testLinkTagMedia() + public function testLinkTagMedia(): void { $target = 'https://styles.com/css/mystyles.css'; $tag = link_tag($target, 'stylesheet', 'text/css', '', 'print'); @@ -374,7 +374,7 @@ public function testLinkTagMedia() $this->assertSame($expected, $tag); } - public function testLinkTagTitle() + public function testLinkTagTitle(): void { $tag = link_tag('default.css', 'stylesheet', 'text/css', 'Default Style'); @@ -382,7 +382,7 @@ public function testLinkTagTitle() $this->assertSame($expected, $tag); } - public function testLinkTagFavicon() + public function testLinkTagFavicon(): void { $tag = link_tag('favicon.ico', 'shortcut icon', 'image/ico'); @@ -390,7 +390,7 @@ public function testLinkTagFavicon() $this->assertSame($expected, $tag); } - public function testLinkTagRss() + public function testLinkTagRss(): void { $tag = link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed'); @@ -398,7 +398,7 @@ public function testLinkTagRss() $this->assertSame($expected, $tag); } - public function testLinkTagAlternate() + public function testLinkTagAlternate(): void { $tag = link_tag( 'http://sp.example.com/', @@ -412,7 +412,7 @@ public function testLinkTagAlternate() $this->assertSame($expected, $tag); } - public function testLinkTagArrayAlternate() + public function testLinkTagArrayAlternate(): void { $tag = link_tag([ 'href' => 'http://sp.example.com/', @@ -424,7 +424,7 @@ public function testLinkTagArrayAlternate() $this->assertSame($expected, $tag); } - public function testLinkTagCanonical() + public function testLinkTagCanonical(): void { $tag = link_tag('http://www.example.com/', 'canonical'); @@ -432,7 +432,7 @@ public function testLinkTagCanonical() $this->assertSame($expected, $tag); } - public function testLinkTagArray() + public function testLinkTagArray(): void { $parms = [ 'href' => 'css/mystyles.css', @@ -442,7 +442,7 @@ public function testLinkTagArray() $this->assertSame($expected, link_tag($parms)); } - public function testLinkTagArrayHreflang() + public function testLinkTagArrayHreflang(): void { $tag = link_tag([ 'href' => 'https://example.com/en', @@ -454,26 +454,26 @@ public function testLinkTagArrayHreflang() $this->assertSame($expected, $tag); } - public function testDocType() + public function testDocType(): void { $target = 'html4-strict'; $expected = ''; $this->assertSame($expected, doctype($target)); } - public function testDocTypeDefault() + public function testDocTypeDefault(): void { $expected = ''; $this->assertSame($expected, doctype()); } - public function testDocTypeInvalid() + public function testDocTypeInvalid(): void { $target = 'good-guess'; $this->assertEmpty(doctype($target)); } - public function testVideo() + public function testVideo(): void { $expected = <<<'EOH'         - + diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php index 0f66f060f349..12c1930279e2 100644 --- a/system/Debug/Exceptions.php +++ b/system/Debug/Exceptions.php @@ -128,7 +128,7 @@ public function exceptionHandler(Throwable $exception) if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) { $uri = $this->request->getPath() === '' ? '/' : $this->request->getPath(); - $routeInfo = '[Method: ' . strtoupper($this->request->getMethod()) . ', Route: ' . $uri . ']'; + $routeInfo = '[Method: ' . $this->request->getMethod() . ', Route: ' . $uri . ']'; log_message('critical', "{message}\n{routeInfo}\nin {exFile} on line {exLine}.\n{trace}", [ 'message' => $exception->getMessage(), diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php index 4a7a20632fd7..b2d54c5d52cc 100644 --- a/system/Debug/Toolbar.php +++ b/system/Debug/Toolbar.php @@ -79,7 +79,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques $data = []; // Data items used within the view. $data['url'] = current_url(); - $data['method'] = strtoupper($request->getMethod()); + $data['method'] = $request->getMethod(); $data['isAJAX'] = $request->isAJAX(); $data['startTime'] = $startTime; $data['totalTime'] = $totalTime * 1000; diff --git a/system/Security/Security.php b/system/Security/Security.php index 4ba665639f36..3868b19f8d84 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -280,7 +280,7 @@ public function getCSRFTokenName(): string public function verify(RequestInterface $request) { // Protects POST, PUT, DELETE, PATCH - $method = strtoupper($request->getMethod()); + $method = $request->getMethod(); $methodsToProtect = ['POST', 'PUT', 'DELETE', 'PATCH']; if (! in_array($method, $methodsToProtect, true)) { return $this; diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 747ac66d9bc4..ae4f030907b4 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -501,7 +501,7 @@ public function withRequest(RequestInterface $request): ValidationInterface return $this; } - if (in_array(strtolower($request->getMethod()), ['put', 'patch', 'delete'], true) + if (in_array($request->getMethod(), ['PUT', 'PATCH', 'DELETE'], true) && strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false ) { $this->data = $request->getRawInput(); diff --git a/tests/system/HTTP/OutgoingRequestTest.php b/tests/system/HTTP/OutgoingRequestTest.php index 51b2bab6a3fe..d857297d49ef 100644 --- a/tests/system/HTTP/OutgoingRequestTest.php +++ b/tests/system/HTTP/OutgoingRequestTest.php @@ -44,8 +44,8 @@ public function testWithMethod(): void $newRequest = $request->withMethod('POST'); - $this->assertSame('GET', strtoupper($request->getMethod())); - $this->assertSame('POST', strtoupper($newRequest->getMethod())); + $this->assertSame('GET', $request->getMethod()); + $this->assertSame('POST', $newRequest->getMethod()); } public function testWithUri(): void From 111d73b4e072821e9b3e21596aa902fe59fec5d7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 10:22:07 +0900 Subject: [PATCH 5352/8282] chore: update phpstan-baseline.php --- phpstan-baseline.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index e584035c7ba1..9c06aa1d95b4 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1926,11 +1926,6 @@ 'count' => 2, 'path' => __DIR__ . '/system/Filters/Filters.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Filters/Filters.php', -]; $ignoreErrors[] = [ 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', 'count' => 1, From 38e0f587ba4e425dc05079e29a7521c13e0c3663 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 10:37:00 +0900 Subject: [PATCH 5353/8282] docs: add doc comment --- system/HTTP/IncomingRequest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 1144fe91f536..f1f0b740239d 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -396,7 +396,8 @@ public function negotiate(string $type, array $supported, bool $strictMatch = fa /** * Checks this request type. * - * @param string $type HTTP verb or 'json' or 'ajax' + * @param string $type HTTP verb or 'json' or 'ajax'. + * HTTP verb should be case-sensitive, but this is case-insensitive. * @phpstan-param string|'get'|'post'|'put'|'delete'|'head'|'patch'|'options'|'json'|'ajax' $type */ public function is(string $type): bool From 7d866e2511771c7b278fe19dec19ea69499bf83e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 10:53:58 +0900 Subject: [PATCH 5354/8282] docs: update existing docs --- .../source/incoming/incomingrequest.rst | 19 +++++++++++-------- .../source/incoming/incomingrequest/005.php | 2 +- user_guide_src/source/incoming/request.rst | 8 ++------ .../source/incoming/request/003.php | 4 +--- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index c6db5b28fe4c..83a456196c1e 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -47,7 +47,10 @@ is() .. versionadded:: 4.3.0 -Since v4.3.0, you can use the ``is()`` method. It returns boolean. +Since v4.3.0, you can use the ``is()`` method. It accepts a HTTP method, ``'ajax'``, +or ``'json'``, and returns boolean. + +.. note:: HTTP method should be case-sensitive, but the parameter is case-insensitive. .. literalinclude:: incomingrequest/040.php @@ -58,16 +61,16 @@ You can check the HTTP method that this request represents with the ``getMethod( .. literalinclude:: incomingrequest/005.php -By default, the method is returned as a lower-case string (i.e., ``'get'``, ``'post'``, etc). +The HTTP method is case-sensitive, and by convention, standardized methods are +defined in all-uppercase US-ASCII letters. -.. important:: The functionality to convert the return value to lower case is deprecated. - It will be removed in the future version, and this method will be PSR-7 equivalent. +.. note:: Prior to v4.5.0, by default, the method was returned as a lower-case + string (i.e., ``'get'``, ``'post'``, etc). But it was a bug. -You can get an -uppercase version by wrapping the call in ``strtoupper()``:: +You can get an lowercase version by wrapping the call in ``strtolower()``:: - // Returns 'GET' - $method = strtoupper($request->getMethod()); + // Returns 'get' + $method = strtolower($request->getMethod()); You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method: diff --git a/user_guide_src/source/incoming/incomingrequest/005.php b/user_guide_src/source/incoming/incomingrequest/005.php index 3c93e74b7664..37e6f490ef85 100644 --- a/user_guide_src/source/incoming/incomingrequest/005.php +++ b/user_guide_src/source/incoming/incomingrequest/005.php @@ -1,4 +1,4 @@ getMethod(); diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst index d15da89ec14e..545c42f7e019 100644 --- a/user_guide_src/source/incoming/request.rst +++ b/user_guide_src/source/incoming/request.rst @@ -57,16 +57,12 @@ Class Reference Accepts an optional second string parameter of ``ipv4`` or ``ipv6`` to specify an IP format. The default checks for both formats. - .. php:method:: getMethod([$upper = false]) + .. php:method:: getMethod() - .. important:: Use of the ``$upper`` parameter is deprecated. It will be removed in future releases. - - :param bool $upper: Whether to return the request method name in upper or lower case :returns: HTTP request method :rtype: string - Returns the ``$_SERVER['REQUEST_METHOD']``, with the option to set it - in uppercase or lowercase. + Returns the ``$_SERVER['REQUEST_METHOD']``. .. literalinclude:: request/003.php diff --git a/user_guide_src/source/incoming/request/003.php b/user_guide_src/source/incoming/request/003.php index 4b0b537b801f..d448962cb55a 100644 --- a/user_guide_src/source/incoming/request/003.php +++ b/user_guide_src/source/incoming/request/003.php @@ -1,5 +1,3 @@ getMethod(true); // Outputs: POST -echo $request->getMethod(false); // Outputs: post -echo $request->getMethod(); // Outputs: post +echo $request->getMethod(); // Outputs: POST From aca22d1645c240361cb1dd4d53bb9c5455452b37 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 11:06:33 +0900 Subject: [PATCH 5355/8282] refactor: remove feature flag --- app/Config/Feature.php | 13 ------------- system/Filters/Filters.php | 12 ++++++++++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/app/Config/Feature.php b/app/Config/Feature.php index c8f2cafcccd0..39a37676183c 100644 --- a/app/Config/Feature.php +++ b/app/Config/Feature.php @@ -18,17 +18,4 @@ class Feature extends BaseConfig * Use filter execution order in 4.4 or before. */ public bool $oldFilterOrder = false; - - /** - * Use lowercase HTTP method names like "get", "post" in Config\Filters::$methods. - * - * But the HTTP method is case-sensitive. So using lowercase is wrong. - * We should disable this and use uppercase names like "GET", "POST", etc. - * - * The method token is case-sensitive because it might be used as a gateway - * to object-based systems with case-sensitive method names. By convention, - * standardized methods are defined in all-uppercase US-ASCII letters. - * https://www.rfc-editor.org/rfc/rfc9110#name-overview - */ - public bool $lowerCaseFilterMethods = true; } diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 5349d9d5060b..0a79fee7a593 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -496,11 +496,19 @@ protected function processMethods() $method = $this->request->getMethod(); - if (config(Feature::class)->lowerCaseFilterMethods) { + $found = false; + + if (array_key_exists($method, $this->config->methods)) { + $found = true; + } + // Checks lowercase HTTP method for backward compatibility. + // @TODO remove this in the future. + elseif (array_key_exists(strtolower($method), $this->config->methods)) { + $found = true; $method = strtolower($method); } - if (array_key_exists($method, $this->config->methods)) { + if ($found) { if (config(Feature::class)->oldFilterOrder) { $this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]); } else { From 0b6a273f754f20ff6afee45bce4f3d16820dc6c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 11:15:05 +0900 Subject: [PATCH 5356/8282] docs: change Filters::$methods keys to uppercase --- app/Config/Filters.php | 2 +- user_guide_src/source/incoming/filters/008.php | 4 ++-- user_guide_src/source/installation/upgrade_415/001.php | 4 ++-- user_guide_src/source/libraries/security/009.php | 4 ++-- user_guide_src/source/libraries/throttler/004.php | 2 +- user_guide_src/source/tutorial/create_news_items/001.php | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Config/Filters.php b/app/Config/Filters.php index ac37b414c45c..6ebe0f3100ac 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -50,7 +50,7 @@ class Filters extends BaseConfig * particular HTTP method (GET, POST, etc.). * * Example: - * 'post' => ['foo', 'bar'] + * 'POST' => ['foo', 'bar'] * * If you use this, you should disable auto-routing because auto-routing * permits any HTTP method to access a controller. Accessing the controller diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php index 8d417fd436aa..7538a199394a 100644 --- a/user_guide_src/source/incoming/filters/008.php +++ b/user_guide_src/source/incoming/filters/008.php @@ -9,8 +9,8 @@ class Filters extends BaseConfig // ... public array $methods = [ - 'post' => ['invalidchars', 'csrf'], - 'get' => ['csrf'], + 'POST' => ['invalidchars', 'csrf'], + 'GET' => ['csrf'], ]; // ... diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php index 9d51911e38eb..272f9e2f1fab 100644 --- a/user_guide_src/source/installation/upgrade_415/001.php +++ b/user_guide_src/source/installation/upgrade_415/001.php @@ -9,8 +9,8 @@ class Filters extends BaseConfig // ... public $methods = [ - 'get' => ['csrf'], - 'post' => ['csrf'], + 'GET' => ['csrf'], + 'POST' => ['csrf'], ]; // ... } diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php index bd6bc93cfeb6..fb9d114b026e 100644 --- a/user_guide_src/source/libraries/security/009.php +++ b/user_guide_src/source/libraries/security/009.php @@ -7,8 +7,8 @@ class Filters extends BaseConfig { public $methods = [ - 'get' => ['csrf'], - 'post' => ['csrf'], + 'GET' => ['csrf'], + 'POST' => ['csrf'], ]; // ... diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php index ab4d91257f8f..246b034d035e 100644 --- a/user_guide_src/source/libraries/throttler/004.php +++ b/user_guide_src/source/libraries/throttler/004.php @@ -7,7 +7,7 @@ class Filters extends BaseConfig { public $methods = [ - 'post' => ['throttle'], + 'POST' => ['throttle'], ]; // ... diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php index 8c5ce7508349..3fc800af1a22 100644 --- a/user_guide_src/source/tutorial/create_news_items/001.php +++ b/user_guide_src/source/tutorial/create_news_items/001.php @@ -9,7 +9,7 @@ class Filters extends BaseConfig // ... public $methods = [ - 'post' => ['csrf'], + 'POST' => ['csrf'], ]; // ... From f54e4203e7f1d67b42aa0315b93bec7f403181a5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 11:17:13 +0900 Subject: [PATCH 5357/8282] test: change Filters::$methods keys to uppercase --- tests/system/Filters/FiltersTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index 7faf127f4647..f2412b289aa7 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -89,7 +89,7 @@ public function testProcessMethodDetectsCLI(): void 'aliases' => ['foo' => ''], 'globals' => [], 'methods' => [ - 'cli' => ['foo'], + 'CLI' => ['foo'], ], ]; $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); @@ -113,7 +113,7 @@ public function testProcessMethodDetectsGetRequests(): void 'aliases' => ['foo' => ''], 'globals' => [], 'methods' => [ - 'get' => ['foo'], + 'GET' => ['foo'], ], ]; $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); @@ -137,8 +137,8 @@ public function testProcessMethodRespectsMethod(): void ], 'globals' => [], 'methods' => [ - 'post' => ['foo'], - 'get' => ['bar'], + 'POST' => ['foo'], + 'GET' => ['bar'], ], ]; $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); @@ -162,8 +162,8 @@ public function testProcessMethodIgnoresMethod(): void ], 'globals' => [], 'methods' => [ - 'post' => ['foo'], - 'get' => ['bar'], + 'POST' => ['foo'], + 'GET' => ['bar'], ], ]; $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config); @@ -348,8 +348,8 @@ public function testProcessMethodProcessesCombined(): void ], ], 'methods' => [ - 'post' => ['foo'], - 'get' => ['bar'], + 'POST' => ['foo'], + 'GET' => ['bar'], ], 'filters' => [ 'foof' => [ @@ -391,7 +391,7 @@ public function testProcessMethodProcessesCombinedAfterForToolbar(): void ], ], 'methods' => [ - 'get' => ['bar'], + 'GET' => ['bar'], ], 'filters' => [ 'foof' => [ From d397154fb8100e370a3eeb2238f74fce01ce3184 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 11:46:50 +0900 Subject: [PATCH 5358/8282] docs: add changelog and upgrade --- user_guide_src/source/changelogs/v4.5.0.rst | 31 +++++++++++-- .../source/installation/upgrade_450.rst | 45 +++++++++++++++++++ 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index f2440ac5cc92..3649a9e0b100 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -21,6 +21,23 @@ BREAKING Behavior Changes ================ +Lowercase HTTP Method Name +-------------------------- + +For historical reasons, the framework used HTTP method names in lower case like +"get", "post". +But the method token is case-sensitive because it might be used as a gateway +to object-based systems with case-sensitive method names. By convention, +standardized methods are defined in all-uppercase US-ASCII letters. +See https://www.rfc-editor.org/rfc/rfc9110#name-overview. + +Now the framework uses the correct HTTP method names like "GET", "POST". + +- ``Request::getMethod()`` returns uppercase HTTP methods. +- ``CURLRequest::request()`` does not change the accepted HTTP methods to uppercase. + +See :ref:`upgrade-450-lowercase-http-method-name` for details. + Filter Execution Order ---------------------- @@ -118,6 +135,16 @@ Others Removed Deprecated Items ======================== +Request +------- + +- The ``$upper`` parameter in ``getMethod()`` in ``RequestInterface`` and ``Request`` + has been removed. See :ref:`upgrade-450-lowercase-http-method-name`. +- The deprecated ``isValidIP()`` method in ``RequestInterface`` and ``Request`` + has been removed. +- The visibility of the deprecated properties ``$uri`` and ``$config`` in + ``IncomingRequest`` has been changed to protected. + Filters ------- @@ -183,10 +210,6 @@ Spark Commands Others ------ -- **IncomingRequest:** The visibility of the deprecated properties ``$uri`` and - ``$config`` has been changed to protected. -- **RequestInterface:** The deprecated ``isValidIP()`` method has been removed. -- **Request:** The deprecated ``isValidIP()`` method has been removed. - **Config:** The deprecated ``CodeIgniter\Config\Config`` class has been removed. Enhancements diff --git a/user_guide_src/source/installation/upgrade_450.rst b/user_guide_src/source/installation/upgrade_450.rst index 04607dde6489..ae39f2a36b91 100644 --- a/user_guide_src/source/installation/upgrade_450.rst +++ b/user_guide_src/source/installation/upgrade_450.rst @@ -18,6 +18,51 @@ Mandatory File Changes Breaking Changes **************** +.. _upgrade-450-lowercase-http-method-name: + +Lowercase HTTP Method Name +========================== + +For historical reasons, ``Request::getMethod()`` returned HTTP method names in +lower case by default. + +But the method token is case-sensitive because it might be used as a gateway +to object-based systems with case-sensitive method names. By convention, +standardized methods are defined in all-uppercase US-ASCII letters. +See https://www.rfc-editor.org/rfc/rfc9110#name-overview. + +Now the deprecated ``$upper`` parameter in ``Request::getMethod()`` has been +removed, and the ``getMethod()`` returns the as-is HTTP method name. That is, +uppercase like "GET", "POST", and so on. + +If you want lowercase HTTP method names, use PHP's ``strtolower()`` function:: + + strtolower($request->getMethod()) + +And you should use uppercase HTTP method names in your app code. You should update +the keys in ``$methods`` in **app/Config/Filters.php**:: + + public array $methods = [ + 'POST' => ['invalidchars', 'csrf'], + 'GET' => ['csrf'], + ]; + +CURLRequest::request() +---------------------- + +In previous versions, you could pass lowercase HTTP methods to the ``request()`` +method. But this bug has been fixed. + +Now you must pass the correct HTTP method names like "GET", "POST". Otherwise +you would get the error response:: + + $client = \Config\Services::curlrequest(); + $response = $client->request('get', 'https://www.google.com/', [ + 'http_errors' => false, + ]); + $response->getStatusCode(); // In previous versions: 200 + // In this verrsion: 405 + .. _upgrade-450-nested-route-groups-and-options: Nested Route Groups and Options From 905c3d12682575f6092fde5c794393d86585b3da Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 12:03:01 +0900 Subject: [PATCH 5359/8282] test: fix $routes->match() HTTP verbs --- tests/system/Router/RouteCollectionTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 985326dcf66d..9ebe27c3a8b8 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -148,7 +148,7 @@ public function testAddWorksWithCurrentHTTPMethods(): void $routes = $this->getCollector(); - $routes->match(['get'], 'home', 'controller'); + $routes->match(['GET'], 'home', 'controller'); $expects = [ 'home' => '\controller', @@ -180,7 +180,7 @@ public function testMatchIgnoresInvalidHTTPMethods(): void $routes = $this->getCollector(); - $routes->match(['put'], 'home', 'controller'); + $routes->match(['PUT'], 'home', 'controller'); $routes = $routes->getRoutes(); @@ -816,12 +816,12 @@ public function testMatchSupportsMultipleMethods(): void $expected = ['here' => '\there']; - $routes->match(['get', 'post'], 'here', 'there'); + $routes->match(['GET', 'POST'], 'here', 'there'); $this->assertSame($expected, $routes->getRoutes()); Services::request()->setMethod('post'); $routes = $this->getCollector(); - $routes->match(['get', 'post'], 'here', 'there'); + $routes->match(['GET', 'POST'], 'here', 'there'); $this->assertSame($expected, $routes->getRoutes()); } From a09e750b967d978a8eeb9ead23e06e60e06bc5a6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 Nov 2023 12:10:26 +0900 Subject: [PATCH 5360/8282] test: fix $request->setMethod() HTTP verbs --- tests/system/Router/RouteCollectionTest.php | 72 ++++++++++----------- tests/system/Router/RouterTest.php | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 9ebe27c3a8b8..32989e952d57 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -144,7 +144,7 @@ public function testAddIgnoresDefaultNamespaceWhenExists(): void public function testAddWorksWithCurrentHTTPMethods(): void { - Services::request()->setMethod('get'); + Services::request()->setMethod('GET'); $routes = $this->getCollector(); @@ -176,7 +176,7 @@ public function testAddWithLeadingSlash(): void public function testMatchIgnoresInvalidHTTPMethods(): void { - Services::request()->setMethod('get'); + Services::request()->setMethod('GET'); $routes = $this->getCollector(); @@ -189,7 +189,7 @@ public function testMatchIgnoresInvalidHTTPMethods(): void public function testAddWorksWithArrayOFHTTPMethods(): void { - Services::request()->setMethod('post'); + Services::request()->setMethod('POST'); $routes = $this->getCollector(); @@ -696,7 +696,7 @@ public function testPresenterScaffoldsCorrectly(): void public function testResourcesWithCustomController(): void { - Services::request()->setMethod('get'); + Services::request()->setMethod('GET'); $routes = $this->getCollector(); $routes->resource('photos', ['controller' => '
        - ↕ - 🔅 + ↕ + 🔅 - + - + ms   MB @@ -50,7 +50,7 @@ - + @@ -64,7 +64,7 @@ - + Vars @@ -72,7 +72,7 @@

        - + @@ -80,7 +80,7 @@

        - +
        @@ -124,7 +124,7 @@ $items) : ?> - +

        @@ -148,7 +148,7 @@ - +

        Session User Data

         @@ -174,7 +174,7 @@

        Request ( )

        - +

        $_GET

         @@ -191,7 +191,7 @@ - +

        $_POST

         @@ -208,7 +208,7 @@ - +

        Headers

         @@ -225,7 +225,7 @@ - +

        Cookies

         @@ -246,7 +246,7 @@ - +

        Headers

         diff --git a/system/Debug/Toolbar/Views/toolbarloader.js b/system/Debug/Toolbar/Views/toolbarloader.js index 7e5914354481..75caefa6c104 100644 --- a/system/Debug/Toolbar/Views/toolbarloader.js +++ b/system/Debug/Toolbar/Views/toolbarloader.js @@ -74,8 +74,11 @@ function newXHR() { let h2 = document.querySelector('#ci-history > h2'); if (h2) { - h2.innerHTML = 'History You have new debug data. '; + h2.innerHTML = 'History You have new debug data. '; document.querySelector('a[data-tab="ci-history"] > span > .badge').className += ' active'; + document.getElementById('ci-history-update').addEventListener('click',function(){ + loadDoc(debugbarTime); + },false) } } } From 1a53368101beb4ab6ba1fcd113aaddbbf3839f58 Mon Sep 17 00:00:00 2001 From: dhiya Date: Fri, 12 Jan 2024 22:25:04 +0800 Subject: [PATCH 6127/8282] fix changes SCSS files did not match the expected CSS output --- system/Debug/Toolbar/Views/toolbar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index bc35e4b07623..19f58e4642bc 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -764,6 +764,7 @@ background-color: #FDC894; color: #434343; } + #ci-database.debug-bar-dblock, #ci-files.debug-bar-dblock, #ci-routes.debug-bar-dblock, From 1f0284641de78572aced140895e59d021e89547a Mon Sep 17 00:00:00 2001 From: dhiya Date: Sat, 20 Jan 2024 21:45:10 +0800 Subject: [PATCH 6128/8282] update style & js --- admin/css/debug-toolbar/toolbar.scss | 27 ++++---- app/Views/welcome_message.php | 2 +- system/Debug/Toolbar.php | 4 +- system/Debug/Toolbar/Views/toolbar.css | 14 ++--- system/Debug/Toolbar/Views/toolbar.js | 70 ++++++++++----------- system/Debug/Toolbar/Views/toolbarloader.js | 4 +- 6 files changed, 60 insertions(+), 61 deletions(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index 2cfc16a4eae0..e32b037dd648 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -475,8 +475,7 @@ #ci-history.debug-bar-dblock, #ci-vars.debug-bar-dblock, #ci-config.debug-bar-dblock, -#ci-timeline.debug-bar-dblock -{ +#ci-timeline.debug-bar-dblock { display: block; } @@ -523,46 +522,46 @@ overflow: hidden; } -.debug-bar-dtableRow{ +.debug-bar-dtableRow { display: table-row; - } +} -.debug-bar-dinlineBlock{ +.debug-bar-dinlineBlock { display: inline-block; } -.debug-bar-pointer{ +.debug-bar-pointer { cursor: pointer; } -.debug-bar-mleft4{ +.debug-bar-mleft4 { margin-left: 4px; } -.level-0{ +.debug-bar-level-0 { --level: 0; } -.level-1{ +.debug-bar-level-1 { --level: 1; } -.level-2{ +.debug-bar-level-2 { --level: 2; } -.level-3{ +.debug-bar-level-3 { --level: 3; } -.level-4{ +.debug-bar-level-4 { --level: 4; } -.level-5{ +.debug-bar-level-5 { --level: 5; } -.level-6{ +.debug-bar-level-6 { --level: 6; } diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index c391dc83bb85..88cde01cc3ba 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -332,7 +332,7 @@ @@ -80,7 +80,7 @@ - +
        From 91c3c59c94ebac13a7cbc3e080f0329577ac3bcd Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 2 Mar 2024 07:04:45 +0700 Subject: [PATCH 6323/8282] change all href to role button --- system/Debug/Toolbar/Views/toolbar.tpl.php | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 768f9d38c65e..4bae5b54c7c7 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -33,15 +33,15 @@
        - ↕ - 🔅 + ↕ + 🔅 - + - + ms   MB @@ -50,7 +50,7 @@ - + @@ -64,7 +64,7 @@ - + Vars @@ -72,7 +72,7 @@

        - + @@ -80,7 +80,7 @@

        - +
        @@ -124,7 +124,7 @@ $items) : ?> - +

        @@ -148,7 +148,7 @@ - +

        Session User Data

         @@ -174,7 +174,7 @@

        Request ( )

        - +

        $_GET

         @@ -191,7 +191,7 @@ - +

        $_POST

         @@ -208,7 +208,7 @@ - +

        Headers

         @@ -225,7 +225,7 @@ - +

        Cookies

         @@ -246,7 +246,7 @@ - +

        Headers

         From e2c488b610616fea0b12d0eceb5d893c314ad393 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 2 Mar 2024 07:05:25 +0700 Subject: [PATCH 6324/8282] style css and run sass --- admin/css/debug-toolbar/toolbar.scss | 39 +++++++++++++++----------- system/Debug/Toolbar/Views/toolbar.css | 14 ++++++--- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index 9c5b149d392c..8d7bed21b361 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -13,6 +13,9 @@ @import '_mixins'; @import '_settings'; +[role="button"] { + cursor: pointer; +} // DEBUG ICON // ========================================================================== */ @@ -36,6 +39,9 @@ clear: both; text-align: center; + // Cursor + cursor: pointer; + a svg { margin: 8px; max-width: 20px; @@ -227,14 +233,13 @@ // The toolbar preferences #toolbar-position, #toolbar-theme { - a { - padding: 0 6px; - display: inline-flex; - vertical-align: top; + padding: 0 6px; + display: inline-flex; + vertical-align: top; + cursor: pointer; - &:hover { - text-decoration: none; - } + &:hover { + text-decoration: none; } } @@ -518,43 +523,43 @@ .debug-bar-dtableRow { display: table-row; } - + .debug-bar-dinlineBlock { display: inline-block; } - + .debug-bar-pointer { cursor: pointer; } - + .debug-bar-mleft4 { margin-left: 4px; } - + .debug-bar-level-0 { --level: 0; } - + .debug-bar-level-1 { --level: 1; } - + .debug-bar-level-2 { --level: 2; } - + .debug-bar-level-3 { --level: 3; } - + .debug-bar-level-4 { --level: 4; } - + .debug-bar-level-5 { --level: 5; } - + .debug-bar-level-6 { --level: 6; } diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index a3b934b68bd4..175f7725f8c8 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -6,6 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ +[role=button] { + cursor: pointer; +} + #debug-icon { bottom: 0; position: fixed; @@ -17,6 +21,7 @@ padding: 0px; clear: both; text-align: center; + cursor: pointer; } #debug-icon a svg { margin: 8px; @@ -156,14 +161,15 @@ bottom: auto; top: 36px; } -#debug-bar #toolbar-position a, -#debug-bar #toolbar-theme a { +#debug-bar #toolbar-position, +#debug-bar #toolbar-theme { padding: 0 6px; display: inline-flex; vertical-align: top; + cursor: pointer; } -#debug-bar #toolbar-position a:hover, -#debug-bar #toolbar-theme a:hover { +#debug-bar #toolbar-position:hover, +#debug-bar #toolbar-theme:hover { text-decoration: none; } #debug-bar #debug-bar-link { From 1ceafd6727924694b2bbd8e2b839061eecb93f2a Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 2 Mar 2024 07:10:10 +0700 Subject: [PATCH 6325/8282] just element anchor in role button --- admin/css/debug-toolbar/toolbar.scss | 2 +- system/Debug/Toolbar/Views/toolbar.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index 8d7bed21b361..dfcb7e58aeea 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -13,7 +13,7 @@ @import '_mixins'; @import '_settings'; -[role="button"] { +a[role="button"] { cursor: pointer; } diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index 175f7725f8c8..612a1ee873e1 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -[role=button] { +a[role=button] { cursor: pointer; } From 0fc548518e0a6f53f70ea0a3359dde927af6caf2 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sat, 9 Mar 2024 06:46:03 +0700 Subject: [PATCH 6326/8282] fix: make css button for vars --- admin/css/debug-toolbar/toolbar.scss | 10 +++++----- system/Debug/Toolbar/Views/toolbar.css | 9 +++++---- system/Debug/Toolbar/Views/toolbar.tpl.php | 14 +++++++------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index dfcb7e58aeea..e129a4b1c5b6 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -13,10 +13,6 @@ @import '_mixins'; @import '_settings'; -a[role="button"] { - cursor: pointer; -} - // DEBUG ICON // ========================================================================== */ @@ -39,7 +35,6 @@ a[role="button"] { clear: both; text-align: center; - // Cursor cursor: pointer; a svg { @@ -62,6 +57,10 @@ a[role="button"] { // DEBUG BAR // ========================================================================== */ +.debug-bar-vars { + cursor: pointer; +} + #debug-bar { // Position bottom: 0; @@ -247,6 +246,7 @@ a[role="button"] { #debug-bar-link { display: flex; padding: 6px; + cursor: pointer; } // The toolbar menus diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index 612a1ee873e1..4154f4c5c4ca 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -6,10 +6,6 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -a[role=button] { - cursor: pointer; -} - #debug-icon { bottom: 0; position: fixed; @@ -36,6 +32,10 @@ a[role=button] { display: none; } +.debug-bar-vars { + cursor: pointer; +} + #debug-bar { bottom: 0; left: 0; @@ -175,6 +175,7 @@ a[role=button] { #debug-bar #debug-bar-link { display: flex; padding: 6px; + cursor: pointer; } #debug-bar .ci-label { display: inline-flex; diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php index 4bae5b54c7c7..03500456757e 100644 --- a/system/Debug/Toolbar/Views/toolbar.tpl.php +++ b/system/Debug/Toolbar/Views/toolbar.tpl.php @@ -124,7 +124,7 @@ $items) : ?> - +

        @@ -148,7 +148,7 @@ - +

        Session User Data

         @@ -174,7 +174,7 @@

        Request ( )

        - +

        $_GET

         @@ -191,7 +191,7 @@ - +

        $_POST

         @@ -208,7 +208,7 @@ - +

        Headers

         @@ -225,7 +225,7 @@ - +

        Cookies

         @@ -246,7 +246,7 @@ - +

        Headers

         From ee1eb7c5b0367b0cbba323127323b1e3a11bbced Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 10 Mar 2024 17:28:20 +0900 Subject: [PATCH 6327/8282] fix: save() does not determine that data with an empty string id is a new record --- system/BaseModel.php | 2 +- tests/system/Models/SaveModelTest.php | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/system/BaseModel.php b/system/BaseModel.php index 8cc4cca3ba43..192e47a5cc6b 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -731,7 +731,7 @@ protected function shouldUpdate($row): bool { $id = $this->getIdValue($row); - return ! ($id === null || $id === []); + return ! ($id === null || $id === [] || $id === ''); } /** diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php index b50c79599756..a4cdec41b829 100644 --- a/tests/system/Models/SaveModelTest.php +++ b/tests/system/Models/SaveModelTest.php @@ -42,6 +42,24 @@ public function testSaveNewRecordObject(): void $this->seeInDatabase('job', ['name' => 'Magician']); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/8613 + */ + public function testSaveNewRecordArrayWithEmptyStringId(): void + { + $this->createModel(JobModel::class); + + $data = [ + 'id' => '', + 'name' => 'Magician', + 'description' => 'Makes peoples things dissappear.', + ]; + + $this->model->save($data); + + $this->seeInDatabase('job', ['name' => 'Magician']); + } + public function testSaveNewRecordArray(): void { $this->createModel(JobModel::class); From c85cd6d0c4946d380065b9f348dc1598bc66ffc6 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Sun, 31 Dec 2023 02:19:02 +0800 Subject: [PATCH 6328/8282] test: ensure cleanup of sqlite3 db files after test --- tests/system/Database/Live/SQLite3/GetFieldDataTest.php | 2 +- tests/system/Database/Live/SQLite3/GetIndexDataTest.php | 2 +- tests/system/Database/Migrations/MigrationRunnerTest.php | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php index 319706a90e53..f2e6b7244511 100644 --- a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php +++ b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php @@ -32,7 +32,7 @@ protected function createForge(): void 'database' => 'database.db', 'DBDebug' => true, ]; - $this->db = db_connect($config); + $this->db = db_connect($config, false); $this->forge = Database::forge($config); } diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php index cf05b7a7f07b..4fa2a4f31167 100644 --- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php @@ -45,7 +45,7 @@ protected function setUp(): void 'database' => 'database.db', 'DBDebug' => true, ]; - $this->db = db_connect($config); + $this->db = db_connect($config, false); $this->forge = Database::forge($config); } diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index aac42778b9f8..af9fa2a6104f 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -470,6 +470,10 @@ public function testMigrationUsesSameConnectionAsMigrationRunner(): void $this->assertCount(2, $tables); $this->assertSame('migrations', $tables[0]); $this->assertSame('foo', $tables[1]); + + if (is_file($config['database'])) { + unlink($config['database']); + } } protected function resetTables($db = null): void From 132226550a181899852326e7479e2f27c6aea7b8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Mar 2024 16:46:25 +0900 Subject: [PATCH 6329/8282] refactor: remove deprecated Request::$proxyIPs --- system/HTTP/Request.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php index 007b0fcc56c9..28c9a8878aac 100644 --- a/system/HTTP/Request.php +++ b/system/HTTP/Request.php @@ -24,15 +24,6 @@ class Request extends OutgoingRequest implements RequestInterface { use RequestTrait; - /** - * Proxy IPs - * - * @var array - * - * @deprecated 4.0.5 No longer used. Check the App config directly - */ - protected $proxyIPs; - /** * Constructor. * From e4a7e79f09d080ec2dd0deb18a055910dd4272b6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Mar 2024 16:47:12 +0900 Subject: [PATCH 6330/8282] refactor: move IncomingRequest::$config to RequestTrait::$config --- system/HTTP/IncomingRequest.php | 8 -------- system/HTTP/Request.php | 6 +++--- system/HTTP/RequestTrait.php | 9 ++++++++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index 40da9056b963..b826f9b4ae1d 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -121,13 +121,6 @@ class IncomingRequest extends Request */ protected $validLocales = []; - /** - * Configuration settings. - * - * @var App - */ - protected $config; - /** * Holds the old data from a redirect. * @@ -172,7 +165,6 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U $body = null; } - $this->config = $config; $this->uri = $uri; $this->body = $body; $this->userAgent = $userAgent; diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php index 28c9a8878aac..125646b6c7c7 100644 --- a/system/HTTP/Request.php +++ b/system/HTTP/Request.php @@ -28,11 +28,11 @@ class Request extends OutgoingRequest implements RequestInterface * Constructor. * * @param App $config - * - * @deprecated 4.0.5 The $config is no longer needed and will be removed in a future version */ - public function __construct($config = null) // @phpstan-ignore-line + public function __construct($config = null) { + $this->config = $config ?? config(App::class); + if (empty($this->method)) { $this->method = $this->getServer('REQUEST_METHOD') ?? Method::GET; } diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php index ca3d0e550945..3f935ea6ab4c 100644 --- a/system/HTTP/RequestTrait.php +++ b/system/HTTP/RequestTrait.php @@ -27,6 +27,13 @@ */ trait RequestTrait { + /** + * Configuration settings. + * + * @var App + */ + protected $config; + /** * IP address of the current user. * @@ -61,7 +68,7 @@ public function getIPAddress(): string 'valid_ip', ]; - $proxyIPs = config(App::class)->proxyIPs; + $proxyIPs = $this->config->proxyIPs; if (! empty($proxyIPs) && (! is_array($proxyIPs) || is_int(array_key_first($proxyIPs)))) { throw new ConfigException( From 35a2ec4b8f687bcca47e44d6c230d8d6d6687e91 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Mar 2024 16:50:43 +0900 Subject: [PATCH 6331/8282] refactor: remove deprecated IncomingRequest::$enableCSRF --- system/HTTP/IncomingRequest.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index b826f9b4ae1d..ea0bc3c847d5 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -49,18 +49,6 @@ */ class IncomingRequest extends Request { - /** - * Enable CSRF flag - * - * Enables a CSRF cookie token to be set. - * Set automatically based on Config setting. - * - * @var bool - * - * @deprecated Not used - */ - protected $enableCSRF = false; - /** * The URI for this request. * From 5ef64a0f5b988b15504362124e6443615df0b8b5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Mar 2024 16:59:28 +0900 Subject: [PATCH 6332/8282] refactor: remove deprecated IncomingRequest::removeRelativeDirectory() --- system/HTTP/IncomingRequest.php | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index ea0bc3c847d5..20f3804fb713 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -909,18 +909,4 @@ public function getFile(string $fileID) return $this->files->getFile($fileID); } - - /** - * Remove relative directory (../) and multi slashes (///) - * - * Do some final cleaning of the URI and return it, currently only used in static::_parse_request_uri() - * - * @deprecated 4.1.2 Use URI::removeDotSegments() directly - */ - protected function removeRelativeDirectory(string $uri): string - { - $uri = URI::removeDotSegments($uri); - - return $uri === '/' ? $uri : ltrim($uri, '/'); - } } From 6683b65bd8647cd4d57b845666bd384e57f20e93 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 11 Mar 2024 17:30:00 +0900 Subject: [PATCH 6333/8282] docs: add changelog --- user_guide_src/source/changelogs/v4.5.0.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index 11c5a755c0ad..f0b24389f329 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -329,6 +329,9 @@ Request has been removed. - The visibility of the deprecated properties ``$uri`` and ``$config`` in ``IncomingRequest`` has been changed to protected. +- The ``$enableCSRF`` property in ``IncomingRequest`` has been removed. +- The ``removeRelativeDirectory()`` method in ``IncomingRequest`` has been removed. +- The ``$proxyIPs`` property in ``Request`` has been removed. Filters ------- From 25e3a74e1c5981967f3d1374f707457273057cc8 Mon Sep 17 00:00:00 2001 From: justbyitself <160424955+justbyitself@users.noreply.github.com> Date: Mon, 11 Mar 2024 12:25:55 +0100 Subject: [PATCH 6334/8282] refactor: Replace PHP_VERSION by PHP_VERSION_ID PHP_VERSION_ID is prefered at CodeIgniter4 repository. --- system/Autoloader/Autoloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 2f9b13c0b818..99c7079edcd2 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -346,7 +346,7 @@ public function sanitizeFilename(string $filename): string ); } if ($result === false) { - if (version_compare(PHP_VERSION, '8.0.0', '>=')) { + if (PHP_VERSION_ID >= 80000) { $message = preg_last_error_msg(); } else { $message = 'Regex error. error code: ' . preg_last_error(); From 6bcd1011e755675d9294efbf8f35545a8704ab94 Mon Sep 17 00:00:00 2001 From: justbyitself <160424955+justbyitself@users.noreply.github.com> Date: Mon, 11 Mar 2024 13:16:34 +0100 Subject: [PATCH 6335/8282] chore: add version-compare-func-call-to-constant rule Add Rector rule in order to replace PHP_VERSION by PHP_VERSION_ID. @samsonasik suggestion: https://github.com/codeigniter4/CodeIgniter4/pull/8619 --- rector.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rector.php b/rector.php index 6ee2738f2618..2c888f0c80ea 100644 --- a/rector.php +++ b/rector.php @@ -18,6 +18,7 @@ use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector; use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector; use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector; +use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; use Rector\CodeQuality\Rector\If_\CombineIfRector; use Rector\CodeQuality\Rector\If_\ShortenElseIfRector; @@ -149,6 +150,7 @@ $rectorConfig->rule(CompleteDynamicPropertiesRector::class); $rectorConfig->rule(BooleanInIfConditionRuleFixerRector::class); $rectorConfig->rule(SingleInArrayToCompareRector::class); + $rectorConfig->rule(VersionCompareFuncCallToConstantRector::class); $rectorConfig ->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [ From f3e53914b770a243da86890427d08cb1c6f41e70 Mon Sep 17 00:00:00 2001 From: justbyitself Date: Mon, 11 Mar 2024 22:52:34 +0100 Subject: [PATCH 6336/8282] refactor: apply cs-fix and rector --- rector.php | 2 +- system/Autoloader/Autoloader.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/rector.php b/rector.php index 2c888f0c80ea..5e19e8e01413 100644 --- a/rector.php +++ b/rector.php @@ -18,7 +18,6 @@ use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector; use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector; use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector; -use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; use Rector\CodeQuality\Rector\If_\CombineIfRector; use Rector\CodeQuality\Rector\If_\ShortenElseIfRector; @@ -29,6 +28,7 @@ use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector; use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; +use Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector; use Rector\Config\RectorConfig; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector; use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector; diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 99c7079edcd2..088c850efa58 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -346,11 +346,7 @@ public function sanitizeFilename(string $filename): string ); } if ($result === false) { - if (PHP_VERSION_ID >= 80000) { - $message = preg_last_error_msg(); - } else { - $message = 'Regex error. error code: ' . preg_last_error(); - } + $message = PHP_VERSION_ID >= 80000 ? preg_last_error_msg() : 'Regex error. error code: ' . preg_last_error(); throw new RuntimeException($message . '. filename: "' . $filename . '"'); } From 020770011dcc4b2b8e045f7340b68635e6fabb50 Mon Sep 17 00:00:00 2001 From: justbyitself Date: Tue, 12 Mar 2024 22:53:49 +0100 Subject: [PATCH 6337/8282] refactor: apply early return pattern More readable and a bit shorter --- .../Routes/ControllerMethodReader.php | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php index 31bcde12dfb8..4365cb27dfd1 100644 --- a/system/Commands/Utilities/Routes/ControllerMethodReader.php +++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php @@ -159,19 +159,17 @@ private function getRouteWithoutController( string $classname, string $methodName ): array { - $output = []; - - if ($classShortname === $defaultController) { - $pattern = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#'; - $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/'); - $routeWithoutController = $routeWithoutController ?: '/'; - - $output[] = [ - 'route' => $routeWithoutController, - 'handler' => '\\' . $classname . '::' . $methodName, - ]; + if ($classShortname !== $defaultController) { + return []; } - return $output; + $pattern = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#'; + $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/'); + $routeWithoutController = $routeWithoutController ?: '/'; + + return [ + 'route' => $routeWithoutController, + 'handler' => '\\' . $classname . '::' . $methodName, + ]; } } From 647d20b96967f5bb6bde71097d0236bda272d5e9 Mon Sep 17 00:00:00 2001 From: justbyitself Date: Tue, 12 Mar 2024 23:17:22 +0100 Subject: [PATCH 6338/8282] refactor: apply early return pattern (fix) Fix. --- system/Commands/Utilities/Routes/ControllerMethodReader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php index 4365cb27dfd1..4a37b9560324 100644 --- a/system/Commands/Utilities/Routes/ControllerMethodReader.php +++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php @@ -167,9 +167,9 @@ private function getRouteWithoutController( $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/'); $routeWithoutController = $routeWithoutController ?: '/'; - return [ + return [[ 'route' => $routeWithoutController, 'handler' => '\\' . $classname . '::' . $methodName, - ]; + ]]; } } From ef64dfbd0dae0bbcbf0089df6138cc9ff3c01c22 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 14 Mar 2024 11:58:55 +0700 Subject: [PATCH 6339/8282] refactor: followup performance service() --- system/Common.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/Common.php b/system/Common.php index 9509cbab12da..8960775c8fc6 100644 --- a/system/Common.php +++ b/system/Common.php @@ -586,7 +586,7 @@ function helper($filenames): void { static $loaded = []; - $loader = Services::locator(); + $loader = service('locator'); if (! is_array($filenames)) { $filenames = [$filenames]; @@ -801,7 +801,7 @@ function log_message(string $level, string $message, array $context = []) return; } - Services::logger(true)->log($level, $message, $context); // @codeCoverageIgnore + service('logger')->log($level, $message, $context); // @codeCoverageIgnore } } @@ -866,7 +866,7 @@ function old(string $key, $default = null, $escape = 'html') */ function redirect(?string $route = null): RedirectResponse { - $response = Services::redirectresponse(null, true); + $response = service('redirectresponse'); if ($route !== null) { return $response->route($route); @@ -1177,7 +1177,7 @@ function timer(?string $name = null, ?callable $callable = null) */ function view(string $name, array $data = [], array $options = []): string { - $renderer = Services::renderer(); + $renderer = service('renderer'); $config = config(View::class); $saveData = $config->saveData; From dffec7fb30225aad7c4475412b9b643b31533c0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:44:53 +0000 Subject: [PATCH 6340/8282] chore(deps-dev): update rector/rector requirement from 1.0.2 to 1.0.3 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/1.0.2...1.0.3) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5a4455125bc8..4021508a3a87 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "phpunit/phpcov": "^8.2", "phpunit/phpunit": "^9.1", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "1.0.2", + "rector/rector": "1.0.3", "vimeo/psalm": "^5.0" }, "replace": { From c7c6ff00b2e474aaa94259ef68c7dc14f5688da6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:44:29 +0900 Subject: [PATCH 6341/8282] chore: update test-deptrac.yml --- .github/workflows/test-deptrac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml index 67c9843f334e..0f369a5c6786 100644 --- a/.github/workflows/test-deptrac.yml +++ b/.github/workflows/test-deptrac.yml @@ -74,7 +74,7 @@ jobs: - name: Run architectural inspection run: | - sudo phive --no-progress install --global qossmic/deptrac --trust-gpg-keys B8F640134AB1782E - deptrac analyze --cache-file=build/deptrac.cache + composer require --dev qossmic/deptrac-shim + vendor/bin/deptrac analyze --cache-file=build/deptrac.cache env: GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9c38271a3057c535c1ece114cc6c9dd501911056 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 08:53:22 +0900 Subject: [PATCH 6342/8282] refactor: move footer info to top It is useful when reporting errors. --- app/Views/errors/html/debug.css | 5 +---- app/Views/errors/html/error_exception.php | 19 ++++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 98f54dbc8a01..63c3c662cbaa 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -65,13 +65,10 @@ p.lead { display: inline; } -.footer { +.environment { background: var(--dark-bg-color); color: var(--light-text-color); -} -.footer .container { border-top: 1px solid #e7e7e7; - margin-top: 1rem; text-align: center; } diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index 406b48ec6772..047c2f4cd987 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -23,6 +23,12 @@
        +
        + Displayed at — + PHP: — + CodeIgniter: -- + Environment: +

        getCode() ? ' #' . $exception->getCode() : '') ?>

        @@ -401,18 +407,5 @@

        -
        -
        - -

        - Displayed at — - PHP: — - CodeIgniter: -- - Environment: -

        - -
        -
        - From 89f7ede4ec314a20b106fc7bcaab3ba59e621191 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:14:47 +0900 Subject: [PATCH 6343/8282] fix: remove invalid letter-spacing --- app/Views/errors/html/debug.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 63c3c662cbaa..c233c6a63a3c 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -19,7 +19,6 @@ body { } h1 { font-weight: lighter; - letter-spacing: 0.8; font-size: 3rem; color: var(--dark-text-color); margin: 0; From 93fe3adafced03f237d295af6515951d2b0185a1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:16:22 +0900 Subject: [PATCH 6344/8282] refactor: remove redundant rem --- app/Views/errors/html/debug.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index c233c6a63a3c..b133b054584f 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -108,7 +108,7 @@ p.lead { } .tabs a:link, .tabs a:visited { - padding: 0rem 1rem; + padding: 0 1rem; line-height: 2.7; text-decoration: none; color: var(--dark-text-color); From 2f009ca5e2db50554d2033e4d9e90dc37fa97679 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 09:18:16 +0900 Subject: [PATCH 6345/8282] refactor: tweaks css --- app/Views/errors/html/debug.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index b133b054584f..bbff6bf84e54 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -43,7 +43,7 @@ p.lead { color: var(--dark-text-color); } .header .container { - padding: 1rem 1.75rem 1.75rem 1.75rem; + padding: 1rem; } .header h1 { font-size: 2.5rem; @@ -148,9 +148,6 @@ p.lead { border-radius: 5px; color: #31708f; } -ul, ol { - line-height: 1.8; -} table { width: 100%; From 50409e80fcada8f8ef5157918f83ddc11ced80c9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 10:54:51 +0900 Subject: [PATCH 6346/8282] refactor: remove border-top --- app/Views/errors/html/debug.css | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index bbff6bf84e54..500013df49f1 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -67,7 +67,6 @@ p.lead { .environment { background: var(--dark-bg-color); color: var(--light-text-color); - border-top: 1px solid #e7e7e7; text-align: center; } From 199e3855b72ba60e78450b59ed0b209dde2cc0b3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 11:00:50 +0900 Subject: [PATCH 6347/8282] docs: add upgrade_447 --- user_guide_src/source/installation/upgrade_447.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/user_guide_src/source/installation/upgrade_447.rst b/user_guide_src/source/installation/upgrade_447.rst index 07f85330b4ed..45eed909332e 100644 --- a/user_guide_src/source/installation/upgrade_447.rst +++ b/user_guide_src/source/installation/upgrade_447.rst @@ -16,6 +16,14 @@ Please refer to the upgrade instructions corresponding to your installation meth Mandatory File Changes ********************** +Error Files +=========== + +The error page has been updated. Please update the following files: + +- app/Views/errors/html/debug.css +- app/Views/errors/html/error_exception.php + **************** Breaking Changes **************** From d8945671f6b8cb44b210d16175dfde9a87c13eeb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 11:56:19 +0900 Subject: [PATCH 6348/8282] refactor: add padding to environment class --- app/Views/errors/html/debug.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css index 500013df49f1..6a050c8bb462 100644 --- a/app/Views/errors/html/debug.css +++ b/app/Views/errors/html/debug.css @@ -68,6 +68,7 @@ p.lead { background: var(--dark-bg-color); color: var(--light-text-color); text-align: center; + padding: 0.2rem; } .source { From 5516b731804d41e504613571cd487be2ebe9b8b1 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 15 Mar 2024 11:37:29 +0700 Subject: [PATCH 6349/8282] Update test-deptrac.yml --- .github/workflows/test-deptrac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml index 0f369a5c6786..fecb289b1b63 100644 --- a/.github/workflows/test-deptrac.yml +++ b/.github/workflows/test-deptrac.yml @@ -43,7 +43,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.1' - tools: composer, phive + tools: composer extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3 - name: Validate composer.json From 28a8009179b5019cc291e720d483a2ac2aec3611 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 18:54:13 +0900 Subject: [PATCH 6350/8282] refactor: move CodeIgniter::initializeKint() to Autoloader --- system/Autoloader/Autoloader.php | 78 ++++++++++++++++++++++++++++ system/CodeIgniter.php | 10 +++- system/Test/bootstrap.php | 1 + system/bootstrap.php | 1 + tests/system/CommonFunctionsTest.php | 7 +-- 5 files changed, 90 insertions(+), 7 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 48516e522584..07510eb57625 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -17,8 +17,13 @@ use Composer\Autoload\ClassLoader; use Composer\InstalledVersions; use Config\Autoload; +use Config\Kint as KintConfig; use Config\Modules; +use Config\Services; use InvalidArgumentException; +use Kint; +use Kint\Renderer\CliRenderer; +use Kint\Renderer\RichRenderer; use RuntimeException; /** @@ -481,4 +486,77 @@ public function loadHelpers(): void { helper($this->helpers); } + + /** + * Initializes Kint + */ + public function initializeKint(bool $debug = false): void + { + if ($debug) { + $this->autoloadKint(); + $this->configureKint(); + } elseif (class_exists(Kint::class)) { + // In case that Kint is already loaded via Composer. + Kint::$enabled_mode = false; + // @codeCoverageIgnore + } + + helper('kint'); + } + + private function autoloadKint(): void + { + // If we have KINT_DIR it means it's already loaded via composer + if (! defined('KINT_DIR')) { + spl_autoload_register(function ($class) { + $class = explode('\\', $class); + + if (array_shift($class) !== 'Kint') { + return; + } + + $file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php'; + + if (is_file($file)) { + require_once $file; + } + }); + + require_once SYSTEMPATH . 'ThirdParty/Kint/init.php'; + } + } + + private function configureKint(): void + { + $config = new KintConfig(); + + Kint::$depth_limit = $config->maxDepth; + Kint::$display_called_from = $config->displayCalledFrom; + Kint::$expanded = $config->expanded; + + if (isset($config->plugins) && is_array($config->plugins)) { + Kint::$plugins = $config->plugins; + } + + $csp = Services::csp(); + if ($csp->enabled()) { + RichRenderer::$js_nonce = $csp->getScriptNonce(); + RichRenderer::$css_nonce = $csp->getStyleNonce(); + } + + RichRenderer::$theme = $config->richTheme; + RichRenderer::$folder = $config->richFolder; + RichRenderer::$sort = $config->richSort; + if (isset($config->richObjectPlugins) && is_array($config->richObjectPlugins)) { + RichRenderer::$value_plugins = $config->richObjectPlugins; + } + if (isset($config->richTabPlugins) && is_array($config->richTabPlugins)) { + RichRenderer::$tab_plugins = $config->richTabPlugins; + } + + CliRenderer::$cli_colors = $config->cliColors; + CliRenderer::$force_utf8 = $config->cliForceUTF8; + CliRenderer::$detect_width = $config->cliDetectWidth; + CliRenderer::$min_terminal_width = $config->cliMinWidth; + } } diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index f126878689b9..9521239a1c7d 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -202,8 +202,6 @@ public function initialize() // Set default timezone on the server date_default_timezone_set($this->config->appTimezone ?? 'UTC'); - - $this->initializeKint(); } /** @@ -240,6 +238,8 @@ protected function resolvePlatformExtensions() * Initializes Kint * * @return void + * + * @deprecated 4.5.0 Moved to Autoloader. */ protected function initializeKint() { @@ -255,6 +255,9 @@ protected function initializeKint() helper('kint'); } + /** + * @deprecated 4.5.0 Moved to Autoloader. + */ private function autoloadKint(): void { // If we have KINT_DIR it means it's already loaded via composer @@ -277,6 +280,9 @@ private function autoloadKint(): void } } + /** + * @deprecated 4.5.0 Moved to Autoloader. + */ private function configureKint(): void { $config = new KintConfig(); diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 8b992be9f884..a8ef6b01b0b9 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -78,6 +78,7 @@ // Initialize and register the loader with the SPL autoloader stack. Services::autoloader()->initialize(new Autoload(), new Modules())->register(); Services::autoloader()->loadHelpers(); +Services::autoloader()->initializeKint(CI_DEBUG); // Now load Composer's if it's available if (is_file(COMPOSER_PATH)) { diff --git a/system/bootstrap.php b/system/bootstrap.php index e03fd570ca4c..b89689644389 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -106,3 +106,4 @@ // Initialize and register the loader with the SPL autoloader stack. Services::autoloader()->initialize(new Autoload(), new Modules())->register(); Services::autoloader()->loadHelpers(); +Services::autoloader()->initializeKint(CI_DEBUG); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index e583b8a67194..a31e73c749cf 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -26,7 +26,6 @@ use CodeIgniter\Session\Handlers\FileHandler; use CodeIgniter\Session\Session; use CodeIgniter\Test\CIUnitTestCase; -use CodeIgniter\Test\Mock\MockCodeIgniter; use CodeIgniter\Test\Mock\MockIncomingRequest; use CodeIgniter\Test\Mock\MockSecurity; use CodeIgniter\Test\Mock\MockSession; @@ -710,8 +709,7 @@ public function testDWithCSP(): void $config->CSPEnabled = true; // Initialize Kint - $app = new MockCodeIgniter($config); - $app->initialize(); + Services::autoloader()->initializeKint(CI_DEBUG); $cliDetection = Kint::$cli_detection; Kint::$cli_detection = false; @@ -736,8 +734,7 @@ public function testTraceWithCSP(): void $config->CSPEnabled = true; // Initialize Kint - $app = new MockCodeIgniter($config); - $app->initialize(); + Services::autoloader()->initializeKint(CI_DEBUG); Kint::$cli_detection = false; From 470dace722315e649ef4376de2022f4ba95909ce Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 18:55:59 +0900 Subject: [PATCH 6351/8282] docs: remove unneeded @var --- system/bootstrap.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/system/bootstrap.php b/system/bootstrap.php index b89689644389..6b7e94a2b0f6 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -26,11 +26,10 @@ * so they are available in the config files that are loaded. */ +/** @var Paths $paths */ + // The path to the application directory. if (! defined('APPPATH')) { - /** - * @var Paths $paths - */ define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } @@ -41,25 +40,16 @@ // The path to the system directory. if (! defined('SYSTEMPATH')) { - /** - * @var Paths $paths - */ define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } // The path to the writable directory. if (! defined('WRITEPATH')) { - /** - * @var Paths $paths - */ define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } // The path to the tests directory if (! defined('TESTPATH')) { - /** - * @var Paths $paths - */ define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } From 4e602a66f33295caf2b105db9cce694252805b39 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 19:34:27 +0900 Subject: [PATCH 6352/8282] refactor: move CodeIgniter::bootstrapEnvironment() to bootstrap.php --- public/index.php | 14 ++++++++------ spark | 14 ++++++++------ system/CodeIgniter.php | 5 ++--- system/Test/bootstrap.php | 9 +++++++++ system/bootstrap.php | 21 +++++++++++++++++++++ 5 files changed, 48 insertions(+), 15 deletions(-) diff --git a/public/index.php b/public/index.php index 8cf5ce347c82..6d78241411ba 100644 --- a/public/index.php +++ b/public/index.php @@ -36,18 +36,20 @@ $paths = new Config\Paths(); -// Location of the framework bootstrap file. -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; - // Load environment settings from .env files into $_SERVER and $_ENV -require_once SYSTEMPATH . 'Config/DotEnv.php'; -(new CodeIgniter\Config\DotEnv(ROOTPATH))->load(); +require_once $paths->systemDirectory . '/Config/DotEnv.php'; +(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); // Define ENVIRONMENT if (! defined('ENVIRONMENT')) { - define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production')); + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); } +// Location of the framework bootstrap file. +require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; + // Load Config Cache // $factoriesCache = new \CodeIgniter\Cache\FactoriesCache(); // $factoriesCache->load('config'); diff --git a/spark b/spark index adbd43fafd63..1d4293f59a1a 100755 --- a/spark +++ b/spark @@ -64,18 +64,20 @@ require FCPATH . '../app/Config/Paths.php'; $paths = new Config\Paths(); -// Location of the framework bootstrap file. -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; - // Load environment settings from .env files into $_SERVER and $_ENV -require_once SYSTEMPATH . 'Config/DotEnv.php'; -(new CodeIgniter\Config\DotEnv(ROOTPATH))->load(); +require_once $paths->systemDirectory . '/Config/DotEnv.php'; +(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); // Define ENVIRONMENT if (! defined('ENVIRONMENT')) { - define('ENVIRONMENT', env('CI_ENVIRONMENT', 'production')); + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); } +// Location of the framework bootstrap file. +require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; + // Grab our CodeIgniter $app = Config\Services::codeigniter(); $app->initialize(); diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 9521239a1c7d..3b92da4362cf 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -186,9 +186,6 @@ public function __construct(App $config) */ public function initialize() { - // Define environment variables - $this->bootstrapEnvironment(); - // Setup Exception Handling Services::exceptions()->initialize(); @@ -584,6 +581,8 @@ protected function detectEnvironment() * is wrong. At the very least, they should have error reporting setup. * * @return void + * + * @deprecated 4.5.0 Moved to system/bootstrap.php. */ protected function bootstrapEnvironment() { diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index a8ef6b01b0b9..7d67acd070a6 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -39,6 +39,10 @@ require CONFIGPATH . 'Paths.php'; $paths = new Paths(); +// Load environment settings from .env files into $_SERVER and $_ENV +require_once $paths->systemDirectory . '/Config/DotEnv.php'; +(new DotEnv($paths->appDirectory . '/../'))->load(); + // Define necessary framework path constants defined('APPPATH') || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); defined('WRITEPATH') || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); @@ -51,6 +55,11 @@ defined('COMPOSER_PATH') || define('COMPOSER_PATH', (string) realpath(HOMEPATH . 'vendor/autoload.php')); defined('VENDORPATH') || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR); +// Load environment bootstrap +if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { + require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +} + // Load Common.php from App then System if (is_file(APPPATH . 'Common.php')) { require_once APPPATH . 'Common.php'; diff --git a/system/bootstrap.php b/system/bootstrap.php index 6b7e94a2b0f6..fef24bd9807f 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -53,6 +53,27 @@ define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } +/* + * --------------------------------------------------------------- + * LOAD ENVIRONMENT BOOTSTRAP + * --------------------------------------------------------------- + * + * Load any custom boot files based upon the current environment. + * If no boot file exists, we shouldn't continue because something + * is wrong. At the very least, they should have error reporting setup. + */ + +if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { + require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +} else { + // @codeCoverageIgnoreStart + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo 'The application environment is not set correctly.'; + + exit(EXIT_ERROR); // EXIT_ERROR + // @codeCoverageIgnoreEnd +} + /* * --------------------------------------------------------------- * GRAB OUR CONSTANTS & COMMON From 85adb5b655d3f4b285d5adb25e381a2ec22d03e6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 21:21:55 +0900 Subject: [PATCH 6353/8282] docs: remove meaningless @codeCoverageIgnore --- system/Autoloader/Autoloader.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 07510eb57625..c8c1767a9d83 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -498,7 +498,6 @@ public function initializeKint(bool $debug = false): void } elseif (class_exists(Kint::class)) { // In case that Kint is already loaded via Composer. Kint::$enabled_mode = false; - // @codeCoverageIgnore } helper('kint'); From c1575909b8fb2f453851d18f169f6ebebbf23e34 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 21:38:41 +0900 Subject: [PATCH 6354/8282] docs: add comment headings --- public/index.php | 20 ++++++++++++++++---- spark | 43 ++++++++++++++++++++++++++++++++++++------- system/bootstrap.php | 8 +++++++- 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/public/index.php b/public/index.php index 6d78241411ba..9132d097e769 100644 --- a/public/index.php +++ b/public/index.php @@ -1,6 +1,11 @@ systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); -// Define ENVIRONMENT +// DEFINE ENVIRONMENT if (! defined('ENVIRONMENT')) { $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); define('ENVIRONMENT', ($env !== false) ? $env : 'production'); unset($env); } -// Location of the framework bootstrap file. +// LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; // Load Config Cache diff --git a/spark b/spark index 1d4293f59a1a..5d93cd5eec06 100755 --- a/spark +++ b/spark @@ -12,7 +12,7 @@ /* * -------------------------------------------------------------------- - * CodeIgniter command-line tools + * CODEIGNITER COMMAND-LINE TOOLS * -------------------------------------------------------------------- * The main entry point into the CLI system and allows you to run * commands and perform maintenance on your application. @@ -26,7 +26,12 @@ if (strpos(PHP_SAPI, 'cgi') === 0) { exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n"); } -// Check PHP version. +/* + *--------------------------------------------------------------- + * CHECK PHP VERSION + *--------------------------------------------------------------- + */ + $minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`. if (version_compare(PHP_VERSION, $minPhpVersion, '<')) { $message = sprintf( @@ -42,6 +47,12 @@ if (version_compare(PHP_VERSION, $minPhpVersion, '<')) { error_reporting(E_ALL); ini_set('display_errors', '1'); +/* + *--------------------------------------------------------------- + * SET THE CURRENT DIRECTORY + *--------------------------------------------------------------- + */ + // Path to the front controller define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR); @@ -57,34 +68,46 @@ chdir(FCPATH); * and fires up an environment-specific bootstrapping. */ -// Load our paths config file +// LOAD OUR PATHS CONFIG FILE // This is the line that might need to be changed, depending on your folder structure. require FCPATH . '../app/Config/Paths.php'; // ^^^ Change this line if you move your application folder $paths = new Config\Paths(); +// LOAD DOTENV FILE // Load environment settings from .env files into $_SERVER and $_ENV require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); -// Define ENVIRONMENT +// DEFINE ENVIRONMENT if (! defined('ENVIRONMENT')) { $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); define('ENVIRONMENT', ($env !== false) ? $env : 'production'); unset($env); } -// Location of the framework bootstrap file. +// LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; -// Grab our CodeIgniter +/* + * --------------------------------------------------------------- + * GRAB OUR CODEIGNITER INSTANCE + * --------------------------------------------------------------- + */ + $app = Config\Services::codeigniter(); $app->initialize(); -// Grab our Console +/* + * --------------------------------------------------------------- + * GRAB OUR CONSOLE + * --------------------------------------------------------------- + */ + $console = new CodeIgniter\CLI\Console(); +// SHOW HEADER // Show basic information before we do anything else. if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) { unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore @@ -93,6 +116,12 @@ if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) { $console->showHeader($suppress); +/* + *--------------------------------------------------------------- + * EXECUTE THE COMMAND + *--------------------------------------------------------------- + */ + // fire off the command in the main framework. $exit = $console->run(); diff --git a/system/bootstrap.php b/system/bootstrap.php index fef24bd9807f..50cc24043318 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -76,7 +76,7 @@ /* * --------------------------------------------------------------- - * GRAB OUR CONSTANTS & COMMON + * GRAB OUR CONSTANTS * --------------------------------------------------------------- */ @@ -84,6 +84,12 @@ require_once APPPATH . 'Config/Constants.php'; } +/* + * --------------------------------------------------------------- + * LOAD COMMON FUNCTIONS + * --------------------------------------------------------------- + */ + // Require app/Common.php file if exists. if (is_file(APPPATH . 'Common.php')) { require_once APPPATH . 'Common.php'; From e670df1ed958674cdfeb2a3f74e00d364fd7981d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 22:11:26 +0900 Subject: [PATCH 6355/8282] refactor: move DEFINE ENVIRONMENT to bootstrap.php --- public/index.php | 7 ------- spark | 7 ------- system/bootstrap.php | 12 ++++++++++++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/public/index.php b/public/index.php index 9132d097e769..9df0b8e86a67 100644 --- a/public/index.php +++ b/public/index.php @@ -52,13 +52,6 @@ require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); -// DEFINE ENVIRONMENT -if (! defined('ENVIRONMENT')) { - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); -} - // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; diff --git a/spark b/spark index 5d93cd5eec06..16af4a543c52 100755 --- a/spark +++ b/spark @@ -80,13 +80,6 @@ $paths = new Config\Paths(); require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); -// DEFINE ENVIRONMENT -if (! defined('ENVIRONMENT')) { - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); -} - // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; diff --git a/system/bootstrap.php b/system/bootstrap.php index 50cc24043318..dcb074242251 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -16,6 +16,18 @@ use Config\Paths; use Config\Services; +/* + * --------------------------------------------------------------- + * DEFINE ENVIRONMENT + * --------------------------------------------------------------- + */ + +if (! defined('ENVIRONMENT')) { + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); +} + /* * --------------------------------------------------------------- * SETUP OUR PATH CONSTANTS From 66c81bcc131f3d29d91b34c3a1b1c937887eaed3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 22:17:45 +0900 Subject: [PATCH 6356/8282] refactor: move Services::exceptions()->initialize() to bootstrap.php --- system/CodeIgniter.php | 3 --- system/Test/bootstrap.php | 5 +++++ system/bootstrap.php | 10 ++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 3b92da4362cf..706e8404c945 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -186,9 +186,6 @@ public function __construct(App $config) */ public function initialize() { - // Setup Exception Handling - Services::exceptions()->initialize(); - // Run this check for manual installations if (! is_file(COMPOSER_PATH)) { $this->resolvePlatformExtensions(); // @codeCoverageIgnore diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 7d67acd070a6..15b1b8cc4b2d 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -87,6 +87,11 @@ // Initialize and register the loader with the SPL autoloader stack. Services::autoloader()->initialize(new Autoload(), new Modules())->register(); Services::autoloader()->loadHelpers(); + +// Setup Exception Handling +Services::exceptions()->initialize(); + +// Initialize Kint Services::autoloader()->initializeKint(CI_DEBUG); // Now load Composer's if it's available diff --git a/system/bootstrap.php b/system/bootstrap.php index dcb074242251..58f8d645a748 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -135,4 +135,14 @@ // Initialize and register the loader with the SPL autoloader stack. Services::autoloader()->initialize(new Autoload(), new Modules())->register(); Services::autoloader()->loadHelpers(); + +/* + * --------------------------------------------------------------- + * SET EXCEPTION AND ERROR HANDLERS + * --------------------------------------------------------------- + */ + +Services::exceptions()->initialize(); + +// Initialize Kint Services::autoloader()->initializeKint(CI_DEBUG); From 83c15b90de3496f6360f1b1d793b78f07c6568e1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 22:23:48 +0900 Subject: [PATCH 6357/8282] refactor: move CodeIgniter::resolvePlatformExtensions() to bootstrap.php --- system/CodeIgniter.php | 7 ++----- system/bootstrap.php | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 706e8404c945..99a230e88436 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -186,11 +186,6 @@ public function __construct(App $config) */ public function initialize() { - // Run this check for manual installations - if (! is_file(COMPOSER_PATH)) { - $this->resolvePlatformExtensions(); // @codeCoverageIgnore - } - // Set default locale on the server Locale::setDefault($this->config->defaultLocale ?? 'en'); @@ -206,6 +201,8 @@ public function initialize() * @throws FrameworkException * * @codeCoverageIgnore + * + * @deprecated 4.5.0 Moved to system/bootstrap.php. */ protected function resolvePlatformExtensions() { diff --git a/system/bootstrap.php b/system/bootstrap.php index 58f8d645a748..617492428b55 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -11,6 +11,7 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Exceptions\FrameworkException; use Config\Autoload; use Config\Modules; use Config\Paths; @@ -144,5 +145,37 @@ Services::exceptions()->initialize(); -// Initialize Kint +/* + * --------------------------------------------------------------- + * CHECK SYSTEM FOR MISSING REQUIRED PHP EXTENSIONS + * --------------------------------------------------------------- + */ + +// Run this check for manual installations +if (! is_file(COMPOSER_PATH)) { + $requiredExtensions = [ + 'intl', + 'json', + 'mbstring', + ]; + + $missingExtensions = []; + + foreach ($requiredExtensions as $extension) { + if (! extension_loaded($extension)) { + $missingExtensions[] = $extension; + } + } + + if ($missingExtensions !== []) { + throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions)); + } +} + +/* + * --------------------------------------------------------------- + * INITIALIZE KINT + * --------------------------------------------------------------- + */ + Services::autoloader()->initializeKint(CI_DEBUG); From fb00173561710b359640fe8ca8185dfd56954c3f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 18 Feb 2024 22:44:34 +0900 Subject: [PATCH 6358/8282] refactor: remove variables --- system/bootstrap.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/system/bootstrap.php b/system/bootstrap.php index 617492428b55..058160dd75b4 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -153,15 +153,13 @@ // Run this check for manual installations if (! is_file(COMPOSER_PATH)) { - $requiredExtensions = [ + $missingExtensions = []; + + foreach ([ 'intl', 'json', 'mbstring', - ]; - - $missingExtensions = []; - - foreach ($requiredExtensions as $extension) { + ] as $extension) { if (! extension_loaded($extension)) { $missingExtensions[] = $extension; } @@ -170,6 +168,8 @@ if ($missingExtensions !== []) { throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions)); } + + unset($missingExtensions); } /* From a87af65a53030a9b2b517ed4256d847f95728921 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 07:13:38 +0900 Subject: [PATCH 6359/8282] refactor: match test/bootstrap to system/bootstrap as much as possible --- system/Test/bootstrap.php | 127 +++++++++++++++++++++++++++++--------- 1 file changed, 99 insertions(+), 28 deletions(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 15b1b8cc4b2d..4c9380b82b67 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -21,11 +21,52 @@ ini_set('display_errors', '1'); ini_set('display_startup_errors', '1'); +/* + * --------------------------------------------------------------- + * DEFINE ENVIRONMENT + * --------------------------------------------------------------- + */ + // Make sure it recognizes that we're testing. $_SERVER['CI_ENVIRONMENT'] = 'testing'; define('ENVIRONMENT', 'testing'); + defined('CI_DEBUG') || define('CI_DEBUG', true); +/* + *--------------------------------------------------------------- + * BOOTSTRAP THE APPLICATION + *--------------------------------------------------------------- + * This process sets up the path constants, loads and registers + * our autoloader, along with Composer's, loads our constants + * and fires up an environment-specific bootstrapping. + */ + +// LOAD OUR PATHS CONFIG FILE +// Load framework paths from their config file +require CONFIGPATH . 'Paths.php'; +$paths = new Paths(); + +// LOAD DOTENV FILE +// Load environment settings from .env files into $_SERVER and $_ENV +require_once $paths->systemDirectory . '/Config/DotEnv.php'; +(new DotEnv($paths->appDirectory . '/../'))->load(); + +// Set environment values that would otherwise stop the framework from functioning during tests. +if (! isset($_SERVER['app.baseURL'])) { + $_SERVER['app.baseURL'] = 'http://example.com/'; +} + +/* + * --------------------------------------------------------------- + * SETUP OUR PATH CONSTANTS + * --------------------------------------------------------------- + * + * The path constants provide convenient access to the folders + * throughout the application. We have to setup them up here + * so they are available in the config files that are loaded. + */ + // Often these constants are pre-defined, but query the current directory structure as a fallback defined('HOMEPATH') || define('HOMEPATH', realpath(rtrim(getcwd(), '\\/ ')) . DIRECTORY_SEPARATOR); $source = is_dir(HOMEPATH . 'app') @@ -35,31 +76,48 @@ defined('PUBLICPATH') || define('PUBLICPATH', realpath($source . 'public') . DIRECTORY_SEPARATOR); unset($source); -// Load framework paths from their config file -require CONFIGPATH . 'Paths.php'; -$paths = new Paths(); +// Define necessary framework path constants +defined('APPPATH') || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); +defined('ROOTPATH') || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR); +defined('SYSTEMPATH') || define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/')) . DIRECTORY_SEPARATOR); +defined('WRITEPATH') || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); +defined('TESTPATH') || define('TESTPATH', realpath(HOMEPATH . 'tests/') . DIRECTORY_SEPARATOR); -// Load environment settings from .env files into $_SERVER and $_ENV -require_once $paths->systemDirectory . '/Config/DotEnv.php'; -(new DotEnv($paths->appDirectory . '/../'))->load(); +defined('CIPATH') || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR); +defined('FCPATH') || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR); -// Define necessary framework path constants -defined('APPPATH') || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); -defined('WRITEPATH') || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); -defined('SYSTEMPATH') || define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/')) . DIRECTORY_SEPARATOR); -defined('ROOTPATH') || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR); -defined('CIPATH') || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR); -defined('FCPATH') || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR); -defined('TESTPATH') || define('TESTPATH', realpath(HOMEPATH . 'tests/') . DIRECTORY_SEPARATOR); defined('SUPPORTPATH') || define('SUPPORTPATH', realpath(TESTPATH . '_support/') . DIRECTORY_SEPARATOR); defined('COMPOSER_PATH') || define('COMPOSER_PATH', (string) realpath(HOMEPATH . 'vendor/autoload.php')); defined('VENDORPATH') || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR); -// Load environment bootstrap +/* + * --------------------------------------------------------------- + * LOAD ENVIRONMENT BOOTSTRAP + * --------------------------------------------------------------- + * + * Load any custom boot files based upon the current environment. + * If no boot file exists, we shouldn't continue because something + * is wrong. At the very least, they should have error reporting setup. + */ + if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; } +/* + * --------------------------------------------------------------- + * GRAB OUR CONSTANTS + * --------------------------------------------------------------- + */ + +require_once APPPATH . 'Config/Constants.php'; + +/* + * --------------------------------------------------------------- + * LOAD COMMON FUNCTIONS + * --------------------------------------------------------------- + */ + // Load Common.php from App then System if (is_file(APPPATH . 'Common.php')) { require_once APPPATH . 'Common.php'; @@ -67,15 +125,18 @@ require_once SYSTEMPATH . 'Common.php'; -// Set environment values that would otherwise stop the framework from functioning during tests. -if (! isset($_SERVER['app.baseURL'])) { - $_SERVER['app.baseURL'] = 'http://example.com/'; -} +/* + * --------------------------------------------------------------- + * LOAD OUR AUTOLOADER + * --------------------------------------------------------------- + * + * The autoloader allows all of the pieces to work together in the + * framework. We have to load it here, though, so that the config + * files can use the path constants. + */ -// Load necessary components require_once SYSTEMPATH . 'Config/AutoloadConfig.php'; require_once APPPATH . 'Config/Autoload.php'; -require_once APPPATH . 'Config/Constants.php'; require_once SYSTEMPATH . 'Modules/Modules.php'; require_once APPPATH . 'Config/Modules.php'; @@ -88,10 +149,20 @@ Services::autoloader()->initialize(new Autoload(), new Modules())->register(); Services::autoloader()->loadHelpers(); -// Setup Exception Handling +/* + * --------------------------------------------------------------- + * SET EXCEPTION AND ERROR HANDLERS + * --------------------------------------------------------------- + */ + Services::exceptions()->initialize(); -// Initialize Kint +/* + * --------------------------------------------------------------- + * INITIALIZE KINT + * --------------------------------------------------------------- + */ + Services::autoloader()->initializeKint(CI_DEBUG); // Now load Composer's if it's available @@ -99,10 +170,10 @@ require_once COMPOSER_PATH; } -// Load environment settings from .env files into $_SERVER and $_ENV -require_once SYSTEMPATH . 'Config/DotEnv.php'; - -$env = new DotEnv(ROOTPATH); -$env->load(); +/* + * --------------------------------------------------------------- + * LOAD ROUTES + * --------------------------------------------------------------- + */ Services::routes()->loadRoutes(); From 3c8b1c32912e539c281382a39d358b24784eb998 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 07:31:52 +0900 Subject: [PATCH 6360/8282] refactor: remove `$_SERVER['app.baseURL'] = 'http://example.com/'` The value is set by phpnit.xml.dist, and there is no need to change baseURL. --- system/Test/bootstrap.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 4c9380b82b67..c5662a2a572c 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -52,11 +52,6 @@ require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new DotEnv($paths->appDirectory . '/../'))->load(); -// Set environment values that would otherwise stop the framework from functioning during tests. -if (! isset($_SERVER['app.baseURL'])) { - $_SERVER['app.baseURL'] = 'http://example.com/'; -} - /* * --------------------------------------------------------------- * SETUP OUR PATH CONSTANTS From a1c1be271661d5de819d796794095ebca9fd49ba Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 07:41:55 +0900 Subject: [PATCH 6361/8282] refactor: remove unneeded `require_once COMPOSER_PATH` It is done in `Services::autoload()->initialize()`. --- system/Test/bootstrap.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index c5662a2a572c..73d894379736 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -160,11 +160,6 @@ Services::autoloader()->initializeKint(CI_DEBUG); -// Now load Composer's if it's available -if (is_file(COMPOSER_PATH)) { - require_once COMPOSER_PATH; -} - /* * --------------------------------------------------------------- * LOAD ROUTES From ff6a2d5e4088907db8a33df6fc6e67a9422e15b4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 07:51:07 +0900 Subject: [PATCH 6362/8282] fix: move LOAD ENVIRONMENT BOOTSTRAP to index.php This was in CodeIgniter::initialize(), so it was called only in web. --- public/index.php | 10 ++++++++++ system/bootstrap.php | 21 --------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/public/index.php b/public/index.php index 9df0b8e86a67..c266197e44be 100644 --- a/public/index.php +++ b/public/index.php @@ -52,6 +52,16 @@ require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); +// LOAD ENVIRONMENT BOOTSTRAP +if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { + require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +} else { + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo 'The application environment is not set correctly.'; + + exit(EXIT_ERROR); // EXIT_ERROR +} + // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; diff --git a/system/bootstrap.php b/system/bootstrap.php index 058160dd75b4..ce9765995c61 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -66,27 +66,6 @@ define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); } -/* - * --------------------------------------------------------------- - * LOAD ENVIRONMENT BOOTSTRAP - * --------------------------------------------------------------- - * - * Load any custom boot files based upon the current environment. - * If no boot file exists, we shouldn't continue because something - * is wrong. At the very least, they should have error reporting setup. - */ - -if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { - require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; -} else { - // @codeCoverageIgnoreStart - header('HTTP/1.1 503 Service Unavailable.', true, 503); - echo 'The application environment is not set correctly.'; - - exit(EXIT_ERROR); // EXIT_ERROR - // @codeCoverageIgnoreEnd -} - /* * --------------------------------------------------------------- * GRAB OUR CONSTANTS From 3f55c98deaef72f90ba4c0d7564a7cd786431c18 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 08:40:49 +0900 Subject: [PATCH 6363/8282] fix: move BOOTSTRAP THE APPLICATION down CONFIGPATH was not defined yet. --- system/Test/bootstrap.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 73d894379736..470c3be5909f 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -33,25 +33,6 @@ defined('CI_DEBUG') || define('CI_DEBUG', true); -/* - *--------------------------------------------------------------- - * BOOTSTRAP THE APPLICATION - *--------------------------------------------------------------- - * This process sets up the path constants, loads and registers - * our autoloader, along with Composer's, loads our constants - * and fires up an environment-specific bootstrapping. - */ - -// LOAD OUR PATHS CONFIG FILE -// Load framework paths from their config file -require CONFIGPATH . 'Paths.php'; -$paths = new Paths(); - -// LOAD DOTENV FILE -// Load environment settings from .env files into $_SERVER and $_ENV -require_once $paths->systemDirectory . '/Config/DotEnv.php'; -(new DotEnv($paths->appDirectory . '/../'))->load(); - /* * --------------------------------------------------------------- * SETUP OUR PATH CONSTANTS @@ -85,6 +66,25 @@ defined('COMPOSER_PATH') || define('COMPOSER_PATH', (string) realpath(HOMEPATH . 'vendor/autoload.php')); defined('VENDORPATH') || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR); +/* + *--------------------------------------------------------------- + * BOOTSTRAP THE APPLICATION + *--------------------------------------------------------------- + * This process sets up the path constants, loads and registers + * our autoloader, along with Composer's, loads our constants + * and fires up an environment-specific bootstrapping. + */ + +// LOAD OUR PATHS CONFIG FILE +// Load framework paths from their config file +require CONFIGPATH . 'Paths.php'; +$paths = new Paths(); + +// LOAD DOTENV FILE +// Load environment settings from .env files into $_SERVER and $_ENV +require_once $paths->systemDirectory . '/Config/DotEnv.php'; +(new DotEnv($paths->appDirectory . '/../'))->load(); + /* * --------------------------------------------------------------- * LOAD ENVIRONMENT BOOTSTRAP From a3bccfb1264200daa973f3d03b4a9f1c93a0f940 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 09:19:15 +0900 Subject: [PATCH 6364/8282] fix: add missing LOAD ENVIRONMENT BOOTSTRAP --- spark | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spark b/spark index 16af4a543c52..a166f32726c2 100755 --- a/spark +++ b/spark @@ -80,6 +80,16 @@ $paths = new Config\Paths(); require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); +// LOAD ENVIRONMENT BOOTSTRAP +if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { + require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +} else { + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo 'The application environment is not set correctly.'; + + exit(EXIT_ERROR); // EXIT_ERROR +} + // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; From 10a60e03bb320a2ed4a85a2fb6fae0286b8e9a36 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 09:32:06 +0900 Subject: [PATCH 6365/8282] fix: index.php and spark do not work --- public/index.php | 11 +++++++++-- spark | 11 +++++++++-- system/bootstrap.php | 12 ------------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/public/index.php b/public/index.php index c266197e44be..0bfbce2053fd 100644 --- a/public/index.php +++ b/public/index.php @@ -52,9 +52,16 @@ require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); +// DEFINE ENVIRONMENT +if (! defined('ENVIRONMENT')) { + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); +} + // LOAD ENVIRONMENT BOOTSTRAP -if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { - require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { + require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; } else { header('HTTP/1.1 503 Service Unavailable.', true, 503); echo 'The application environment is not set correctly.'; diff --git a/spark b/spark index a166f32726c2..6b4034131925 100755 --- a/spark +++ b/spark @@ -80,9 +80,16 @@ $paths = new Config\Paths(); require_once $paths->systemDirectory . '/Config/DotEnv.php'; (new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); +// DEFINE ENVIRONMENT +if (! defined('ENVIRONMENT')) { + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); +} + // LOAD ENVIRONMENT BOOTSTRAP -if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { - require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; +if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { + require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; } else { header('HTTP/1.1 503 Service Unavailable.', true, 503); echo 'The application environment is not set correctly.'; diff --git a/system/bootstrap.php b/system/bootstrap.php index ce9765995c61..84d52cef5cbc 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -17,18 +17,6 @@ use Config\Paths; use Config\Services; -/* - * --------------------------------------------------------------- - * DEFINE ENVIRONMENT - * --------------------------------------------------------------- - */ - -if (! defined('ENVIRONMENT')) { - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); -} - /* * --------------------------------------------------------------- * SETUP OUR PATH CONSTANTS From 793b57a3c5f1c9dfb71935c6d4769dc6cc6f0099 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 10:07:25 +0900 Subject: [PATCH 6366/8282] fix: Undefined variable $paths --- system/Test/bootstrap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 470c3be5909f..08c6b2e52519 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -52,6 +52,11 @@ defined('PUBLICPATH') || define('PUBLICPATH', realpath($source . 'public') . DIRECTORY_SEPARATOR); unset($source); +// LOAD OUR PATHS CONFIG FILE +// Load framework paths from their config file +require CONFIGPATH . 'Paths.php'; +$paths = new Paths(); + // Define necessary framework path constants defined('APPPATH') || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); defined('ROOTPATH') || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR); @@ -75,11 +80,6 @@ * and fires up an environment-specific bootstrapping. */ -// LOAD OUR PATHS CONFIG FILE -// Load framework paths from their config file -require CONFIGPATH . 'Paths.php'; -$paths = new Paths(); - // LOAD DOTENV FILE // Load environment settings from .env files into $_SERVER and $_ENV require_once $paths->systemDirectory . '/Config/DotEnv.php'; From 48307b5b427a50267ba706a33991a13f9edeef0a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 12:45:20 +0900 Subject: [PATCH 6367/8282] chore: add exlucde for PHPCPD --- .github/workflows/test-phpcpd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml index 5c89eaf4337e..c0bf72f3bf10 100644 --- a/.github/workflows/test-phpcpd.yml +++ b/.github/workflows/test-phpcpd.yml @@ -57,4 +57,5 @@ jobs: --exclude system/Debug/Exceptions.php --exclude system/HTTP/SiteURI.php --exclude system/Validation/Rules.php + --exclude system/Autoloader/Autoloader.php -- app/ public/ system/ From 46230e717b78b90da8fc43894bb2a1f89a6bb99a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 4 Mar 2024 08:04:43 +0900 Subject: [PATCH 6368/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.5.0.rst | 16 +++++++++++++-- .../source/installation/upgrade_450.rst | 20 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index f0b24389f329..caa0a3f296c9 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -451,10 +451,22 @@ Changes Deprecations ************ -- **CodeIgniter:** The ``determinePath()`` method has been deprecated. No longer - used. - **Services:** The ``BaseService::$services`` property has been deprecated. No longer used. +- **CodeIgniter:** + - The ``determinePath()`` method has been deprecated. No longer used. + - The ``resolvePlatformExtensions()`` method has been deprecated. No longer + used. It has been moved to the ``CodeIgniter\Boot::checkMissingExtensions()`` + method. + - The ``bootstrapEnvironment()`` method has been deprecated. No longer used. + It has been moved to the ``CodeIgniter\Boot::loadEnvironmentBootstrap()`` + method. + - The ``initializeKint()`` method has been deprecated. No longer used. It has + been moved to the ``Autoloader``. + - The ``autoloadKint()`` method has been deprecated. No longer used. It has + been moved to the ``Autoloader``. + - The ``configureKint()`` method has been deprecated. No longer used. It has + been moved to the ``Autoloader``. - **Response:** The constructor parameter ``$config`` has been deprecated. No longer used. - **Filters:** diff --git a/user_guide_src/source/installation/upgrade_450.rst b/user_guide_src/source/installation/upgrade_450.rst index 53498a20b301..27fe4bc67593 100644 --- a/user_guide_src/source/installation/upgrade_450.rst +++ b/user_guide_src/source/installation/upgrade_450.rst @@ -15,6 +15,26 @@ Please refer to the upgrade instructions corresponding to your installation meth Mandatory File Changes ********************** +index.php and spark +=================== + +The following files received significant changes and +**you must merge the updated versions** with your application: + +- ``public/index.php`` +- ``spark`` + +.. important:: If you don't update the above files, CodeIgniter will not work + properly after running ``composer update``. + + The upgrade procedure, for example, is as follows: + + .. code-block:: console + + composer update + cp vendor/codeigniter4/framework/public/index.php public/index.php + cp vendor/codeigniter4/framework/spark spark + Breaking Changes **************** From 3dba2bc1bffc7373f3251c1645e47bdd95abce81 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 20:36:51 +0900 Subject: [PATCH 6369/8282] docs: fix by proofreading Co-authored-by: MGatner --- system/Test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 08c6b2e52519..47d50d25bb19 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -35,7 +35,7 @@ /* * --------------------------------------------------------------- - * SETUP OUR PATH CONSTANTS + * SET UP OUR PATH CONSTANTS * --------------------------------------------------------------- * * The path constants provide convenient access to the folders From e75e128103e0d1e7d07cb6cec0329c724c38826e Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 20:38:41 +0900 Subject: [PATCH 6370/8282] docs: fix by proofreading Co-authored-by: MGatner --- system/Test/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 47d50d25bb19..776250abfac3 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -39,7 +39,7 @@ * --------------------------------------------------------------- * * The path constants provide convenient access to the folders - * throughout the application. We have to setup them up here + * throughout the application. We have to set them up here * so they are available in the config files that are loaded. */ From 458333cf9802f382e3e263c1feee04de19a6ef38 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 15 Mar 2024 20:31:22 +0900 Subject: [PATCH 6371/8282] docs: add Bootstrap change to changelog --- user_guide_src/source/changelogs/v4.5.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index caa0a3f296c9..d4219c7b0333 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -432,6 +432,8 @@ Message Changes Changes ******* +- **Bootstrap:** The loading of **.env** and defining ``ENVIRONMENT`` have been + moved before loading of **bootstrap.php**. - **Config:** - ``Config\Feature::$multipleFilters`` has been removed, because now :ref:`multiple-filters` are always enabled. From 176a50ff365cb7db369b656ad68e5f934ef70675 Mon Sep 17 00:00:00 2001 From: Mattias Sandstrom <1013635+tangix@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:32:17 +0100 Subject: [PATCH 6372/8282] Update connection docs with information on how to connect to a MySQL server over a socket. --- .../source/database/configuration.rst | 10 +++++++++ .../source/database/configuration/011.php | 21 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 user_guide_src/source/database/configuration/011.php diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 128e28d9eeef..3e58c0db4326 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -66,6 +66,16 @@ add the config variables as a query string: database character set), which are present in the rest of the configuration fields, CodeIgniter will append them. +Configuring a MySQL socket connection +------------------------------------- + +To connect to a MySQL server over a filesystem socket, the path to the socket should be specified in +the ``'hostname'`` setting. CodeIgniter's MySQLi driver will notice this and configure the +connection properly. + +.. literalinclude:: configuration/011.php + :lines: 11-18 + Failovers --------- diff --git a/user_guide_src/source/database/configuration/011.php b/user_guide_src/source/database/configuration/011.php new file mode 100644 index 000000000000..dbdc9d133433 --- /dev/null +++ b/user_guide_src/source/database/configuration/011.php @@ -0,0 +1,21 @@ + '/cloudsql/toolbox-tests:europe-north1:toolbox-db"', + // ... + 'DBDriver' => 'MySQLi', + // ... + ]; + + // ... +} From 5750dc84faeb6a7a6f9e559ee54ef11f5873e163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Sandstr=C3=B6m?= <1013635+tangix@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:49:29 +0100 Subject: [PATCH 6373/8282] Update user_guide_src/source/database/configuration/011.php Co-authored-by: kenjis --- user_guide_src/source/database/configuration/011.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration/011.php b/user_guide_src/source/database/configuration/011.php index dbdc9d133433..01a0e876a3c8 100644 --- a/user_guide_src/source/database/configuration/011.php +++ b/user_guide_src/source/database/configuration/011.php @@ -11,7 +11,7 @@ class Database extends Config // MySQLi over a socket public array $default = [ // ... - 'hostname' => '/cloudsql/toolbox-tests:europe-north1:toolbox-db"', + 'hostname' => '/cloudsql/toolbox-tests:europe-north1:toolbox-db', // ... 'DBDriver' => 'MySQLi', // ... From 343cc457a07ab11d2887dc32f98ce4923dbc14e3 Mon Sep 17 00:00:00 2001 From: Mattias Sandstrom <1013635+tangix@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:52:52 +0100 Subject: [PATCH 6374/8282] Applied kenjis' changes --- user_guide_src/source/database/configuration.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 3e58c0db4326..9bfda4699c57 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -200,3 +200,19 @@ Explanation of Values: etc.) not all values will be needed. For example, when using ``SQLite3`` you will not need to supply a username or password, and the database name will be the path to your database file. + +MySQLi +====== + +hostname +-------- + +Configuring a Socket Connection +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +To connect to a MySQL server over a filesystem socket, the path to the socket should be specified in +the ``'hostname'`` setting. CodeIgniter's MySQLi driver will notice this and configure the +connection properly. + +.. literalinclude:: configuration/011.php + :lines: 11-18 \ No newline at end of file From 2ae662807b0197d84203c844d3a5d9e03fae61ba Mon Sep 17 00:00:00 2001 From: Mattias Sandstrom <1013635+tangix@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:53:57 +0100 Subject: [PATCH 6375/8282] Applied them again... --- user_guide_src/source/database/configuration.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 9bfda4699c57..2239c65799e2 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -66,16 +66,6 @@ add the config variables as a query string: database character set), which are present in the rest of the configuration fields, CodeIgniter will append them. -Configuring a MySQL socket connection -------------------------------------- - -To connect to a MySQL server over a filesystem socket, the path to the socket should be specified in -the ``'hostname'`` setting. CodeIgniter's MySQLi driver will notice this and configure the -connection properly. - -.. literalinclude:: configuration/011.php - :lines: 11-18 - Failovers --------- From 16718829d14e6ac7cc5b2a4f8c4c7eb96d3bb870 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 09:40:13 +0900 Subject: [PATCH 6376/8282] refactor: extract Boot class --- public/index.php | 3 +- spark | 3 +- system/Boot.php | 164 +++++++++++++++++++++++++++++++++++++++++++ system/bootstrap.php | 7 ++ 4 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 system/Boot.php diff --git a/public/index.php b/public/index.php index 0bfbce2053fd..b8072f8e7b46 100644 --- a/public/index.php +++ b/public/index.php @@ -70,7 +70,8 @@ } // LOAD THE FRAMEWORK BOOTSTRAP FILE -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; +require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +CodeIgniter\Boot::BootWeb($paths); // Load Config Cache // $factoriesCache = new \CodeIgniter\Cache\FactoriesCache(); diff --git a/spark b/spark index 6b4034131925..1be5328728c0 100755 --- a/spark +++ b/spark @@ -98,7 +98,8 @@ if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { } // LOAD THE FRAMEWORK BOOTSTRAP FILE -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; +require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +CodeIgniter\Boot::BootSpark($paths); /* * --------------------------------------------------------------- diff --git a/system/Boot.php b/system/Boot.php new file mode 100644 index 000000000000..7ae52f0aabb8 --- /dev/null +++ b/system/Boot.php @@ -0,0 +1,164 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter; + +use CodeIgniter\Exceptions\FrameworkException; +use Config\Autoload; +use Config\Modules; +use Config\Paths; +use Config\Services; + +class Boot +{ + /** + * @used-by public/index.php + * + * Context + * web: Invoked by HTTP request + * php-cli: Invoked by CLI via `php public/index.php` + */ + public static function bootWeb(Paths $paths): void + { + static::definePathConstant($paths); + static::loadConstants(); + static::loadCommonFunctions(); + static::loadAutoloader(); + static::setExceptionHandler(); + static::checkMissingExtensions(); + static::initializeKint(); + } + + /** + * @used-by spark + */ + public static function bootSpark(Paths $paths): void + { + static::definePathConstant($paths); + static::loadConstants(); + static::loadCommonFunctions(); + static::loadAutoloader(); + static::setExceptionHandler(); + static::checkMissingExtensions(); + static::initializeKint(); + } + + /** + * The path constants provide convenient access to the folders throughout + * the application. We have to set them up here, so they are available in + * the config files that are loaded. + */ + protected static function definePathConstant(Paths $paths): void + { + // The path to the application directory. + if (! defined('APPPATH')) { + define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); + } + + // The path to the project root directory. Just above APPPATH. + if (! defined('ROOTPATH')) { + define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR); + } + + // The path to the system directory. + if (! defined('SYSTEMPATH')) { + define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); + } + + // The path to the writable directory. + if (! defined('WRITEPATH')) { + define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); + } + + // The path to the tests directory + if (! defined('TESTPATH')) { + define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR); + } + } + + protected static function loadConstants(): void + { + if (! defined('APP_NAMESPACE')) { + require_once APPPATH . 'Config/Constants.php'; + } + } + + protected static function loadCommonFunctions(): void + { + // Require app/Common.php file if exists. + if (is_file(APPPATH . 'Common.php')) { + require_once APPPATH . 'Common.php'; + } + + // Require system/Common.php + require_once SYSTEMPATH . 'Common.php'; + } + + /** + * The autoloader allows all the pieces to work together in the framework. + * We have to load it here, though, so that the config files can use the + * path constants. + */ + protected static function loadAutoloader(): void + { + if (! class_exists(Autoload::class, false)) { + require_once SYSTEMPATH . 'Config/AutoloadConfig.php'; + require_once APPPATH . 'Config/Autoload.php'; + require_once SYSTEMPATH . 'Modules/Modules.php'; + require_once APPPATH . 'Config/Modules.php'; + } + + require_once SYSTEMPATH . 'Autoloader/Autoloader.php'; + require_once SYSTEMPATH . 'Config/BaseService.php'; + require_once SYSTEMPATH . 'Config/Services.php'; + require_once APPPATH . 'Config/Services.php'; + + // Initialize and register the loader with the SPL autoloader stack. + Services::autoloader()->initialize(new Autoload(), new Modules())->register(); + Services::autoloader()->loadHelpers(); + } + + protected static function setExceptionHandler(): void + { + Services::exceptions()->initialize(); + } + + protected static function checkMissingExtensions(): void + { + // Run this check for manual installations + if (! is_file(COMPOSER_PATH)) { + $missingExtensions = []; + + foreach ([ + 'intl', + 'json', + 'mbstring', + ] as $extension) { + if (! extension_loaded($extension)) { + $missingExtensions[] = $extension; + } + } + + if ($missingExtensions !== []) { + throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions)); + } + + unset($missingExtensions); + } + } + + protected static function initializeKint(): void + { + Services::autoloader()->initializeKint(CI_DEBUG); + } +} diff --git a/system/bootstrap.php b/system/bootstrap.php index 84d52cef5cbc..f091aa306527 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -11,6 +11,13 @@ * the LICENSE file that was distributed with this source code. */ +/** + * --------------------------------------------------------------- + * + * @deprecated 4.5.0 This file is no longer used. Moved to Boot.php. + * --------------------------------------------------------------- + */ + use CodeIgniter\Exceptions\FrameworkException; use Config\Autoload; use Config\Modules; From 5338b3dbd01781853f6c5afad53538893b0b61f6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 09:45:40 +0900 Subject: [PATCH 6377/8282] refactor: move code to Boot class --- public/index.php | 22 ---------------------- spark | 22 ---------------------- system/Boot.php | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 44 deletions(-) diff --git a/public/index.php b/public/index.php index b8072f8e7b46..a93c7d30d80e 100644 --- a/public/index.php +++ b/public/index.php @@ -47,28 +47,6 @@ $paths = new Config\Paths(); -// LOAD DOTENV FILE -// Load environment settings from .env files into $_SERVER and $_ENV -require_once $paths->systemDirectory . '/Config/DotEnv.php'; -(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); - -// DEFINE ENVIRONMENT -if (! defined('ENVIRONMENT')) { - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); -} - -// LOAD ENVIRONMENT BOOTSTRAP -if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { - require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; -} else { - header('HTTP/1.1 503 Service Unavailable.', true, 503); - echo 'The application environment is not set correctly.'; - - exit(EXIT_ERROR); // EXIT_ERROR -} - // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; CodeIgniter\Boot::BootWeb($paths); diff --git a/spark b/spark index 1be5328728c0..172bacc8c500 100755 --- a/spark +++ b/spark @@ -75,28 +75,6 @@ require FCPATH . '../app/Config/Paths.php'; $paths = new Config\Paths(); -// LOAD DOTENV FILE -// Load environment settings from .env files into $_SERVER and $_ENV -require_once $paths->systemDirectory . '/Config/DotEnv.php'; -(new CodeIgniter\Config\DotEnv($paths->appDirectory . '/../'))->load(); - -// DEFINE ENVIRONMENT -if (! defined('ENVIRONMENT')) { - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); -} - -// LOAD ENVIRONMENT BOOTSTRAP -if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { - require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; -} else { - header('HTTP/1.1 503 Service Unavailable.', true, 503); - echo 'The application environment is not set correctly.'; - - exit(EXIT_ERROR); // EXIT_ERROR -} - // LOAD THE FRAMEWORK BOOTSTRAP FILE require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; CodeIgniter\Boot::BootSpark($paths); diff --git a/system/Boot.php b/system/Boot.php index 7ae52f0aabb8..00ae0f61de25 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -13,6 +13,7 @@ namespace CodeIgniter; +use CodeIgniter\Config\DotEnv; use CodeIgniter\Exceptions\FrameworkException; use Config\Autoload; use Config\Modules; @@ -30,6 +31,9 @@ class Boot */ public static function bootWeb(Paths $paths): void { + static::loadDotEnv($paths); + static::defineEnvironment(); + static::loadEnvironmentBootstrap($paths); static::definePathConstant($paths); static::loadConstants(); static::loadCommonFunctions(); @@ -44,6 +48,9 @@ public static function bootWeb(Paths $paths): void */ public static function bootSpark(Paths $paths): void { + static::loadDotEnv($paths); + static::defineEnvironment(); + static::loadEnvironmentBootstrap($paths); static::definePathConstant($paths); static::loadConstants(); static::loadCommonFunctions(); @@ -53,6 +60,36 @@ public static function bootSpark(Paths $paths): void static::initializeKint(); } + /** + * Load environment settings from .env files into $_SERVER and $_ENV + */ + protected static function loadDotEnv(Paths $paths): void + { + require_once $paths->systemDirectory . '/Config/DotEnv.php'; + (new DotEnv($paths->appDirectory . '/../'))->load(); + } + + protected static function defineEnvironment(): void + { + if (! defined('ENVIRONMENT')) { + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); + unset($env); + } + } + + protected static function loadEnvironmentBootstrap(Paths $paths): void + { + if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { + require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; + } else { + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo 'The application environment is not set correctly.'; + + exit(EXIT_ERROR); // EXIT_ERROR + } + } + /** * The path constants provide convenient access to the folders throughout * the application. We have to set them up here, so they are available in From 529eb954d8ce354dae7149dd9e2c47f9676d3128 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 11:19:00 +0900 Subject: [PATCH 6378/8282] refactor: use Boot class in Test/bootstrap.php --- system/Boot.php | 40 ++++++++++++++---- system/Test/bootstrap.php | 86 ++------------------------------------- 2 files changed, 37 insertions(+), 89 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index 00ae0f61de25..6902684ca612 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -20,6 +20,9 @@ use Config\Paths; use Config\Services; +/** + * Bootstrap for the application + */ class Boot { /** @@ -35,7 +38,9 @@ public static function bootWeb(Paths $paths): void static::defineEnvironment(); static::loadEnvironmentBootstrap($paths); static::definePathConstant($paths); - static::loadConstants(); + if (! defined('APP_NAMESPACE')) { + static::loadConstants(); + } static::loadCommonFunctions(); static::loadAutoloader(); static::setExceptionHandler(); @@ -52,6 +57,23 @@ public static function bootSpark(Paths $paths): void static::defineEnvironment(); static::loadEnvironmentBootstrap($paths); static::definePathConstant($paths); + if (! defined('APP_NAMESPACE')) { + static::loadConstants(); + } + static::loadCommonFunctions(); + static::loadAutoloader(); + static::setExceptionHandler(); + static::checkMissingExtensions(); + static::initializeKint(); + } + + /** + * @used-by system/Test/bootstrap.php + */ + public static function bootTest(Paths $paths): void + { + static::loadDotEnv($paths); + static::loadEnvironmentBootstrap($paths, false); static::loadConstants(); static::loadCommonFunctions(); static::loadAutoloader(); @@ -72,21 +94,27 @@ protected static function loadDotEnv(Paths $paths): void protected static function defineEnvironment(): void { if (! defined('ENVIRONMENT')) { + // @phpstan-ignore-next-line $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + define('ENVIRONMENT', ($env !== false) ? $env : 'production'); unset($env); } } - protected static function loadEnvironmentBootstrap(Paths $paths): void + protected static function loadEnvironmentBootstrap(Paths $paths, bool $exit = true): void { if (is_file($paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php')) { require_once $paths->appDirectory . '/Config/Boot/' . ENVIRONMENT . '.php'; - } else { + + return; + } + + if ($exit) { header('HTTP/1.1 503 Service Unavailable.', true, 503); echo 'The application environment is not set correctly.'; - exit(EXIT_ERROR); // EXIT_ERROR + exit(EXIT_ERROR); } } @@ -125,9 +153,7 @@ protected static function definePathConstant(Paths $paths): void protected static function loadConstants(): void { - if (! defined('APP_NAMESPACE')) { - require_once APPPATH . 'Config/Constants.php'; - } + require_once APPPATH . 'Config/Constants.php'; } protected static function loadCommonFunctions(): void diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index 776250abfac3..fc113693a69e 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -11,9 +11,7 @@ * the LICENSE file that was distributed with this source code. */ -use CodeIgniter\Config\DotEnv; -use Config\Autoload; -use Config\Modules; +use CodeIgniter\Boot; use Config\Paths; use Config\Services; @@ -80,85 +78,9 @@ * and fires up an environment-specific bootstrapping. */ -// LOAD DOTENV FILE -// Load environment settings from .env files into $_SERVER and $_ENV -require_once $paths->systemDirectory . '/Config/DotEnv.php'; -(new DotEnv($paths->appDirectory . '/../'))->load(); - -/* - * --------------------------------------------------------------- - * LOAD ENVIRONMENT BOOTSTRAP - * --------------------------------------------------------------- - * - * Load any custom boot files based upon the current environment. - * If no boot file exists, we shouldn't continue because something - * is wrong. At the very least, they should have error reporting setup. - */ - -if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) { - require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'; -} - -/* - * --------------------------------------------------------------- - * GRAB OUR CONSTANTS - * --------------------------------------------------------------- - */ - -require_once APPPATH . 'Config/Constants.php'; - -/* - * --------------------------------------------------------------- - * LOAD COMMON FUNCTIONS - * --------------------------------------------------------------- - */ - -// Load Common.php from App then System -if (is_file(APPPATH . 'Common.php')) { - require_once APPPATH . 'Common.php'; -} - -require_once SYSTEMPATH . 'Common.php'; - -/* - * --------------------------------------------------------------- - * LOAD OUR AUTOLOADER - * --------------------------------------------------------------- - * - * The autoloader allows all of the pieces to work together in the - * framework. We have to load it here, though, so that the config - * files can use the path constants. - */ - -require_once SYSTEMPATH . 'Config/AutoloadConfig.php'; -require_once APPPATH . 'Config/Autoload.php'; -require_once SYSTEMPATH . 'Modules/Modules.php'; -require_once APPPATH . 'Config/Modules.php'; - -require_once SYSTEMPATH . 'Autoloader/Autoloader.php'; -require_once SYSTEMPATH . 'Config/BaseService.php'; -require_once SYSTEMPATH . 'Config/Services.php'; -require_once APPPATH . 'Config/Services.php'; - -// Initialize and register the loader with the SPL autoloader stack. -Services::autoloader()->initialize(new Autoload(), new Modules())->register(); -Services::autoloader()->loadHelpers(); - -/* - * --------------------------------------------------------------- - * SET EXCEPTION AND ERROR HANDLERS - * --------------------------------------------------------------- - */ - -Services::exceptions()->initialize(); - -/* - * --------------------------------------------------------------- - * INITIALIZE KINT - * --------------------------------------------------------------- - */ - -Services::autoloader()->initializeKint(CI_DEBUG); +// LOAD THE FRAMEWORK BOOTSTRAP FILE +require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +Boot::bootTest($paths); /* * --------------------------------------------------------------- From 56916891b976191dbeba7532e0900b096f187a6b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 11:50:55 +0900 Subject: [PATCH 6379/8282] refactor: fix method name --- system/Boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index 6902684ca612..a1a9ca4a1168 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -37,7 +37,7 @@ public static function bootWeb(Paths $paths): void static::loadDotEnv($paths); static::defineEnvironment(); static::loadEnvironmentBootstrap($paths); - static::definePathConstant($paths); + static::definePathConstants($paths); if (! defined('APP_NAMESPACE')) { static::loadConstants(); } @@ -56,7 +56,7 @@ public static function bootSpark(Paths $paths): void static::loadDotEnv($paths); static::defineEnvironment(); static::loadEnvironmentBootstrap($paths); - static::definePathConstant($paths); + static::definePathConstants($paths); if (! defined('APP_NAMESPACE')) { static::loadConstants(); } @@ -123,7 +123,7 @@ protected static function loadEnvironmentBootstrap(Paths $paths, bool $exit = tr * the application. We have to set them up here, so they are available in * the config files that are loaded. */ - protected static function definePathConstant(Paths $paths): void + protected static function definePathConstants(Paths $paths): void { // The path to the application directory. if (! defined('APPPATH')) { From c5191a08930a1513d35cf13b0492bc3bd6ce1694 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 11:55:41 +0900 Subject: [PATCH 6380/8282] refactor: remove rtrim() --- public/index.php | 2 +- spark | 2 +- system/Test/bootstrap.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/index.php b/public/index.php index a93c7d30d80e..057ec8a111c3 100644 --- a/public/index.php +++ b/public/index.php @@ -48,7 +48,7 @@ $paths = new Config\Paths(); // LOAD THE FRAMEWORK BOOTSTRAP FILE -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +require $paths->systemDirectory . '/Boot.php'; CodeIgniter\Boot::BootWeb($paths); // Load Config Cache diff --git a/spark b/spark index 172bacc8c500..8588352a7e50 100755 --- a/spark +++ b/spark @@ -76,7 +76,7 @@ require FCPATH . '../app/Config/Paths.php'; $paths = new Config\Paths(); // LOAD THE FRAMEWORK BOOTSTRAP FILE -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +require $paths->systemDirectory . '/Boot.php'; CodeIgniter\Boot::BootSpark($paths); /* diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php index fc113693a69e..4a068a4c97b1 100644 --- a/system/Test/bootstrap.php +++ b/system/Test/bootstrap.php @@ -79,7 +79,7 @@ */ // LOAD THE FRAMEWORK BOOTSTRAP FILE -require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; +require $paths->systemDirectory . '/Boot.php'; Boot::bootTest($paths); /* From 41db7666757bb6b6a88ba7ecc7b1859b0b9f37f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 12:52:25 +0900 Subject: [PATCH 6381/8282] docs: update comments --- spark | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spark b/spark index 8588352a7e50..a1b42e35b0b7 100755 --- a/spark +++ b/spark @@ -16,9 +16,12 @@ * -------------------------------------------------------------------- * The main entry point into the CLI system and allows you to run * commands and perform maintenance on your application. - * - * Because CodeIgniter can handle CLI requests as just another web request - * this class mainly acts as a passthru to the framework itself. + */ + +/* + *--------------------------------------------------------------- + * CHECK SERVER API + *--------------------------------------------------------------- */ // Refuse to run when called from php-cgi From 7b81bb056b26890e22240f7c6d7d220ed770bb44 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 13:35:17 +0900 Subject: [PATCH 6382/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.5.0.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index d4219c7b0333..b311358e7993 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -185,6 +185,8 @@ Others - **Web Page Caching:** ``ResponseCache`` has been improved to include the request HTTP method in the cache key. This means that the same URI will be cached separately if the HTTP method is different. +- **Bootstrap:** The ``CodeIgniter\Boot`` class has been introduced, replacing + **system/bootstrap.php**. ******** BREAKING @@ -469,6 +471,8 @@ Deprecations been moved to the ``Autoloader``. - The ``configureKint()`` method has been deprecated. No longer used. It has been moved to the ``Autoloader``. +- **system/bootstrap.php:** This file has been deprecated. No longer used. + The code has been moved to the new ``CodeIgniter\Boot`` class. - **Response:** The constructor parameter ``$config`` has been deprecated. No longer used. - **Filters:** From c33573142925dd0f66577defbeda01324342b910 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 19 Feb 2024 13:52:24 +0900 Subject: [PATCH 6383/8282] docs: add @codeCoverageIgnore --- system/Boot.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/Boot.php b/system/Boot.php index a1a9ca4a1168..0001db6ba051 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -22,6 +22,8 @@ /** * Bootstrap for the application + * + * @codeCoverageIgnore */ class Boot { From 4a430eae98f3acff34bc9f81f9583ac5bdf8263c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 16 Mar 2024 10:11:22 +0900 Subject: [PATCH 6384/8282] docs: remove space --- system/Boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Boot.php b/system/Boot.php index 0001db6ba051..856b7da1be87 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -30,7 +30,7 @@ class Boot /** * @used-by public/index.php * - * Context + * Context * web: Invoked by HTTP request * php-cli: Invoked by CLI via `php public/index.php` */ From 4cd1a70eaf984a8f22f161dfd38be8965bb70174 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 08:43:48 +0900 Subject: [PATCH 6385/8282] docs: remove @used-by We should write FQSEN, but a PHP file is not a FQSEN. @uses [FQSEN] [] https://docs.phpdoc.org/guide/references/phpdoc/tags/uses.html#uses-used-by --- system/Boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index 856b7da1be87..839394549d88 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -28,7 +28,7 @@ class Boot { /** - * @used-by public/index.php + * Used by `public/index.php` * * Context * web: Invoked by HTTP request @@ -51,7 +51,7 @@ public static function bootWeb(Paths $paths): void } /** - * @used-by spark + * Used by `spark` */ public static function bootSpark(Paths $paths): void { @@ -70,7 +70,7 @@ public static function bootSpark(Paths $paths): void } /** - * @used-by system/Test/bootstrap.php + * Used by `system/Test/bootstrap.php` */ public static function bootTest(Paths $paths): void { From a95c6f180238be58bdd0a5d9df1531ab3f6cba9b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 08:46:51 +0900 Subject: [PATCH 6386/8282] refactor: extract boot() method --- system/Boot.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index 839394549d88..abe0d3fa9484 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -36,24 +36,18 @@ class Boot */ public static function bootWeb(Paths $paths): void { - static::loadDotEnv($paths); - static::defineEnvironment(); - static::loadEnvironmentBootstrap($paths); - static::definePathConstants($paths); - if (! defined('APP_NAMESPACE')) { - static::loadConstants(); - } - static::loadCommonFunctions(); - static::loadAutoloader(); - static::setExceptionHandler(); - static::checkMissingExtensions(); - static::initializeKint(); + static::boot($paths); } /** * Used by `spark` */ public static function bootSpark(Paths $paths): void + { + static::boot($paths); + } + + protected static function boot(Paths $paths): void { static::loadDotEnv($paths); static::defineEnvironment(); From 1022a335d5f72116918fbf7db814a7512c47ba74 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 08:50:47 +0900 Subject: [PATCH 6387/8282] refactor: improve readability --- system/Boot.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index abe0d3fa9484..ae48feac5879 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -91,10 +91,11 @@ protected static function defineEnvironment(): void { if (! defined('ENVIRONMENT')) { // @phpstan-ignore-next-line - $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT'); + $env = $_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] + ?? getenv('CI_ENVIRONMENT') + ?: 'production'; - define('ENVIRONMENT', ($env !== false) ? $env : 'production'); - unset($env); + define('ENVIRONMENT', $env); } } From 61bf440c2471df9e0cb1afc1edd246c02725c9fb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 08:51:29 +0900 Subject: [PATCH 6388/8282] refactor: remove unneeded unset() --- system/Boot.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index ae48feac5879..370610c02fa5 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -212,8 +212,6 @@ protected static function checkMissingExtensions(): void if ($missingExtensions !== []) { throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions)); } - - unset($missingExtensions); } } From dc9caaebef0c42f5970471aa03df7175aea78c18 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 09:26:54 +0900 Subject: [PATCH 6389/8282] refactor: move checkMissingExtensions() up The translated error message is no longer provided. This is because the checking must be done at a very early stage. --- system/Boot.php | 27 +++++++++++++++++------- system/Exceptions/FrameworkException.php | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index 370610c02fa5..b601d0f5fe77 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -14,7 +14,6 @@ namespace CodeIgniter; use CodeIgniter\Config\DotEnv; -use CodeIgniter\Exceptions\FrameworkException; use Config\Autoload; use Config\Modules; use Config\Paths; @@ -49,17 +48,19 @@ public static function bootSpark(Paths $paths): void protected static function boot(Paths $paths): void { - static::loadDotEnv($paths); - static::defineEnvironment(); - static::loadEnvironmentBootstrap($paths); static::definePathConstants($paths); if (! defined('APP_NAMESPACE')) { static::loadConstants(); } + static::checkMissingExtensions(); + + static::loadDotEnv($paths); + static::defineEnvironment(); + static::loadEnvironmentBootstrap($paths); + static::loadCommonFunctions(); static::loadAutoloader(); static::setExceptionHandler(); - static::checkMissingExtensions(); static::initializeKint(); } @@ -68,13 +69,15 @@ protected static function boot(Paths $paths): void */ public static function bootTest(Paths $paths): void { + static::loadConstants(); + static::checkMissingExtensions(); + static::loadDotEnv($paths); static::loadEnvironmentBootstrap($paths, false); - static::loadConstants(); + static::loadCommonFunctions(); static::loadAutoloader(); static::setExceptionHandler(); - static::checkMissingExtensions(); static::initializeKint(); } @@ -210,7 +213,15 @@ protected static function checkMissingExtensions(): void } if ($missingExtensions !== []) { - throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions)); + $message = sprintf( + 'The framework needs the following extension(s) installed and loaded: %s.', + implode(', ', $missingExtensions) + ); + + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo $message; + + exit(EXIT_ERROR); } } } diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php index fb371bc49c8d..a223f8ec927a 100644 --- a/system/Exceptions/FrameworkException.php +++ b/system/Exceptions/FrameworkException.php @@ -59,6 +59,8 @@ public static function forCopyError(string $path) /** * @return static + * + * @deprecated 4.5.0 No longer used. */ public static function forMissingExtension(string $extension) { From a5ee34096c060b92a1bb97a898d548046515167b Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 09:40:19 +0900 Subject: [PATCH 6390/8282] refactor: early return --- system/Boot.php | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/system/Boot.php b/system/Boot.php index b601d0f5fe77..ba94cce6b910 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -198,32 +198,36 @@ protected static function setExceptionHandler(): void protected static function checkMissingExtensions(): void { + if (is_file(COMPOSER_PATH)) { + return; + } + // Run this check for manual installations - if (! is_file(COMPOSER_PATH)) { - $missingExtensions = []; - - foreach ([ - 'intl', - 'json', - 'mbstring', - ] as $extension) { - if (! extension_loaded($extension)) { - $missingExtensions[] = $extension; - } + $missingExtensions = []; + + foreach ([ + 'intl', + 'json', + 'mbstring', + ] as $extension) { + if (! extension_loaded($extension)) { + $missingExtensions[] = $extension; } + } - if ($missingExtensions !== []) { - $message = sprintf( - 'The framework needs the following extension(s) installed and loaded: %s.', - implode(', ', $missingExtensions) - ); + if ($missingExtensions === []) { + return; + } - header('HTTP/1.1 503 Service Unavailable.', true, 503); - echo $message; + $message = sprintf( + 'The framework needs the following extension(s) installed and loaded: %s.', + implode(', ', $missingExtensions) + ); - exit(EXIT_ERROR); - } - } + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo $message; + + exit(EXIT_ERROR); } protected static function initializeKint(): void From 44583a412e41177b93e2f51fffc88d6c6ae7f4ea Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 09:42:29 +0900 Subject: [PATCH 6391/8282] fix: change HTTP status code from 200 to 503 --- public/index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/index.php b/public/index.php index 057ec8a111c3..f384dd5416cf 100644 --- a/public/index.php +++ b/public/index.php @@ -14,7 +14,10 @@ PHP_VERSION ); - exit($message); + header('HTTP/1.1 503 Service Unavailable.', true, 503); + echo $message; + + exit(1); } /* From 842fd6eae9d8ddad0177d47da587c38e6f721e25 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 17 Mar 2024 09:59:08 +0900 Subject: [PATCH 6392/8282] feat: "system/bootstrap.php" shows upgrade error message --- system/bootstrap.php | 12 ++++++++++-- user_guide_src/source/changelogs/v4.5.0.rst | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/system/bootstrap.php b/system/bootstrap.php index f091aa306527..c0b021494737 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -13,8 +13,7 @@ /** * --------------------------------------------------------------- - * - * @deprecated 4.5.0 This file is no longer used. Moved to Boot.php. + * This file cannot be used. The code has moved to Boot.php. * --------------------------------------------------------------- */ @@ -24,6 +23,13 @@ use Config\Paths; use Config\Services; +header('HTTP/1.1 503 Service Unavailable.', true, 503); + +$message = 'This "system/bootstrap.php" is no longer used. If you are seeing this error message, +the upgrade is not complete. Please refer to the upgrade guide and complete the upgrade. +See https://codeigniter4.github.io/userguide/installation/upgrade_450.html' . PHP_EOL; +echo $message; + /* * --------------------------------------------------------------- * SETUP OUR PATH CONSTANTS @@ -153,3 +159,5 @@ */ Services::autoloader()->initializeKint(CI_DEBUG); + +exit(1); diff --git a/user_guide_src/source/changelogs/v4.5.0.rst b/user_guide_src/source/changelogs/v4.5.0.rst index b311358e7993..7d1a6c1023d4 100644 --- a/user_guide_src/source/changelogs/v4.5.0.rst +++ b/user_guide_src/source/changelogs/v4.5.0.rst @@ -251,6 +251,8 @@ Others - **BaseModel:** The ``getIdValue()`` method has been changed to ``abstract``. - **Routing:** The :ref:`404-override` feature does change the Response status code to 404 by default. See :ref:`Upgrading Guide `. +- **system/bootstrap.php:** This file cannot be used. The code has been moved to + the new ``CodeIgniter\Boot`` class. Interface Changes ================= @@ -471,8 +473,6 @@ Deprecations been moved to the ``Autoloader``. - The ``configureKint()`` method has been deprecated. No longer used. It has been moved to the ``Autoloader``. -- **system/bootstrap.php:** This file has been deprecated. No longer used. - The code has been moved to the new ``CodeIgniter\Boot`` class. - **Response:** The constructor parameter ``$config`` has been deprecated. No longer used. - **Filters:** From 9a5d200f7cc6d9a041841b04de89afc234160c90 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Mar 2024 09:51:58 +0900 Subject: [PATCH 6393/8282] chore: enable checkMissingIterableValueType If left false, this error will continue to increase. --- phpstan-baseline.php | 10680 +++++++++++++++++++++++++++++++++++------ phpstan.neon.dist | 1 - 2 files changed, 9145 insertions(+), 1536 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 4e77d744241a..da28aa2fb3d5 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -2,3489 +2,11099 @@ $ignoreErrors = []; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\CLIRequest\\|CodeIgniter\\\\HTTP\\\\IncomingRequest of property App\\\\Controllers\\\\BaseController\\:\\:\\$request is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\RequestInterface of overridden property CodeIgniter\\\\Controller\\:\\:\\$request\\.$#', + 'message' => '#^Property Config\\\\ContentSecurityPolicy\\:\\:\\$frameSrc type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/app/Controllers/BaseController.php', + 'path' => __DIR__ . '/app/Config/ContentSecurityPolicy.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function method_exists\\(\\) with \'Composer\\\\\\\\InstalledVersions\' and \'getAllRawData\' will always evaluate to true\\.$#', + 'message' => '#^Property Config\\\\Database\\:\\:\\$default type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', + 'path' => __DIR__ . '/app/Config/Database.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property Config\\\\Autoload\\:\\:\\$helpers \\(array\\\\) in isset\\(\\) is not nullable\\.$#', + 'message' => '#^Property Config\\\\Database\\:\\:\\$tests type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', + 'path' => __DIR__ . '/app/Config/Database.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|string given\\.$#', + 'message' => '#^Property Config\\\\Exceptions\\:\\:\\$ignoreCodes type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Autoloader/FileLocator.php', + 'path' => __DIR__ . '/app/Config/Exceptions.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/Autoloader/FileLocator.php', + 'message' => '#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Config/Exceptions.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', + 'message' => '#^Property Config\\\\Filters\\:\\:\\$filters type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/BaseModel.php', + 'path' => __DIR__ . '/app/Config/Filters.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', + 'message' => '#^Property Config\\\\Filters\\:\\:\\$methods type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/BaseModel.php', + 'path' => __DIR__ . '/app/Config/Filters.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\|int\\|string\\|null given on the left side\\.$#', + 'message' => '#^Property Config\\\\Logger\\:\\:\\$handlers type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/BaseModel.php', + 'path' => __DIR__ . '/app/Config/Logger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, array\\|null given\\.$#', + 'message' => '#^Property Config\\\\Logger\\:\\:\\$threshold type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/BaseModel.php', + 'path' => __DIR__ . '/app/Config/Logger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'message' => '#^Property Config\\\\Mimes\\:\\:\\$mimes type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/BaseModel.php', + 'path' => __DIR__ . '/app/Config/Mimes.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/CLI/BaseCommand.php', + 'message' => '#^Property Config\\\\Routing\\:\\:\\$moduleRoutes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/app/Config/Routing.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'ANSICON\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Property Config\\\\Routing\\:\\:\\$routeFiles type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/app/Config/Routing.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'NO_COLOR\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Property Config\\\\Toolbar\\:\\:\\$watchedDirectories type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/app/Config/Toolbar.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'argv\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Property Config\\\\Toolbar\\:\\:\\$watchedExtensions type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/app/Config/Toolbar.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', + 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\CLIRequest\\|CodeIgniter\\\\HTTP\\\\IncomingRequest of property App\\\\Controllers\\\\BaseController\\:\\:\\$request is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\RequestInterface of overridden property CodeIgniter\\\\Controller\\:\\:\\$request\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/app/Controllers/BaseController.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', + 'message' => '#^Property App\\\\Controllers\\\\BaseController\\:\\:\\$helpers type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/app/Controllers/BaseController.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\|string\\|null given on the left side\\.$#', + 'message' => '#^Call to function method_exists\\(\\) with \'Composer\\\\\\\\InstalledVersions\' and \'getAllRawData\' will always evaluate to true\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:getNamespace\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\Autoloader\\:\\:loadComposerNamespaces\\(\\) has parameter \\$composerPackages with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'message' => '#^Property Config\\\\Autoload\\:\\:\\$helpers \\(array\\\\) in isset\\(\\) is not nullable\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/system/Autoloader/Autoloader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, string given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Autoloader\\\\FileLocator\\:\\:search\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'path' => __DIR__ . '/system/Autoloader/FileLocator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, string\\|null given on the left side\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Autoloader/FileLocator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, string\\|null given on the right side\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/Autoloader/FileLocator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/CLI/CLI.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:__call\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function property_exists\\(\\) with Config\\\\Cache and \'file\' will always evaluate to true\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:cleanValidationRules\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:cleanValidationRules\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$result might not be defined\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:delete\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doDelete\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doErrors\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/CreateDatabase.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doFind\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array\\, array\\\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doFind\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$params \\(array\\\\) of method CodeIgniter\\\\Commands\\\\Database\\\\MigrateStatus\\:\\:run\\(\\) should be contravariant with parameter \\$params \\(array\\\\) of method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:run\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doFindAll\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doFindColumn\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/Seed.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showAllTables\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doFirst\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showDataOfTable\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doInsertBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'encryption\\.key\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doProtectFields\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doProtectFieldsForInsert\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doUpdate\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:doUpdateBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:fillPlaceholders\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:fillPlaceholders\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:fillPlaceholders\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:find\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:findAll\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:findColumn\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:first\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:getIdValue\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:getValidationMessages\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:getValidationRules\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:getValidationRules\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:idValue\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:idValue\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:paginate\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setAllowedFields\\(\\) has parameter \\$allowedFields with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setCreatedField\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setUpdatedField\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setValidationMessage\\(\\) has parameter \\$fieldMessages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setValidationMessages\\(\\) has parameter \\$validationMessages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setValidationRule\\(\\) has parameter \\$fieldRules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:setValidationRules\\(\\) has parameter \\$validationRules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:transformDataToArray\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:trigger\\(\\) has parameter \\$eventData with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:trigger\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an elseif condition, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\BaseModel\\:\\:update\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, mixed given on the left side\\.$#', + 'message' => '#^Only booleans are allowed in &&, array\\|int\\|string\\|null given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, mixed given on the right side\\.$#', + 'message' => '#^Only booleans are allowed in a ternary operator condition, array\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterDelete type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterFind type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterInsert type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterInsertBatch type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterUpdate type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$afterUpdateBatch type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$allowedFields type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeDelete type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeFind type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeInsert type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeInsertBatch type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeUpdate type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$beforeUpdateBatch type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$validationMessages type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', + 'message' => '#^Property CodeIgniter\\\\BaseModel\\:\\:\\$validationRules type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/BaseModel.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:call\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:getPad\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/BaseCommand.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Accessing offset \'ANSICON\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Accessing offset \'NO_COLOR\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'message' => '#^Accessing offset \'argv\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:getSegments\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:isZeroOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:printKeysAndValues\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:prompt\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:prompt\\(\\) has parameter \\$validation with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:promptByKey\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:promptByKey\\(\\) has parameter \\$text with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:promptByKey\\(\\) has parameter \\$validation with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:promptByMultipleKeys\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:promptByMultipleKeys\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:table\\(\\) has parameter \\$tbody with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:table\\(\\) has parameter \\$thead with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\CLI\\:\\:validate\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an elseif condition, mixed given\\.$#', + 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'message' => '#^Only booleans are allowed in &&, array\\|string\\|null given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in \\|\\|, string given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'message' => '#^Only booleans are allowed in \\|\\|, string\\|null given on the left side\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Only booleans are allowed in \\|\\|, string\\|null given on the right side\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/CLI/CLI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\CLI\\\\CLI\\:\\:\\$options type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Property CodeIgniter\\\\CLI\\\\CLI\\:\\:\\$segments type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', + 'count' => 5, + 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:getCommandAlternatives\\(\\) has parameter \\$collection with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:getCommandAlternatives\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:getCommands\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:run\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Commands\\:\\:verifyCommand\\(\\) has parameter \\$commands with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Property CodeIgniter\\\\CLI\\\\Commands\\:\\:\\$commands type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'path' => __DIR__ . '/system/CLI/Commands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Console\\:\\:parseParamsForHelpOption\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/Console.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'message' => '#^Method CodeIgniter\\\\CLI\\\\Console\\:\\:parseParamsForHelpOption\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CLI/Console.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'path' => __DIR__ . '/system/Cache/CacheInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'path' => __DIR__ . '/system/Cache/CacheInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'path' => __DIR__ . '/system/Cache/CacheInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\CacheInterface\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'path' => __DIR__ . '/system/Cache/CacheInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\FactoriesCache\\\\FileVarExportHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'path' => __DIR__ . '/system/Cache/FactoriesCache/FileVarExportHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\FactoriesCache\\\\FileVarExportHandler\\:\\:save\\(\\) has parameter \\$val with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/FactoriesCache/FileVarExportHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listFull\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\BaseHandler\\:\\:remember\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/ListCommands.php', + 'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listSimple\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/ListCommands.php', + 'path' => __DIR__ . '/system/Cache/Handlers/BaseHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Server/Serve.php', + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'CI_ENVIRONMENT\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Commands/Utilities/Environment.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTP_HOST\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:remember\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Assigning non\\-falsy\\-string directly on offset \'HTTP_HOST\' of \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\DummyHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', + 'path' => __DIR__ . '/system/Cache/Handlers/DummyHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, Config\\\\Routing given\\.$#', + 'message' => '#^Call to function property_exists\\(\\) with Config\\\\Cache and \'file\' will always evaluate to true\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Implicit array creation is not allowed \\- variable \\$filters might not exist\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has parameter \\$routes with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:getDirFileInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:getFileInfo\\(\\) has parameter \\$returnedValues with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:getFileInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Utilities/Routes/ControllerMethodReader.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'REMOTE_ADDR\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Common.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'REQUEST_METHOD\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\FileHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Common.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset string directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Common.php', + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Common.php', + 'message' => '#^Variable \\$result might not be defined\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/FileHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Common.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Common.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\ComposerScripts\\:\\:postUpdate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/ComposerScripts.php', + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'CI_ENVIRONMENT\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Config/AutoloadConfig.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset non\\-falsy\\-string directly on \\$_SERVER is discouraged\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Config/BaseConfig.php', + 'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\MemcachedHandler\\:\\:\\$config type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Config/BaseService.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/BaseService.php', + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset string directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Config/DotEnv.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Assigning string directly on offset string of \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/DotEnv.php', + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Config/DotEnv.php', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\PredisHandler\\:\\:\\$config type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/DotEnv.php', + 'path' => __DIR__ . '/system/Cache/Handlers/PredisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/Factories.php', + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/Factories.php', + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, string\\|null given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Config/Factories.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/Services.php', + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'message' => '#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$config type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/Services.php', + 'path' => __DIR__ . '/system/Cache/Handlers/RedisHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Config/Services.php', + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Config/Services.php', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:getCacheInfo\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Controller.php', + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$offset \\(string\\) of method CodeIgniter\\\\Cookie\\\\Cookie\\:\\:offsetSet\\(\\) should be contravariant with parameter \\$offset \\(string\\|null\\) of method ArrayAccess\\\\:\\:offsetSet\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Cache\\\\Handlers\\\\WincacheHandler\\:\\:save\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Cookie/Cookie.php', + 'path' => __DIR__ . '/system/Cache/Handlers/WincacheHandler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/Cookie/Cookie.php', + 'message' => '#^Method CodeIgniter\\\\CodeIgniter\\:\\:getPerformanceStats\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/CodeIgniter.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 30, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/CreateDatabase.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:addUnionStatement\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:buildSubquery\\(\\) has parameter \\$builder with no signature specified for Closure\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, array\\, array\\\\> given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Parameter \\#1 \\$params \\(array\\\\) of method CodeIgniter\\\\Commands\\\\Database\\\\MigrateStatus\\:\\:run\\(\\) should be contravariant with parameter \\$params \\(array\\\\) of method CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:run\\(\\)$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/MigrateStatus.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/Seed.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:makeTableRows\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:makeTbodyForShowAllTables\\(\\) has parameter \\$tables with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:makeTbodyForShowAllTables\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showAllTables\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetRun\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showAllTables\\(\\) has parameter \\$tables with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Database\\\\ShowTableInfo\\:\\:showDataOfTable\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Database/ShowTableInfo.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetWrite\\(\\) has no return type specified\\.$#', + 'message' => '#^Accessing offset \'encryption\\.key\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:union\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Encryption\\\\GenerateKey\\:\\:confirmOverwrite\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:unionAll\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Encryption\\\\GenerateKey\\:\\:setNewEncryptionKey\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, TWhenNot given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an elseif condition, \\(callable\\)\\|null given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, TWhen given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 13, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:close\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:prepare\\(\\) has parameter \\$func with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:transOff\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseConnection.php', + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Database/BaseResult.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$className \\(class\\-string\\) of method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getCustomResultObject\\(\\) should be contravariant with parameter \\$className \\(string\\) of method CodeIgniter\\\\Database\\\\ResultInterface\\\\:\\:getCustomResultObject\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseResult.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Database/BaseUtils.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:ensureFactory\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Config.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/Database.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forEmptyInputGiven\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forFindColumnHaveMultipleColumns\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forInvalidAllowedFields\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forTableNotFound\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 13, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeDefault\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnique\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnsigned\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:reset\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$fields \\(array\\\\) does not accept array\\\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:down\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Migration.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:up\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Migration.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:addHistory\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:clearHistory\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:ensureTable\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:force\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:removeHistory\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, int\\<0, max\\> given on the right side\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, max\\> given\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MigrationRunner.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/ModelFactory.php', + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:reset\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/ModelFactory.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 11, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$mysqli\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mysqli_result\\|false\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:_getResult\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Result.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', + 'message' => '#^Only booleans are allowed in an elseif condition, mixed given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int given\\.$#', + 'message' => '#^Only booleans are allowed in \\|\\|, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\OCI8\\\\Connection of property CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db\\.$#', + 'message' => '#^Only booleans are allowed in \\|\\|, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$resetStmtId has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$validDSNs has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$createTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createTableIfStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$dropDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$dropDatabaseStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$dropTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$dropTableIfStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$renameTableStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$renameTableStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\OCI8\\\\Connection of property CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection\\ of overridden property CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:\\$db\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 7, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:join\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:join\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:orderBy\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orderBy\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:decrement\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:decrement\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:increment\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:increment\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) should be covariant with return type \\(CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:replace\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:buildDSN\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:convertDSN\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$connect_timeout has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$options has no type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$service has no type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$sslmode has no type specified\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\Postgre\\\\Connection of property CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$db\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Result.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\PreparedQueryInterface\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/PreparedQueryInterface.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Database/Query.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:compileBinds\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Query.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:setError\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/QueryInterface.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:freeResult\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/ResultInterface.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 9, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$selectOverride \\(bool\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:compileSelect\\(\\) should be contravariant with parameter \\$selectOverride \\(mixed\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:compileSelect\\(\\)$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:maxMinAvgSum\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:maxMinAvgSum\\(\\)$#', + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:replace\\(\\) should be covariant with return type \\(CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:replace\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', - 'count' => 13, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type array of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$unsigned is not the same as PHPDoc type array\\|bool of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$unsigned\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$createTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createTableIfStr\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$renameTableStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$renameTableStr\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection of property CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection\\ of overridden property CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:\\$db\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Result.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\SQLite3\\\\Connection of property CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$db\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:_getResult\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:copyData\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:dropIndexes\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLite3\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Utils.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:call\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in an elseif condition, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Database/Seeder.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:run\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Seeder.php', + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/Debug/Timer.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Debug/Toolbar.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getData\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SERVER_ADDR\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Email/Email.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SERVER_NAME\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Email/Email.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 12, - 'path' => __DIR__ . '/system/Email/Email.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Email/Email.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Email/Email.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Email/Email.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Static property CodeIgniter\\\\Email\\\\Email\\:\\:\\$func_overload \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Email/Email.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Encryption/Encryption.php', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', + 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, array\\|string\\|null given\\.$#', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$value \\(bool\\|int\\|string\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:set\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:set\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$value \\(bool\\|int\\|string\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:set\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:set\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$value \\(int\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:get\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:get\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$value \\(int\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:get\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:get\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Entity/Entity.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Events/Events.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:on\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Events/Events.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:removeListener\\(\\) has parameter \\$listener with no signature specified for callable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Events/Events.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Events/Events.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type int of property CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Files/File.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Files\\\\File\\:\\:\\$size \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\SessionMigrationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Files/File.php', + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Files/File.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/SessionMigrationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Filters/Filters.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Filters/Filters.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateClass\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Filters/Filters.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateView\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Filters/Filters.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 10, - 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Constructor of class CodeIgniter\\\\HTTP\\\\CURLRequest has an unused parameter \\$config\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTP_USER_AGENT\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string given\\.$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:sendBody\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:sendBody\\(\\)$#', + 'message' => '#^Only booleans are allowed in &&, mixed given on the right side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:sendBody\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\)\\) of method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:sendBody\\(\\)$#', + 'message' => '#^Only booleans are allowed in a negated boolean, mixed given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setContentType\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:setContentType\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setContentType\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\)\\) of method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setContentType\\(\\)$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listFull\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', + 'path' => __DIR__ . '/system/Commands/ListCommands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\Exceptions\\\\HTTPException\\) of method CodeIgniter\\\\HTTP\\\\Exceptions\\\\HTTPException\\:\\:forInvalidFile\\(\\) should be covariant with return type \\(static\\(CodeIgniter\\\\Exceptions\\\\FrameworkException\\)\\) of method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forInvalidFile\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listFull\\(\\) has parameter \\$commands with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Exceptions/HTTPException.php', + 'path' => __DIR__ . '/system/Commands/ListCommands.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type int of property CodeIgniter\\\\HTTP\\\\Exceptions\\\\RedirectException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listSimple\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Exceptions/RedirectException.php', + 'path' => __DIR__ . '/system/Commands/ListCommands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listSimple\\(\\) has parameter \\$commands with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Exceptions/RedirectException.php', + 'path' => __DIR__ . '/system/Commands/ListCommands.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', + 'path' => __DIR__ . '/system/Commands/Server/Serve.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', + 'message' => '#^Accessing offset \'CI_ENVIRONMENT\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Commands/Utilities/Environment.php', ]; $ignoreErrors[] = [ - 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Namespaces\\:\\:outputAllNamespaces\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$originalMimeType is not the same as PHPDoc type string\\|null of overridden property CodeIgniter\\\\Files\\\\File\\:\\:\\$originalMimeType\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Namespaces\\:\\:outputAllNamespaces\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$error \\(int\\) on left side of \\?\\? is not nullable\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Namespaces\\:\\:outputCINamespaces\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\) of method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:move\\(\\) should be compatible with return type \\(CodeIgniter\\\\Files\\\\File\\) of method CodeIgniter\\\\Files\\\\File\\:\\:move\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Namespaces\\:\\:outputCINamespaces\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Namespaces.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTPS\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Accessing offset \'HTTP_HOST\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'QUERY_STRING\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Assigning non\\-falsy\\-string directly on offset \'HTTP_HOST\' of \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'REQUEST_URI\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Only booleans are allowed in an if condition, Config\\\\Routing given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SCRIPT_NAME\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset array\\|string directly on \\$_GET is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Implicit array creation is not allowed \\- variable \\$filters might not exist\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Assigning string directly on offset \'QUERY_STRING\' of \\$_SERVER is discouraged\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:__construct\\(\\) has parameter \\$httpMethods with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:__construct\\(\\) has parameter \\$protectedControllers with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\URI of property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$uri is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\URI\\|null of overridden property CodeIgniter\\\\HTTP\\\\OutgoingRequest\\:\\:\\$uri\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'CONTENT_TYPE\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:addFilters\\(\\) has parameter \\$routes with no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Message.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \\(int\\|string\\) directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:generateSampleUri\\(\\) has parameter \\$route with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Message.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Message.php', + 'message' => '#^Property CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\AutoRouteCollector\\:\\:\\$httpMethods type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\ControllerMethodReader\\:\\:__construct\\(\\) has parameter \\$httpMethods with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Message.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\ControllerMethodReader\\:\\:getParameters\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Negotiate.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|null given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\ControllerMethodReader\\:\\:getRouteForDefaultController\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/OutgoingRequest.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\URI\\|null\\) of method CodeIgniter\\\\HTTP\\\\OutgoingRequest\\:\\:getUri\\(\\) should be covariant with return type \\(CodeIgniter\\\\HTTP\\\\URI\\) of method CodeIgniter\\\\HTTP\\\\OutgoingRequestInterface\\:\\:getUri\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\AutoRouterImproved\\\\ControllerMethodReader\\:\\:read\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/OutgoingRequest.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, array\\ given\\.$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$_GET on left side of \\?\\? always exists and is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\ControllerMethodReader\\:\\:getRouteWithoutController\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$_POST on left side of \\?\\? always exists and is not nullable\\.$#', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/ControllerMethodReader.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/HTTP/Request.php', + 'message' => '#^Method CodeIgniter\\\\Commands\\\\Utilities\\\\Routes\\\\FilterFinder\\:\\:getRouteFilters\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Commands/Utilities/Routes/FilterFinder.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string given\\.$#', + 'message' => '#^Accessing offset \'REMOTE_ADDR\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Request.php', + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ 'message' => '#^Accessing offset \'REQUEST_METHOD\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Accessing offset string directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'SERVER_SOFTWARE\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'message' => '#^Function cache\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', + 'message' => '#^Function class_uses_recursive\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string\\|null given on the right side\\.$#', + 'message' => '#^Function cookie\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'message' => '#^Function db_connect\\(\\) has parameter \\$db with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function esc\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function esc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function helper\\(\\) has parameter \\$filenames with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function lang\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function log_message\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function old\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function service\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function session\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function single_service\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function stringify_attributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function trait_uses_recursive\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function view\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function view\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function view_cell\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Common.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 5, - 'path' => __DIR__ . '/system/HTTP/Response.php', + 'count' => 2, + 'path' => __DIR__ . '/system/Common.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\ComposerScripts\\:\\:postUpdate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/ComposerScripts.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'CI_ENVIRONMENT\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Config/AutoloadConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset non\\-falsy\\-string directly on \\$_SERVER is discouraged\\.$#', 'count' => 4, - 'path' => __DIR__ . '/system/HTTP/SiteURI.php', + 'path' => __DIR__ . '/system/Config/BaseConfig.php', ]; $ignoreErrors[] = [ - 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseConfig\\:\\:__set_state\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/SiteURI.php', + 'path' => __DIR__ . '/system/Config/BaseConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseConfig\\:\\:initEnvValue\\(\\) has parameter \\$property with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\BaseConfig\\:\\:\\$registrars type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseConfig.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 10, - 'path' => __DIR__ . '/system/HTTP/URI.php', + 'count' => 3, + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:__callStatic\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/URI.php', + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$host \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:discoverServices\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/URI.php', + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\BaseService\\:\\:getSharedInstance\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/URI.php', + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/URI.php', + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTP_REFERER\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/HTTP/UserAgent.php', + 'message' => '#^Property CodeIgniter\\\\Config\\\\BaseService\\:\\:\\$instances type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTP_USER_AGENT\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Property CodeIgniter\\\\Config\\\\BaseService\\:\\:\\$mocks type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\BaseService\\:\\:\\$services type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/BaseService.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset string directly on \\$_SERVER is discouraged\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/UserAgent.php', + 'path' => __DIR__ . '/system/Config/DotEnv.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Assigning string directly on offset string of \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/DotEnv.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/HTTP/UserAgent.php', + 'path' => __DIR__ . '/system/Config/DotEnv.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/HTTP/UserAgent.php', + 'message' => '#^Method CodeIgniter\\\\Config\\\\DotEnv\\:\\:normaliseVariable\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/DotEnv.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 1024\\> given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'message' => '#^Method CodeIgniter\\\\Config\\\\DotEnv\\:\\:parse\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/DotEnv.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 128\\> given\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/DotEnv.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 16\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:__callStatic\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 1\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:createInstance\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 2048\\> given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:getComponentInstances\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 256\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:getDefinedInstance\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 2\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:getDefinedInstance\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 32\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:locateClass\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 4\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:setComponentInstances\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 512\\> given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:setOptions\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 64\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:verifyInstanceOf\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 8\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Factories\\:\\:verifyPreferApp\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Right side of && is always true\\.$#', + 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Factories.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, string\\|null given\\.$#', 'count' => 2, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factories.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$result might not be defined\\.$#', + 'message' => '#^Property CodeIgniter\\\\Config\\\\Factory\\:\\:\\$default type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', + 'path' => __DIR__ . '/system/Config/Factory.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'message' => '#^Property CodeIgniter\\\\Config\\\\Factory\\:\\:\\$models type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/form_helper.php', + 'path' => __DIR__ . '/system/Config/Factory.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\Routing\\:\\:\\$moduleRoutes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Routing.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Config\\\\Routing\\:\\:\\$routeFiles type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Routing.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Services.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/form_helper.php', + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Services\\:\\:curlrequest\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/form_helper.php', + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, int\\<0, max\\> given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Services\\:\\:email\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/form_helper.php', + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Services\\:\\:superglobals\\(\\) has parameter \\$get with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/form_helper.php', + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Config\\\\Services\\:\\:superglobals\\(\\) has parameter \\$server with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/html_helper.php', + 'path' => __DIR__ . '/system/Config/Services.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Helpers/test_helper.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Config/Services.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:setValidator\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:setValidator\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:validate\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:validate\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:validateData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:validateData\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Controller\\:\\:validateData\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Controller\\:\\:\\$helpers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Controller.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$offset \\(string\\) of method CodeIgniter\\\\Cookie\\\\Cookie\\:\\:offsetSet\\(\\) should be contravariant with parameter \\$offset \\(string\\|null\\) of method ArrayAccess\\\\:\\:offsetSet\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cookie/Cookie.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/Cookie/Cookie.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cookie\\\\CookieStore\\:\\:setCookie\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cookie/CookieStore.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cookie\\\\CookieStore\\:\\:setRawCookie\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cookie/CookieStore.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Cookie\\\\CookieStore\\:\\:validateCookies\\(\\) has parameter \\$cookies with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Cookie/CookieStore.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 30, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:__construct\\(\\) has parameter \\$tableName with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_like\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:addUnionStatement\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:batchObjectToArray\\(\\) has parameter \\$object with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:batchObjectToArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:buildSubquery\\(\\) has parameter \\$builder with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:deleteBatch\\(\\) has parameter \\$constraints with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:deleteBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:fieldsFromQuery\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:formatValues\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:formatValues\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:from\\(\\) has parameter \\$from with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getBinds\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getCompiledQBWhere\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getOperator\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getSetData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:getWhere\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:groupBy\\(\\) has parameter \\$by with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:having\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:havingNotIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:insert\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:insertBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:like\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:notHavingLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:notLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:objectToArray\\(\\) has parameter \\$object with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:objectToArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:onConstraint\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHaving\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orHavingNotIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orNotHavingLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orNotLike\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhere\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orWhereNotIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetRun\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetRun\\(\\) has parameter \\$qbResetItems with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:resetWrite\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:select\\(\\) has parameter \\$select with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:set\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:setData\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:setQueryAsData\\(\\) has parameter \\$columns with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:setUpdateBatch\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:trackAliases\\(\\) has parameter \\$table with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:union\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:unionAll\\(\\) has parameter \\$union with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:update\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:update\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateBatch\\(\\) has parameter \\$constraints with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:updateFields\\(\\) has parameter \\$ignore with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:upsert\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:upsertBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:where\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereHaving\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereNotIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:whereNotIn\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, TWhenNot given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an elseif condition, \\(callable\\)\\|null given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, TWhen given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBFrom type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBGroupBy type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBHaving type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBJoin type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBNoEscape type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBOptions type has no value type specified in iterable type array\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBOrderBy type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBSelect type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBWhere type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$binds type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$bindsKeyCount type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$joinTypes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 13, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_fieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_foreignKeyData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_indexData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:callFunction\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:close\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:escape\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:escape\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:escapeIdentifiers\\(\\) has parameter \\$item with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:escapeIdentifiers\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:foreignKeyDataToObjects\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:foreignKeyDataToObjects\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:getForeignKeyData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:getIndexData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:listTables\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:prepare\\(\\) has parameter \\$func with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:protectIdentifiers\\(\\) has parameter \\$item with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:protectIdentifiers\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:query\\(\\) has parameter \\$binds with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:setAliasedTables\\(\\) has parameter \\$aliases with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:table\\(\\) has parameter \\$tableName with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:transOff\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$aliasedTables type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$dataCache type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$encrypt type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$escapeChar type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$failover type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$pregEscapeChar type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$reservedIdentifiers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BasePreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getCustomResultObject\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getFirstRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getLastRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getNextRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getPreviousRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getResult\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getResultArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getRowArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getUnbufferedRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:setRow\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseResult\\:\\:setRow\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$className \\(class\\-string\\) of method CodeIgniter\\\\Database\\\\BaseResult\\:\\:getCustomResultObject\\(\\) should be contravariant with parameter \\$className \\(string\\) of method CodeIgniter\\\\Database\\\\ResultInterface\\\\:\\:getCustomResultObject\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseResult\\:\\:\\$customResultObject type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseResult\\:\\:\\$resultArray type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseResult\\:\\:\\$rowData type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseResult.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Database/BaseUtils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseUtils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseUtils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseUtils\\:\\:backup\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseUtils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseUtils\\:\\:getXMLFromResult\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseUtils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseUtils\\:\\:listDatabases\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseUtils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:connect\\(\\) has parameter \\$group with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:ensureFactory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:forge\\(\\) has parameter \\$group with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:getConnections\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Config\\:\\:utils\\(\\) has parameter \\$group with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Config\\:\\:\\$instances type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:callFunction\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:callFunction\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:escape\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:escape\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:query\\(\\) has parameter \\$binds with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:table\\(\\) has parameter \\$tableName with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ConnectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Database\\:\\:initDriver\\(\\) has parameter \\$argument with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Database\\:\\:load\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Database\\:\\:parseDSN\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Database\\:\\:parseDSN\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Database\\:\\:\\$connections type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forEmptyInputGiven\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forFindColumnHaveMultipleColumns\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forInvalidAllowedFields\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Exceptions\\\\DataException\\:\\:forTableNotFound\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Exceptions/DataException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 13, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeDefault\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeDefault\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeDefault\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeType\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnique\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnique\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnique\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnsigned\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnsigned\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_attributeUnsigned\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_createTable\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_createTableAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_processFields\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_processForeignKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:_processIndexes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:addColumn\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:addField\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:addKey\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:addPrimaryKey\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:addUniqueKey\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:createTable\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:dropColumn\\(\\) has parameter \\$columnNames with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:modifyColumn\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Forge\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$fields \\(array\\\\) does not accept array\\\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$fields type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$fkAllowActions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$foreignKeys type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$uniqueKeys type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:down\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Migration.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Migration\\:\\:up\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Migration.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:__construct\\(\\) has parameter \\$db with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:addHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:clearHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:ensureTable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:findMigrations\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:findNamespaceMigrations\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:force\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:getBatchHistory\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:getBatches\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:getCliMessages\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:getHistory\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:removeHistory\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, int\\<0, max\\> given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, max\\> given\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\MigrationRunner\\:\\:\\$cliMessages type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MigrationRunner.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:injectMock\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ModelFactory.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ModelFactory\\:\\:reset\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ModelFactory.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\MySQLi\\\\Builder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 11, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:_createTableAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:_processIndexes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:\\$_quoted_table_options type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\MySQLi\\\\Forge\\:\\:\\$_unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$mysqli\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mysqli_result\\|false\\) of method CodeIgniter\\\\Database\\\\MySQLi\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:_getResult\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Result\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Result\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Result\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Utils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\MySQLi\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/MySQLi/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:fieldsFromQuery\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:resetSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\OCI8\\\\Connection of property CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:bindParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:storedProcedure\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$reservedIdentifiers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$resetStmtId has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:\\$validDSNs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\OCI8\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:_attributeType\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$createTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createTableIfStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$dropDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$dropDatabaseStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type false of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$dropTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$dropTableIfStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$renameTableStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$renameTableStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$fkAllowActions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Forge\\:\\:\\$unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\OCI8\\\\Connection of property CodeIgniter\\\\Database\\\\OCI8\\\\PreparedQuery\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection\\ of overridden property CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:\\$db\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Result\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Result\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Result\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Utils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\OCI8\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 7, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:join\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:join\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:orderBy\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:orderBy\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:decrement\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:decrement\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:increment\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:increment\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) should be covariant with return type \\(CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:replace\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:buildDSN\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:convertDSN\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:escape\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:escape\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$connect_timeout has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$options has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$service has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:\\$sslmode has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_attributeType\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_createTableAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\Postgre\\\\Connection of property CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$db\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:\\$_unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\PreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\PreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Result\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Result\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Result\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Utils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\Postgre\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Postgre/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\PreparedQueryInterface\\:\\:execute\\(\\) has parameter \\$data with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/PreparedQueryInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\PreparedQueryInterface\\:\\:prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/PreparedQueryInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:compileBinds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:matchNamedBinds\\(\\) has parameter \\$binds with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:matchSimpleBinds\\(\\) has parameter \\$binds with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Query\\:\\:setBinds\\(\\) has parameter \\$binds with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\Query\\:\\:\\$binds type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Query.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:setError\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/QueryInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:freeResult\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getCustomResultObject\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getFirstRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getLastRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getNextRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getPreviousRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getResult\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getResultArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getResultObject\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getRowArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:getUnbufferedRow\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:setRow\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\ResultInterface\\:\\:setRow\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/ResultInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 9, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:fieldsFromQuery\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$selectOverride \\(bool\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:compileSelect\\(\\) should be contravariant with parameter \\$selectOverride \\(mixed\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:compileSelect\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:maxMinAvgSum\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:maxMinAvgSum\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:delete\\(\\) should be covariant with return type \\(bool\\|string\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:delete\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:replace\\(\\) should be covariant with return type \\(CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:replace\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#', + 'count' => 13, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_attributeType\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_createTableAttributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:_processIndexes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type array of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$unsigned is not the same as PHPDoc type array\\|bool of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$unsigned\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$createDatabaseStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createDatabaseStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$createTableIfStr is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$createTableIfStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$renameTableStr is not the same as PHPDoc type string\\|false of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$renameTableStr\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$fkAllowActions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLSRV\\\\Forge\\:\\:\\$unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:parameterize\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection of property CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection\\ of overridden property CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:\\$db\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLSRV\\\\PreparedQuery\\:\\:\\$parameters type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Result\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Result\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Result\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Utils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Utils\\:\\:\\$listDatabases is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$listDatabases\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLSRV/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:error\\(\\) should be covariant with return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_alterTable\\(\\) has parameter \\$processedFields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeAutoIncrement\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeType\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_attributeType\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_processColumn\\(\\) has parameter \\$processedField with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_processForeignKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\Database\\\\SQLite3\\\\Connection of property CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:\\$db is not the same as PHPDoc type CodeIgniter\\\\Database\\\\BaseConnection of overridden property CodeIgniter\\\\Database\\\\Forge\\:\\:\\$db\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:\\$_unsigned type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Forge.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_execute\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_prepare\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\\\:\\:_getResult\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Result\\:\\:fetchAssoc\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Result\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Result\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Result.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:addForeignKey\\(\\) has parameter \\$foreignKeys with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:addPrimaryKey\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:copyData\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:dropIndexes\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:formatFields\\(\\) has parameter \\$fields with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:formatFields\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:\\$foreignKeys type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Database\\\\SQLite3\\\\Table\\:\\:\\$keys type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Table.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Utils\\:\\:_backup\\(\\) has parameter \\$prefs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLite3\\\\Utils\\:\\:\\$optimizeTable is not the same as PHPDoc type bool\\|string of overridden property CodeIgniter\\\\Database\\\\BaseUtils\\:\\:\\$optimizeTable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/SQLite3/Utils.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:call\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Seeder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Database\\\\Seeder\\:\\:run\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/Seeder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:collectVars\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskData\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskData\\(\\) has parameter \\$keysToMask with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskSensitiveData\\(\\) has parameter \\$keysToMask with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskSensitiveData\\(\\) has parameter \\$trace with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\BaseExceptionHandler\\:\\:maskSensitiveData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/BaseExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\ExceptionHandler\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/ExceptionHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:collectVars\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:determineCodes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskData\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskData\\(\\) has parameter \\$keysToMask with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskSensitiveData\\(\\) has parameter \\$keysToMask with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskSensitiveData\\(\\) has parameter \\$trace with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:maskSensitiveData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:renderBacktrace\\(\\) has parameter \\$backtrace with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Exceptions\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Exceptions.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Iterator\\:\\:\\$results type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Iterator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Iterator\\:\\:\\$tests type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Iterator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/Debug/Timer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Timer\\:\\:getTimers\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Timer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Timer\\:\\:\\$timers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Timer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:collectTimelineData\\(\\) has parameter \\$collectors with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:collectTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:collectVarData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:renderTimeline\\(\\) has parameter \\$collectors with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:renderTimeline\\(\\) has parameter \\$styles with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:renderTimelineRecursive\\(\\) has parameter \\$rows with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:renderTimelineRecursive\\(\\) has parameter \\$styles with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:structureTimelineData\\(\\) has parameter \\$elements with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\:\\:structureTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:getAsArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:getVarData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\BaseCollector\\:\\:timelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/BaseCollector.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Config\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Config.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:\\$connections type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Database\\:\\:\\$queries type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Database.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Events\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Events\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Files\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Files.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\History\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/History.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\History\\:\\:\\$files type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/History.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Logs\\:\\:collectLogs\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Logs\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Logs\\:\\:\\$data type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Routes\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Routes.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Timers\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Timers.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getData\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Views\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Views\\:\\:getVarData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Views\\:\\:\\$views type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Views.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SERVER_ADDR\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SERVER_NAME\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 12, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:cleanEmail\\(\\) has parameter \\$email with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:cleanEmail\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:initialize\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:printDebugger\\(\\) has parameter \\$include with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:setArchiveValues\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:setTo\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:stringToArray\\(\\) has parameter \\$email with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:stringToArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Email\\\\Email\\:\\:validateEmail\\(\\) has parameter \\$email with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$BCCArray type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$CCArray type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$archive type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$attachments type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$bitDepths type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$debugMessage type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$headers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$priorities type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$protocols type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$recipients type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Email\\\\Email\\:\\:\\$tmpArchive type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Static property CodeIgniter\\\\Email\\\\Email\\:\\:\\$func_overload \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Email/Email.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\EncrypterInterface\\:\\:decrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/EncrypterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\EncrypterInterface\\:\\:encrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/EncrypterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Encryption/Encryption.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Encryption\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Encryption.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Encryption\\\\Encryption\\:\\:\\$drivers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Encryption.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\BaseHandler\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\OpenSSLHandler\\:\\:decrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\OpenSSLHandler\\:\\:encrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, array\\|string\\|null given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Encryption\\\\Handlers\\\\OpenSSLHandler\\:\\:\\$digestSize type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/OpenSSLHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\SodiumHandler\\:\\:decrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\SodiumHandler\\:\\:encrypt\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Encryption\\\\Handlers\\\\SodiumHandler\\:\\:parseParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Encryption/Handlers/SodiumHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ArrayCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ArrayCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ArrayCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ArrayCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ArrayCast\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ArrayCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ArrayCast\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ArrayCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ArrayCast\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ArrayCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:set\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BaseCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BooleanCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BooleanCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\BooleanCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/BooleanCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CSVCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CSVCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CSVCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CSVCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CSVCast\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CSVCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CSVCast\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CSVCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CSVCast\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CSVCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:set\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/CastInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\DatetimeCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/DatetimeCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\DatetimeCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/DatetimeCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\FloatCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/FloatCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\FloatCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/FloatCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$value \\(bool\\|int\\|string\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:set\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:set\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$value \\(bool\\|int\\|string\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:set\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:set\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$value \\(int\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:get\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\BaseCast\\:\\:get\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$value \\(int\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\IntBoolCast\\:\\:get\\(\\) should be contravariant with parameter \\$value \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Entity\\\\Cast\\\\CastInterface\\:\\:get\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntBoolCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\IntegerCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntegerCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\IntegerCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/IntegerCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\JsonCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/JsonCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\JsonCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/JsonCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\JsonCast\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/JsonCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\JsonCast\\:\\:set\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/JsonCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\JsonCast\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/JsonCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ObjectCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ObjectCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\ObjectCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/ObjectCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\StringCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/StringCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\StringCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/StringCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\TimestampCast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/TimestampCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\TimestampCast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/TimestampCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\TimestampCast\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/TimestampCast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\URICast\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/URICast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Cast\\\\URICast\\:\\:get\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Cast/URICast.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:__set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:castAs\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:fill\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:injectRawData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:jsonSerialize\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:setAttributes\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Entity\\\\Entity\\:\\:toRawArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Entity\\\\Entity\\:\\:\\$attributes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Entity\\\\Entity\\:\\:\\$original type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Entity/Entity.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:listeners\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:on\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:removeListener\\(\\) has parameter \\$listener with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Events\\\\Events\\:\\:setFiles\\(\\) has parameter \\$files with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Events\\\\Events\\:\\:\\$listeners type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Events/Events.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:lang\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type int of property CodeIgniter\\\\Exceptions\\\\PageNotFoundException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/File.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Files\\\\File\\:\\:\\$size \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Files/File.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Files/File.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\CSRF\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/CSRF.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\CSRF\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/CSRF.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\DebugToolbar\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/DebugToolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\DebugToolbar\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/DebugToolbar.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\FilterInterface\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/FilterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\FilterInterface\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/FilterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Argument \\#1 \\$name \\(\'Config\\\\\\\\Modules\'\\) passed to function config does not extend CodeIgniter\\\\\\\\Config\\\\\\\\BaseConfig\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:checkExcept\\(\\) has parameter \\$paths with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:checkPseudoRegex\\(\\) has parameter \\$paths with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:enableFilters\\(\\) has parameter \\$names with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:getFilters\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:getFiltersClass\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:pathApplies\\(\\) has parameter \\$paths with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Filters\\:\\:registerArguments\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Filters\\\\Filters\\:\\:\\$filters type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Filters\\\\Filters\\:\\:\\$filtersClass type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Filters.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Honeypot\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Honeypot.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\Honeypot\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/Honeypot.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:checkControl\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:checkControl\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:checkEncoding\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\InvalidChars\\:\\:checkEncoding\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/InvalidChars.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\SecureHeaders\\:\\:after\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/SecureHeaders.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Filters\\\\SecureHeaders\\:\\:before\\(\\) has parameter \\$arguments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Filters/SecureHeaders.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Format\\\\FormatterInterface\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Format/FormatterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Format\\\\JSONFormatter\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Format/JSONFormatter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatter\\:\\:arrayToXML\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Format/XMLFormatter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Format\\\\XMLFormatter\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Format/XMLFormatter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getArgs\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getCookie\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getCookie\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGet\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGet\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGet\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGetPost\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGetPost\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getGetPost\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPost\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPost\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPost\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPostGet\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPostGet\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getPostGet\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:getSegments\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:returnNullOrEmptyArray\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:returnNullOrEmptyArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:\\$args type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:\\$options type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CLIRequest\\:\\:\\$segments type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CLIRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 10, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Constructor of class CodeIgniter\\\\HTTP\\\\CURLRequest has an unused parameter \\$config\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyBody\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyBody\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyMethod\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyMethod\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyRequestHeaders\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyRequestHeaders\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:delete\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:get\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:head\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:options\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:parseOptions\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:patch\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:post\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:put\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:request\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:sendRequest\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setCURLOptions\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setCURLOptions\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setCURLOptions\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setForm\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setJSON\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setResponseHeaders\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:\\$config type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:\\$defaultConfig type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:\\$defaultOptions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:\\$redirectDefaults type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addBaseURI\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addChildSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addConnectSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addFontSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addFormAction\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addFrameAncestor\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addFrameSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addImageSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addManifestSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addMediaSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addObjectSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addOption\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addPluginType\\(\\) has parameter \\$mime with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addSandbox\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addScriptSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addStyleSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:addToHeader\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:setDefaultSrc\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$baseURI type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$childSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$connectSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$defaultSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$fontSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$formAction type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$frameAncestors type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$frameSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$imageSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$manifestSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$mediaSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$nonces type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$objectSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$pluginTypes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$reportOnlyHeaders type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$sandbox type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$scriptSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$styleSrc type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$tempHeaders type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\ContentSecurityPolicy\\:\\:\\$validSources type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ContentSecurityPolicy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'HTTP_USER_AGENT\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setCache\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:sendBody\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:sendBody\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\DownloadResponse\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:sendBody\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\)\\) of method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:sendBody\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setContentType\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\Response\\)\\) of method CodeIgniter\\\\HTTP\\\\Response\\:\\:setContentType\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\) of method CodeIgniter\\\\HTTP\\\\DownloadResponse\\:\\:setContentType\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\HTTP\\\\ResponseInterface\\)\\) of method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setContentType\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/DownloadResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\Exceptions\\\\HTTPException\\) of method CodeIgniter\\\\HTTP\\\\Exceptions\\\\HTTPException\\:\\:forInvalidFile\\(\\) should be covariant with return type \\(static\\(CodeIgniter\\\\Exceptions\\\\FrameworkException\\)\\) of method CodeIgniter\\\\Exceptions\\\\FrameworkException\\:\\:forInvalidFile\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Exceptions/HTTPException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type int of property CodeIgniter\\\\HTTP\\\\Exceptions\\\\RedirectException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Exceptions/RedirectException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Exceptions/RedirectException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:all\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:createFileObject\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:fixFilesArray\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:fixFilesArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:getValueDotNotationSyntax\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:getValueDotNotationSyntax\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Files\\\\FileCollection\\:\\:\\$files type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/FileCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$originalMimeType is not the same as PHPDoc type string\\|null of overridden property CodeIgniter\\\\Files\\\\File\\:\\:\\$originalMimeType\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$error \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\) of method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:move\\(\\) should be compatible with return type \\(CodeIgniter\\\\Files\\\\File\\) of method CodeIgniter\\\\Files\\\\File\\:\\:move\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Files/UploadedFile.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'HTTPS\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'QUERY_STRING\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'REQUEST_URI\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SCRIPT_NAME\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset array\\|string directly on \\$_GET is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Assigning string directly on offset \'QUERY_STRING\' of \\$_SERVER is discouraged\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getCookie\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getCookie\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getCookie\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getFileMultiple\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getFiles\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGet\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGet\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGet\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGetPost\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGetPost\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getGetPost\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getJSON\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getJsonVar\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getJsonVar\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getJsonVar\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getOldInput\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPost\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPost\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPost\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPostGet\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPostGet\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getPostGet\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getRawInput\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getRawInputVar\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getRawInputVar\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getRawInputVar\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getVar\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getVar\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:getVar\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:negotiate\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:setValidLocales\\(\\) has parameter \\$locales with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\URI of property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$uri is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\URI\\|null of overridden property CodeIgniter\\\\HTTP\\\\OutgoingRequest\\:\\:\\$uri\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$oldInput type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$validLocales type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/IncomingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'CONTENT_TYPE\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \\(int\\|string\\) directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Message\\:\\:getHeader\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Message\\:\\:header\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Message\\:\\:setHeader\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$headerMap type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$validProtocolVersions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Message.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\MessageInterface\\:\\:header\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/MessageInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\MessageInterface\\:\\:setHeader\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/MessageInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:charset\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:encoding\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:getBestMatch\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:language\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:match\\(\\) has parameter \\$acceptable with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchLocales\\(\\) has parameter \\$acceptable with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchLocales\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchParameters\\(\\) has parameter \\$acceptable with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchParameters\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchTypes\\(\\) has parameter \\$acceptable with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:matchTypes\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:media\\(\\) has parameter \\$supported with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Negotiate\\:\\:parseHeader\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Negotiate.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\OutgoingRequest\\:\\:__construct\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/OutgoingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/OutgoingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\HTTP\\\\URI\\|null\\) of method CodeIgniter\\\\HTTP\\\\OutgoingRequest\\:\\:getUri\\(\\) should be covariant with return type \\(CodeIgniter\\\\HTTP\\\\URI\\) of method CodeIgniter\\\\HTTP\\\\OutgoingRequestInterface\\:\\:getUri\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/OutgoingRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\RedirectResponse\\:\\:route\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\RedirectResponse\\:\\:with\\(\\) has parameter \\$message with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, array\\ given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$_GET on left side of \\?\\? always exists and is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$_POST on left side of \\?\\? always exists and is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RedirectResponse.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:fetchGlobal\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:fetchGlobal\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:fetchGlobal\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:getEnv\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:getEnv\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:getServer\\(\\) has parameter \\$flags with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Request\\:\\:getServer\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Request\\:\\:\\$globals type has no value type specified in iterable type array\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/HTTP/Request.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\RequestInterface\\:\\:getServer\\(\\) has parameter \\$index with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/RequestInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'REQUEST_METHOD\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'SERVER_SOFTWARE\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:doSetCookie\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:doSetRawCookie\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:formatBody\\(\\) has parameter \\$body with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:setCache\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:setCookie\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:setJSON\\(\\) has parameter \\$body with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\Response\\:\\:setXML\\(\\) has parameter \\$body with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string\\|null given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Response\\:\\:\\$cookies type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\Response\\:\\:\\$statusCodes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 5, + 'path' => __DIR__ . '/system/HTTP/Response.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setCache\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ResponseInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setCookie\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ResponseInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setJSON\\(\\) has parameter \\$body with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ResponseInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ResponseInterface\\:\\:setXML\\(\\) has parameter \\$body with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/ResponseInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:applyParts\\(\\) has parameter \\$parts with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:baseUrl\\(\\) has parameter \\$relativePath with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:convertToSegments\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:parseRelativePath\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:siteUrl\\(\\) has parameter \\$relativePath with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:stringifyRelativePath\\(\\) has parameter \\$relativePath with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:\\$baseSegments type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\SiteURI\\:\\:\\$segments type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/SiteURI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 10, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:applyParts\\(\\) has parameter \\$parts with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:changeSchemeAndPath\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:getQuery\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:getSegments\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:parseStr\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HTTP\\\\URI\\:\\:setQueryArray\\(\\) has parameter \\$query with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$defaultPorts type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$host \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$query type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$segments type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HTTP/URI.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'HTTP_REFERER\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'HTTP_USER_AGENT\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, array\\ given on the right side\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/HTTP/UserAgent.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_attach_indexed_value\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_attach_indexed_value\\(\\) has parameter \\$result with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_attach_indexed_value\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_attach_indexed_value\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_search_dot\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_search_dot\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _array_search_dot\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_deep_search\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_deep_search\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_flatten_with_dots\\(\\) has parameter \\$array with no value type specified in iterable type iterable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_flatten_with_dots\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_group_by\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_group_by\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_group_by\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_sort_by_multiple_keys\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function array_sort_by_multiple_keys\\(\\) has parameter \\$sortColumns with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function dot_array_search\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function dot_array_search\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/array_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function get_cookie\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/cookie_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function set_cookie\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/cookie_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function directory_map\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function get_dir_file_info\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function get_file_info\\(\\) has parameter \\$returnedValues with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function get_file_info\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function get_filenames\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 1024\\> given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 128\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 16\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 1\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 2048\\> given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 256\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 2\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 32\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 4\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 512\\> given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 64\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, int\\<0, 8\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Right side of && is always true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$result might not be defined\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/filesystem_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to function is_array\\(\\) with array will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_button\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_button\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_checkbox\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_checkbox\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_datalist\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_dropdown\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_dropdown\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_dropdown\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_dropdown\\(\\) has parameter \\$selected with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_fieldset\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_hidden\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_hidden\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_input\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_input\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_label\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_multiselect\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_multiselect\\(\\) has parameter \\$name with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_multiselect\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_multiselect\\(\\) has parameter \\$selected with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_open\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_open\\(\\) has parameter \\$hidden with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_open_multipart\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_open_multipart\\(\\) has parameter \\$hidden with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_password\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_password\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_radio\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_radio\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_reset\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_reset\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_submit\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_submit\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_textarea\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_textarea\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_upload\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function form_upload\\(\\) has parameter \\$extra with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function parse_form_attributes\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function parse_form_attributes\\(\\) has parameter \\$default with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, array given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, int\\<0, max\\> given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/form_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _list\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _list\\(\\) has parameter \\$list with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _media\\(\\) has parameter \\$tracks with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function _media\\(\\) has parameter \\$types with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function audio\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function audio\\(\\) has parameter \\$tracks with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function img\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function img\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function object\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function ol\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function ol\\(\\) has parameter \\$list with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function script_tag\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function ul\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function ul\\(\\) has parameter \\$list with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function video\\(\\) has parameter \\$src with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function video\\(\\) has parameter \\$tracks with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/html_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function d\\(\\) has parameter \\$vars with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function dd\\(\\) has parameter \\$vars with no value type specified in iterable type array\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/kint_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function format_number\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/number_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Helpers/test_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function fake\\(\\) has parameter \\$overrides with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/test_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function fake\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/test_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/text_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function strip_slashes\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/text_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function strip_slashes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/text_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function word_censor\\(\\) has parameter \\$censored with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/text_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/text_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function anchor\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function anchor\\(\\) has parameter \\$uri with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function anchor_popup\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function base_url\\(\\) has parameter \\$relativePath with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function mailto\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function safe_mailto\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Function site_url\\(\\) has parameter \\$relativePath with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Implicit array creation is not allowed \\- variable \\$atts might not exist\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$atts might not be defined\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Helpers/url_helper.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Honeypot/Honeypot.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HotReloader\\\\DirectoryHasher\\:\\:hashApp\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HotReloader/DirectoryHasher.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\HotReloader\\\\HotReloader\\:\\:sendEvent\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HotReloader/HotReloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in \\|\\|, int given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HotReloader/HotReloader.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\HotReloader\\\\IteratorFilter\\:\\:\\$watchedExtensions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/HotReloader/IteratorFilter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\Time\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\Time\\) of method CodeIgniter\\\\I18n\\\\Time\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTimeImmutable\\)\\) of method DateTimeImmutable\\:\\:setTimestamp\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\Time\\) of method CodeIgniter\\\\I18n\\\\Time\\:\\:setTimezone\\(\\) should be covariant with return type \\(static\\(DateTimeImmutable\\)\\) of method DateTimeImmutable\\:\\:setTimezone\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/I18n/Time.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\TimeLegacy\\) of method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTime\\)\\) of method DateTime\\:\\:setTimestamp\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\TimeLegacy\\) of method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTimezone\\(\\) should be covariant with return type \\(static\\(DateTime\\)\\) of method DateTime\\:\\:setTimezone\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:__call\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:__call\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_text\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:calcAspectRatio\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:calcCropCoords\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:text\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$supportTransparency type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$textDefaults type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:fit\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\ImageHandlerInterface\\)\\) of method CodeIgniter\\\\Images\\\\ImageHandlerInterface\\:\\:fit\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:resize\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\ImageHandlerInterface\\)\\) of method CodeIgniter\\\\Images\\\\ImageHandlerInterface\\:\\:resize\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Comparison operation "\\>\\=" between \\(array\\|float\\|int\\) and 0 results in an error\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 9, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_text\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:process\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string\\|null of property CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:\\$resource is not the same as PHPDoc type resource\\|null of overridden property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$resource\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$height \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$width \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_resize\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\)\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_resize\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_crop\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\)\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_crop\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Image.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\Image\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/Image.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Images\\\\ImageHandlerInterface\\:\\:text\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Images/ImageHandlerInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:formatMessage\\(\\) has parameter \\$message with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:formatMessage\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:getLine\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:getTranslationOutput\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:load\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:parseLine\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Language\\\\Language\\:\\:requireFile\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Language\\\\Language\\:\\:\\$language type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Language\\\\Language\\:\\:\\$loadedFiles type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Language/Language.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\BaseHandler\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Handlers\\\\BaseHandler\\:\\:\\$handles type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:format\\(\\) has parameter \\$object with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:format\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:\\$json type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Handlers\\\\ChromeLoggerHandler\\:\\:\\$levels type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Handlers\\\\FileHandler\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Strict comparison using \\=\\=\\= between true and true will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Logger\\:\\:determineFile\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Log\\\\Logger\\:\\:interpolate\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$level \\(string\\) of method CodeIgniter\\\\Log\\\\Logger\\:\\:log\\(\\) should be contravariant with parameter \\$level \\(mixed\\) of method Psr\\\\Log\\\\LoggerInterface\\:\\:log\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$handlers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$loggableLevels type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Log/Logger.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:__call\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:__call\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:__get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:classToArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doDelete\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doFind\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doInsertBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doProtectFieldsForInsert\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doUpdate\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:doUpdateBatch\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:getIdValue\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:idValue\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:idValue\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:set\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:shouldUpdate\\(\\) has parameter \\$row with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Model\\:\\:update\\(\\) has parameter \\$id with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, array given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, array\\|int\\|string\\|null given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Model\\:\\:\\$escape type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Model\\:\\:\\$tempData type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Model\\:\\:__call\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\BaseModel\\)\\|null\\) of method CodeIgniter\\\\BaseModel\\:\\:__call\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Model.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Modules\\\\Modules\\:\\:__set_state\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Modules/Modules.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset mixed directly on \\$_GET is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Pager\\:\\:getDetails\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\Pager\\:\\:only\\(\\) has parameter \\$queries with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, array given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Pager\\\\Pager\\:\\:\\$groups type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Pager\\\\Pager\\:\\:\\$only type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Pager\\\\Pager\\:\\:\\$segment type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/Pager.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\PagerInterface\\:\\:getDetails\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/PagerInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Pager\\\\PagerRenderer\\:\\:__construct\\(\\) has parameter \\$details with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Pager/PagerRenderer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\ContentReplacer\\:\\:replace\\(\\) has parameter \\$replaces with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/ContentReplacer.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Publisher\\\\Publisher\\:\\:replace\\(\\) has parameter \\$replaces with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Publisher/Publisher.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Argument \\#1 \\$name \\(class\\-string\\) passed to function model does not extend CodeIgniter\\\\\\\\Model\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, object\\|string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\CLIRequest\\|CodeIgniter\\\\HTTP\\\\IncomingRequest of property CodeIgniter\\\\RESTful\\\\BaseResource\\:\\:\\$request is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\RequestInterface of overridden property CodeIgniter\\\\Controller\\:\\:\\$request\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/BaseResource.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/RESTful/ResourceController.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouter\\:\\:__construct\\(\\) has parameter \\$cliRoutes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouter\\:\\:getRoute\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouter\\:\\:scanControllers\\(\\) has parameter \\$segments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouter\\:\\:scanControllers\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc tag @var for variable \\$params has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouter.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouterImproved\\:\\:createSegments\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouterImproved.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouterImproved\\:\\:getRoute\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouterImproved.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, Config\\\\Routing given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouterImproved.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\AutoRouterInterface\\:\\:getRoute\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/AutoRouterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type int of property CodeIgniter\\\\Router\\\\Exceptions\\\\RedirectException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Exceptions/RedirectException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:add\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:add\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:addPlaceholder\\(\\) has parameter \\$placeholder with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:buildReverseRoute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:cli\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:cli\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:create\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:create\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:delete\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:delete\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:environment\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:fillRouteParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:get\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:get\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:getRoutes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:group\\(\\) has parameter \\$params with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:group\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:head\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:head\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:map\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:map\\(\\) has parameter \\$routes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:match\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:match\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:match\\(\\) has parameter \\$verbs with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:options\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:options\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:patch\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:patch\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:post\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:post\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:presenter\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:processArrayCallableSyntax\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:put\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:put\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:resource\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:view\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, array\\ given on the left side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$currentOptions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$defaultHTTPMethods type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$routeFiles type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$routes type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$routesNames type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\RouteCollection\\:\\:\\$routesOptions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:add\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:add\\(\\) has parameter \\$to with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:addPlaceholder\\(\\) has parameter \\$placeholder with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'REQUEST_METHOD\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFilterForRoute\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFiltersForRoute\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:isFiltered\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:setHTTPVerb\\(\\)\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 3, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:get404Override\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:getMatchedRoute\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:getMatchedRouteOptions\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:params\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:scanControllers\\(\\) has parameter \\$segments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:scanControllers\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setMatchedRoute\\(\\) has parameter \\$handler with no signature specified for callable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setRequest\\(\\) has parameter \\$segments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:validateRequest\\(\\) has parameter \\$segments with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:validateRequest\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\Router\\:\\:\\$matchedRoute type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\Router\\:\\:\\$matchedRouteOptions type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Router\\\\Router\\:\\:\\$params type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/Router.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Router\\\\RouterInterface\\:\\:params\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Router/RouterInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forEmptySavepath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSameSiteSetting\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePathFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forMissingDatabaseTable\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forWriteProtectedSavePath\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Session\\\\Handlers\\\\ArrayHandler\\:\\:\\$cache has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/ArrayHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$savePath type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/BaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\Database\\\\PostgreHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/Database/PostgreHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Session/Handlers/Database/PostgreHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Session/Handlers/DatabaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\DatabaseHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/DatabaseHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\FileHandler\\:\\:configureSessionIDRegex\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Session\\\\Handlers\\\\FileHandler\\:\\:\\$savePath is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$savePath\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Variable \\$written might not be defined\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'count' => 4, + 'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Accessing offset \'HTTP_X_REQUESTED_WITH\' directly on \\$_SERVER is discouraged\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:__set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configure\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configureSidLength\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:getFlashKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:getFlashdata\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:getTempKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:getTempdata\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:initVars\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:keepFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:markAsFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:markAsTempdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:push\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:push\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:remove\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:remove\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:set\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:set\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setFlashdata\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setFlashdata\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setTempdata\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setTempdata\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:stop\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkTempdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\) of method CodeIgniter\\\\Session\\\\Session\\:\\:markAsFlashdata\\(\\) should be covariant with return type \\(false\\) of method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:markAsFlashdata\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/Session.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:getFlashKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:getFlashdata\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:getTempKeys\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:getTempdata\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:keepFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:markAsFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:markAsTempdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:set\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:set\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:set\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setFlashdata\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setFlashdata\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setTempdata\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setTempdata\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkFlashdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkTempdata\\(\\) has parameter \\$key with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Session/SessionInterface.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Superglobals\\:\\:__construct\\(\\) has parameter \\$get with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Superglobals\\:\\:__construct\\(\\) has parameter \\$server with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Superglobals\\:\\:get\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Superglobals\\:\\:setGetArray\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Superglobals\\:\\:\\$get type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Superglobals\\:\\:\\$server type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Superglobals.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:dontSeeInDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:grabFromDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:hasInDatabase\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeInDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeNumRecords\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:assertCloseEnough\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:getPrivateMethodInvoker\\(\\) return type has no signature specified for Closure\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockEmail\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetFactories\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetServices\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:setPrivateProperty\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, CodeIgniter\\\\CodeIgniter given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$headers type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$insertCache type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$namespace type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$seed type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$setUpMethods type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$tearDownMethods type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$traits type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Constraints\\\\SeeInDatabase\\:\\:__construct\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Constraints/SeeInDatabase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Constraints\\\\SeeInDatabase\\:\\:\\$data type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Constraints/SeeInDatabase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Call to function is_array\\(\\) with non\\-empty\\-array will always evaluate to true\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/DOMParser.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\DOMParser\\:\\:doXPath\\(\\) has parameter \\$paths with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/DOMParser.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:__construct\\(\\) has parameter \\$formatters with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:create\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:createMock\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:getFormatters\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:getOverrides\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:make\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:makeArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:resetCounts\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:setFormatters\\(\\) has parameter \\$formatters with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:setOverrides\\(\\) has parameter \\$overrides with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#1 \\$name of function model expects a valid class string, string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Fabricator\\:\\:\\$dateFields type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Fabricator\\:\\:\\$formatters type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Fabricator\\:\\:\\$overrides type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Fabricator\\:\\:\\$tableCounts type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Fabricator\\:\\:\\$tempOverrides type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Fabricator.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Assigning \'test\' directly on offset \'HTTPS\' of \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Assigning string directly on offset \'REQUEST_METHOD\' of \\$_SERVER is discouraged\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:call\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:delete\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:dontSeeInDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:get\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:grabFromDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:hasInDatabase\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:options\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:patch\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:populateGlobals\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:post\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:put\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeInDatabase\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeNumRecords\\(\\) has parameter \\$where with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setRequestBody\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:withHeaders\\(\\) has parameter \\$headers with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:withRoutes\\(\\) has parameter \\$routes with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:withSession\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Only booleans are allowed in a negated boolean, CodeIgniter\\\\Router\\\\RouteCollection\\|null given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$clean \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Interfaces\\\\FabricatorModel\\:\\:find\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Interfaces/FabricatorModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Interfaces\\\\FabricatorModel\\:\\:insert\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Interfaces/FabricatorModel.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockBuilder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockBuilder.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCLIConfig\\:\\:\\$CSRFExcludeURIs has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCLIConfig.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getBaseURI\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getDelay\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:sendRequest\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has parameter \\$output with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$curl_options has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$output has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCache\\:\\:getMetaData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Cannot access property \\$insert_id on object\\|resource\\|false\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_fieldData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_foreignKeyData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_indexData\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has parameter \\$return with no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:\\$returnValues has no type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:query\\(\\) should be covariant with return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:query\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:query\\(\\) should be covariant with return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:query\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(bool\\|object\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:execute\\(\\) should be covariant with return type \\(object\\|resource\\|false\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:execute\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:connect\\(\\) should be covariant with return type \\(object\\|resource\\|false\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:connect\\(\\)$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:setDatabase\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:setDatabase\\(\\)$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getEventsFile\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', +]; +$ignoreErrors[] = [ + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getListeners\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getSimulate\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/text_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:unInitialize\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/text_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockFileLogger\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/url_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockFileLogger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Implicit array creation is not allowed \\- variable \\$atts might not exist\\.$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockFileLogger\\:\\:\\$destination has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/url_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockFileLogger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockLanguage\\:\\:disableIntlSupport\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/url_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLanguage.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$atts might not be defined\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockLanguage\\:\\:requireFile\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Helpers/url_helper.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLanguage.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockLanguage\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Honeypot/Honeypot.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLanguage.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in \\|\\|, int given on the right side\\.$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$dateFormat has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/HotReloader/HotReloader.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\Time\\) of method CodeIgniter\\\\I18n\\\\Time\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTimeImmutable\\)\\) of method DateTimeImmutable\\:\\:setTimestamp\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$handlers has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/I18n/Time.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\Time\\) of method CodeIgniter\\\\I18n\\\\Time\\:\\:setTimezone\\(\\) should be covariant with return type \\(static\\(DateTimeImmutable\\)\\) of method DateTimeImmutable\\:\\:setTimezone\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$threshold has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/I18n/Time.php', + 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/I18n/Time.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getFormat\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\TimeLegacy\\) of method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTimestamp\\(\\) should be covariant with return type \\(static\\(DateTime\\)\\) of method DateTime\\:\\:setTimestamp\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModel\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\I18n\\\\TimeLegacy\\) of method CodeIgniter\\\\I18n\\\\TimeLegacy\\:\\:setTimezone\\(\\) should be covariant with return type \\(static\\(DateTime\\)\\) of method DateTime\\:\\:setTimezone\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModelName\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/I18n/TimeLegacy.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:__call\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getFormat\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModel\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:fit\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\ImageHandlerInterface\\)\\) of method CodeIgniter\\\\Images\\\\ImageHandlerInterface\\:\\:fit\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModelName\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:resize\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\ImageHandlerInterface\\)\\) of method CodeIgniter\\\\Images\\\\ImageHandlerInterface\\:\\:resize\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/BaseHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Comparison operation "\\>\\=" between \\(array\\|float\\|int\\) and 0 results in an error\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 9, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string\\|null of property CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:\\$resource is not the same as PHPDoc type resource\\|null of overridden property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$resource\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$height \\(int\\) on left side of \\?\\? is not nullable\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:getPretend\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$width \\(int\\) on left side of \\?\\? is not nullable\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:misbehave\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_resize\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\)\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_resize\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:fetchAssoc\\(\\) should return mixed but return statement is missing\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:_crop\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\)\\) of method CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:_crop\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:getFieldData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Handlers/ImageMagickHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Images/Image.php', + 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php', + 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:fetchAssoc\\(\\) should be covariant with return type \\(array\\|false\\|null\\) of method CodeIgniter\\\\Database\\\\BaseResult\\\\:\\:fetchAssoc\\(\\)$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', ]; $ignoreErrors[] = [ - 'message' => '#^Strict comparison using \\=\\=\\= between true and true will always evaluate to true\\.$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSecurityConfig\\:\\:\\$excludeURIs has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Log/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Test/Mock/MockSecurityConfig.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$level \\(string\\) of method CodeIgniter\\\\Log\\\\Logger\\:\\:log\\(\\) should be contravariant with parameter \\$level \\(mixed\\) of method Psr\\\\Log\\\\LoggerInterface\\:\\:log\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$classmap has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Log/Logger.php', + 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Model\\:\\:chunk\\(\\) has parameter \\$userFunc with no signature specified for Closure\\.$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$psr4 has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Model.php', + 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:regenerate\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Model.php', + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Model.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string\\|null given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Model.php', + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, array\\|int\\|string\\|null given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Model.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\|bool\\|float\\|int\\|object\\|string\\|null\\) of method CodeIgniter\\\\Model\\:\\:__call\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\BaseModel\\)\\|null\\) of method CodeIgniter\\\\BaseModel\\:\\:__call\\(\\)$#', + 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:\\$didRegenerate has no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Model.php', + 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset mixed directly on \\$_GET is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Pager/Pager.php', + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$method with no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Pager/Pager.php', + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, array given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$params with no type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Pager/Pager.php', + 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:register\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Pager/Pager.php', + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', ]; $ignoreErrors[] = [ - 'message' => '#^Argument \\#1 \\$name \\(class\\-string\\) passed to function model does not extend CodeIgniter\\\\\\\\Model\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:restore\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/RESTful/BaseResource.php', + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/RESTful/BaseResource.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:setContent\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, object\\|string\\|null given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:stream_stat\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/RESTful/BaseResource.php', + 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type CodeIgniter\\\\HTTP\\\\CLIRequest\\|CodeIgniter\\\\HTTP\\\\IncomingRequest of property CodeIgniter\\\\RESTful\\\\BaseResource\\:\\:\\$request is not the same as PHPDoc type CodeIgniter\\\\HTTP\\\\RequestInterface of overridden property CodeIgniter\\\\Controller\\:\\:\\$request\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:__call\\(\\) should return mixed but return statement is missing\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/RESTful/BaseResource.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookie\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/AutoRouter.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieExpired\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/AutoRouter.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, Config\\\\Routing given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieMissing\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/AutoRouterImproved.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type int of property CodeIgniter\\\\Router\\\\Exceptions\\\\RedirectException\\:\\:\\$code is not the same as PHPDoc type mixed of overridden property Exception\\:\\:\\$code\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSee\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Exceptions/RedirectException.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSeeElement\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:environment\\(\\) has parameter \\$callback with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeader\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:group\\(\\) has parameter \\$params with no signature specified for callable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeaderMissing\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollection\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONExact\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, array\\ given on the left side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONExact\\(\\) has parameter \\$test with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONFragment\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONFragment\\(\\) has parameter \\$fragment with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollection.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:set404Override\\(\\) has parameter \\$callable with no signature specified for callable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotOK\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/RouteCollectionInterface.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'REQUEST_METHOD\' directly on \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotRedirect\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Router/Router.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertOK\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFilterForRoute\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirect\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFiltersForRoute\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirectTo\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSee\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeElement\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:isFiltered\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeInField\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:setHTTPVerb\\(\\)\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeLink\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 3, - 'path' => __DIR__ . '/system/Router/Router.php', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionHas\\(\\) has no return type specified\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Expression on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionMissing\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:get404Override\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertStatus\\(\\) has no return type specified\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Test/TestResponse.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Router\\\\Router\\:\\:setMatchedRoute\\(\\) has parameter \\$handler with no signature specified for callable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Router/Router.php', + 'path' => __DIR__ . '/system/Throttle/Throttler.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forEmptySavepath\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Typography\\\\Typography\\:\\:protectCharacters\\(\\) has parameter \\$match with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Typography/Typography.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSameSiteSetting\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Typography\\\\Typography\\:\\:\\$innerBlockRequired type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Typography/Typography.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePath\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\CreditCardRules\\:\\:\\$cards type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Validation/CreditCardRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forInvalidSavePathFormat\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:filter\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forMissingDatabaseTable\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:filter\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Exceptions\\\\SessionException\\:\\:forWriteProtectedSavePath\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:filter\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Exceptions/SessionException.php', + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Session\\\\Handlers\\\\ArrayHandler\\:\\:\\$cache has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:run\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/ArrayHandler.php', + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\Database\\\\PostgreHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:run\\(\\) has parameter \\$indexes with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/Database/PostgreHandler.php', + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Session/Handlers/Database/PostgreHandler.php', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\DotArrayFilter\\:\\:run\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/DotArrayFilter.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Session/Handlers/DatabaseHandler.php', + 'message' => '#^Only booleans are allowed in a negated boolean, array\\|null given\\.$#', + 'count' => 6, + 'path' => __DIR__ . '/system/Validation/FileRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\DatabaseHandler\\:\\:setSelect\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:differs\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/DatabaseHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:is_not_unique\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Handlers\\\\FileHandler\\:\\:configureSessionIDRegex\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:is_unique\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:matches\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Session\\\\Handlers\\\\FileHandler\\:\\:\\$savePath is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$savePath\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:required\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Variable \\$written might not be defined\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:required_with\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/FileHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Rules\\:\\:required_without\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php', + 'path' => __DIR__ . '/system/Validation/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, mixed given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\CreditCardRules\\:\\:valid_cc_number\\(\\) has parameter \\$ccNumber with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/MemcachedHandler.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/CreditCardRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in &&, string given on the right side\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Handlers/RedisHandler.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Accessing offset \'HTTP_X_REQUESTED_WITH\' directly on \\$_SERVER is discouraged\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Session/Session.php', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha_dash\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configure\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha_numeric\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:configureSidLength\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha_numeric_punct\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha_numeric_space\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:initVars\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:alpha_space\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:decimal\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:push\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:hex\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:integer\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:remove\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:is_natural\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:is_natural_no_zero\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:set\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:numeric\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:regex_match\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:string\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:timezone\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_base64\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_date\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:stop\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_email\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_emails\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\Session\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_ip\\(\\) has parameter \\$ip with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\) of method CodeIgniter\\\\Session\\\\Session\\:\\:markAsFlashdata\\(\\) should be covariant with return type \\(false\\) of method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:markAsFlashdata\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_json\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_url\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/Session.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:destroy\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\FormatRules\\:\\:valid_url_strict\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/FormatRules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:keepFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:differs\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:differs\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:equals\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:removeTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:exact_length\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:set\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:greater_than\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:greater_than_equal_to\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:setTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:in_list\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkFlashdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:is_not_unique\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Session\\\\SessionInterface\\:\\:unmarkTempdata\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:is_not_unique\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Session/SessionInterface.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:is_unique\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:is_unique\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:less_than\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:less_than_equal_to\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:matches\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:matches\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:max_length\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:min_length\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:not_equals\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:not_in_list\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:required\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:required_with\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:required_with\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIDatabaseTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:required_without\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIDatabaseTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:assertCloseEnough\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\StrictRules\\\\Rules\\:\\:required_without\\(\\) has parameter \\$str with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/StrictRules/Rules.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:getPrivateMethodInvoker\\(\\) return type has no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:check\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockCache\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:check\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockEmail\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:fillPlaceholders\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:mockSession\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:fillPlaceholders\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetFactories\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:fillPlaceholders\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:resetServices\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:getRules\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:setPrivateProperty\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:getValidated\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, CodeIgniter\\\\CodeIgniter given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isClosure\\(\\) has parameter \\$rule with no signature specified for Closure\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isStringList\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/CIUnitTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function is_array\\(\\) with non\\-empty\\-array will always evaluate to true\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:loadRuleGroup\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/DOMParser.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Fabricator\\:\\:resetCounts\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processIfExist\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Fabricator.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$name of function model expects a valid class string, string given\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processIfExist\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Fabricator.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Assigning \'test\' directly on offset \'HTTPS\' of \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processIfExist\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Assigning string directly on offset \'REQUEST_METHOD\' of \\$_SERVER is discouraged\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processPermitEmpty\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:clearInsertCache\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processPermitEmpty\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:dontSeeInDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processPermitEmpty\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:loadDependencies\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processPermitEmpty\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:migrateDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processRules\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:regressDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processRules\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:resetMigrationSeedCount\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:processRules\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:runSeeds\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:retrievePlaceholders\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeInDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:retrievePlaceholders\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seeNumRecords\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:run\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:seed\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRule\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRule\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpMigrate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRules\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:setUpSeed\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:setRules\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\FeatureTestCase\\:\\:tearDownDatabase\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:splitRules\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, CodeIgniter\\\\Router\\\\RouteCollection\\|null given\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$customErrors type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$data type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$clean \\(bool\\) in isset\\(\\) is not nullable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$errors type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session \\(array\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$ruleSetFiles type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/FeatureTestCase.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCLIConfig\\:\\:\\$CSRFExcludeURIs has no type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$ruleSetInstances type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCLIConfig.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getBaseURI\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$rules type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:getDelay\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$validated type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', + 'count' => 2, + 'path' => __DIR__ . '/system/Validation/Validation.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:setOutput\\(\\) has parameter \\$output with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:check\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$curl_options has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:check\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockCURLRequest\\:\\:\\$output has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:getRules\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockCURLRequest.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Test/Mock/MockCache.php', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:getValidated\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Cannot access property \\$insert_id on object\\|resource\\|false\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:loadRuleGroup\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:run\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRule\\(\\) has parameter \\$errors with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:shouldReturn\\(\\) has parameter \\$return with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRule\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:\\$returnValues has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRules\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(array\\{code\\: int\\|string\\|null, message\\: string\\|null\\}\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:error\\(\\) should be covariant with return type \\(array\\\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:error\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:setRules\\(\\) has parameter \\$rules with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/Validation/ValidationInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:query\\(\\) should be covariant with return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:query\\(\\)$#', + 'message' => '#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:query\\(\\) should be covariant with return type \\(bool\\|CodeIgniter\\\\Database\\\\BaseResult\\\\|CodeIgniter\\\\Database\\\\Query\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:query\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:determineClass\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(bool\\|object\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:execute\\(\\) should be covariant with return type \\(object\\|resource\\|false\\) of method CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:execute\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:getMethodParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:connect\\(\\) should be covariant with return type \\(object\\|resource\\|false\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:connect\\(\\)$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:getMethodParams\\(\\) return type has no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:setDatabase\\(\\) should be covariant with return type \\(bool\\) of method CodeIgniter\\\\Database\\\\ConnectionInterface\\\\:\\:setDatabase\\(\\)$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:prepareParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getEventsFile\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:prepareParams\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getListeners\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:render\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:getSimulate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:renderCell\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockEvents\\:\\:unInitialize\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:renderSimpleClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockEvents.php', + 'path' => __DIR__ . '/system/View/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockFileLogger\\:\\:\\$destination has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:fill\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockFileLogger.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockLanguage\\:\\:disableIntlSupport\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:getNonPublicProperties\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockLanguage.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$dateFormat has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:getPublicProperties\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$handlers has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:includeComputedProperties\\(\\) has parameter \\$properties with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockLogger\\:\\:\\$threshold has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:includeComputedProperties\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockLogger.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getFormat\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Cells\\\\Cell\\:\\:view\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModel\\(\\) has no return type specified\\.$#', + 'message' => '#^Method class@anonymous/system/Traits/PropertiesTrait\\.php\\:47\\:\\:getProperties\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', + 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourceController\\:\\:getModelName\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Filters\\:\\:default\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourceController.php', + 'path' => __DIR__ . '/system/View/Filters.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getFormat\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:addPlugin\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModel\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:applyFilters\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:getModelName\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:objectToArray\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResourcePresenter.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:getPretend\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:objectToArray\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResponse\\:\\:misbehave\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parse\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResponse.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:fetchAssoc\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parse\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Return type \\(mixed\\) of method CodeIgniter\\\\Test\\\\Mock\\\\MockResult\\:\\:fetchAssoc\\(\\) should be covariant with return type \\(array\\|false\\|null\\) of method CodeIgniter\\\\Database\\\\BaseResult\\\\:\\:fetchAssoc\\(\\)$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parsePair\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockResult.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSecurityConfig\\:\\:\\$excludeURIs has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parsePair\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSecurityConfig.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$classmap has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parseSingle\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockServices\\:\\:\\$psr4 has no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:prepareReplacement\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockServices.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:regenerate\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setCookie\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:setSaveHandler\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:replaceSingle\\(\\) has parameter \\$pattern with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:startSession\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockSession\\:\\:\\$didRegenerate has no type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Parser\\:\\:\\$dataContexts type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockSession.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Parser\\:\\:\\$noparseBlocks type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', + 'path' => __DIR__ . '/system/View/Parser.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$method with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:ValidationErrors\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockTable\\:\\:__call\\(\\) has parameter \\$params with no type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:lang\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockTable.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:register\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:mailto\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:restore\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:route\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\PhpStreamWrapper\\:\\:setContent\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:safeMailto\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/PhpStreamWrapper.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:__call\\(\\) should return mixed but return statement is missing\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Plugins\\:\\:siteURL\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Plugins.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookie\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/RendererInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieExpired\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/RendererInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertCookieMissing\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/RendererInterface.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSee\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertDontSeeElement\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_defaultTemplate\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeader\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_prepArgs\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertHeaderMissing\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_prepArgs\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONExact\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_setFromArray\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertJSONFragment\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:generate\\(\\) has parameter \\$tableData with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotOK\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertNotRedirect\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertOK\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:setTemplate\\(\\) has parameter \\$template with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirect\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in a ternary operator condition, float given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertRedirectTo\\(\\) has no return type specified\\.$#', + 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSee\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$footing type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeElement\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$function type has no signature specified for callable\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeInField\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$heading type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSeeLink\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$rows type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionHas\\(\\) has no return type specified\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$template type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/Table.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertSessionMissing\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\TestResponse\\:\\:assertStatus\\(\\) has no return type specified\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:getPerformanceData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Test/TestResponse.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:include\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Throttle/Throttler.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a negated boolean, array\\|null given\\.$#', - 'count' => 6, - 'path' => __DIR__ . '/system/Validation/FileRules.php', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Validation\\\\Validation\\:\\:isClosure\\(\\) has parameter \\$rule with no signature specified for Closure\\.$#', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/Validation/Validation.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/system/Validation/Validation.php', + 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to an undefined static method CodeIgniter\\\\Config\\\\Factories\\:\\:cells\\(\\)\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$data type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/View/Cell.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:addPlugin\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$performanceData type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in a ternary operator condition, float given\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$renderVars type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$sections type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$function type has no signature specified for callable\\.$#', + 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$tempData type has no value type specified in iterable type array\\.$#', 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', + 'path' => __DIR__ . '/system/View/View.php', ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 4041710fb703..b6dbf31c3874 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -28,7 +28,6 @@ parameters: - system/Validation/Views/single.php scanDirectories: - system/Helpers - checkMissingIterableValueType: false checkGenericClassInNonGenericObjectType: false checkMissingCallableSignature: true treatPhpDocTypesAsCertain: false From c1518a278a3626ba2f2fcb28c5180ca7ff7f9b54 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Mar 2024 19:02:03 +0900 Subject: [PATCH 6394/8282] docs: move content in table to section below --- .../source/database/configuration.rst | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 2239c65799e2..24ba92eaeb05 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -136,9 +136,9 @@ and decode it in the constructor in the Config class: .. _database-config-explanation-of-values: -********************** -Explanation of Values: -********************** +********************* +Explanation of Values +********************* ================ =========================================================================================================== Name Config Description @@ -164,15 +164,9 @@ Explanation of Values: applications where you might run manually written queries, and need the prefix to still be customizable by the end user. **schema** The database schema, default value varies by driver. (Used by ``Postgre`` and ``SQLSRV``.) -**encrypt** Whether or not to use an encrypted connection. - ``SQLSRV`` driver accepts true/false - ``MySQLi`` driver accepts an array with the following options: - * ``ssl_key`` - Path to the private key file - * ``ssl_cert`` - Path to the public key certificate file - * ``ssl_ca`` - Path to the certificate authority file - * ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format - * ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``) - * ``ssl_verify`` - true/false; Whether to verify the server certificate or not (``MySQLi`` only) +**encrypt** Whether or not to use an encrypted connection. (``MySQLi`` and ``SQLSRV`` only). + ``SQLSRV`` driver accepts true/false. + See :ref:`MySQLi encrypt ` for ``MySQLi`` settings. **compress** Whether or not to use client compression (``MySQLi`` only). **strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application (``MySQLi`` only). @@ -205,4 +199,18 @@ the ``'hostname'`` setting. CodeIgniter's MySQLi driver will notice this and con connection properly. .. literalinclude:: configuration/011.php - :lines: 11-18 \ No newline at end of file + :lines: 11-18 + +.. _mysqli-encrypt: + +encrypt +------- + +MySQLi driver accepts an array with the following options: + +* ``ssl_key`` - Path to the private key file +* ``ssl_cert`` - Path to the public key certificate file +* ``ssl_ca`` - Path to the certificate authority file +* ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format +* ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``) +* ``ssl_verify`` - true/false; Whether to verify the server certificate or not From 1009b8f33c51e2d73c150f3436b7408d266f7f9a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Mar 2024 19:05:16 +0900 Subject: [PATCH 6395/8282] docs: list available drivers first --- .../source/database/configuration.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 24ba92eaeb05..48ad3853742a 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -159,25 +159,25 @@ Explanation of Values **pConnect** true/false (boolean) - Whether to use a persistent connection. **DBDebug** true/false (boolean) - Whether to throw exceptions or not when database errors occur. **charset** The character set used in communicating with the database. -**DBCollat** The character collation used in communicating with the database (``MySQLi`` only). +**DBCollat** (``MySQLi`` only) The character collation used in communicating with the database. **swapPre** A default table prefix that should be swapped with ``DBPrefix``. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user. -**schema** The database schema, default value varies by driver. (Used by ``Postgre`` and ``SQLSRV``.) -**encrypt** Whether or not to use an encrypted connection. (``MySQLi`` and ``SQLSRV`` only). +**schema** (``Postgre`` and ``SQLSRV`` only) The database schema, default value varies by driver. +**encrypt** (``MySQLi`` and ``SQLSRV`` only) Whether or not to use an encrypted connection. ``SQLSRV`` driver accepts true/false. See :ref:`MySQLi encrypt ` for ``MySQLi`` settings. -**compress** Whether or not to use client compression (``MySQLi`` only). -**strictOn** true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL - while developing an application (``MySQLi`` only). +**compress** (``MySQLi`` only) Whether or not to use client compression. +**strictOn** (``MySQLi`` only) true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring + strict SQL while developing an application. **port** The database port number - Empty string ``''`` for default port (or dynamic port with ``SQLSRV``). -**foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only). +**foreignKeys** (``SQLite3`` only) true/false (boolean) - Whether or not to enable Foreign Key constraint. .. important:: SQLite3 Foreign Key constraint is disabled by default. See `SQLite documentation `_. To enforce Foreign Key constraint, set this config item to true. -**busyTimeout** milliseconds (int) - Sleeps for a specified amount of time when a table is locked (``SQLite3`` only). -**numberNative** true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE (``MySQLi`` only). +**busyTimeout** (``SQLite3`` only) milliseconds (int) - Sleeps for a specified amount of time when a table is locked. +**numberNative** (``MySQLi`` only) true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE. ================ =========================================================================================================== .. note:: Depending on what database driver you are using (``MySQLi``, ``Postgre``, From 6931822bbcc3e1fd75bb01bb5064f360957f477f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 18 Mar 2024 19:07:15 +0900 Subject: [PATCH 6396/8282] docs: move MySQLi description up --- user_guide_src/source/database/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 48ad3853742a..a0ef5c8cd1d8 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -165,8 +165,8 @@ Explanation of Values customizable by the end user. **schema** (``Postgre`` and ``SQLSRV`` only) The database schema, default value varies by driver. **encrypt** (``MySQLi`` and ``SQLSRV`` only) Whether or not to use an encrypted connection. - ``SQLSRV`` driver accepts true/false. See :ref:`MySQLi encrypt ` for ``MySQLi`` settings. + ``SQLSRV`` driver accepts true/false. **compress** (``MySQLi`` only) Whether or not to use client compression. **strictOn** (``MySQLi`` only) true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application. From d7d1fdea27b40431dd477bcabb2b0366d1ad2fdf Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Tue, 19 Mar 2024 16:34:17 +0700 Subject: [PATCH 6397/8282] chore: update workflow.md Added signing old commit to only commit in PR --- contributing/workflow.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contributing/workflow.md b/contributing/workflow.md index da1f53d4743c..6bbd6a6dbeaa 100644 --- a/contributing/workflow.md +++ b/contributing/workflow.md @@ -199,6 +199,16 @@ Latest commit only: > git push --force-with-lease origin your-branch ``` +Only commits in PR: +```console +> git switch your-branch +> git rebase -i HEAD~3 --exec 'git commit --amend --no-edit --no-verify -S' +> git push --force-with-lease origin your-branch +``` + +> [!NOTE] +> `HEAD~3` is defined have 3 commit in PR, change number *3* with the number you have in commit. + All commits: ```console > git switch your-branch From 5ebe2b7eeb0efc4eb9f58748450608dec8ffb9c6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Mar 2024 09:22:31 +0900 Subject: [PATCH 6398/8282] refactor: improve Validation error message for placeholder --- system/Validation/Validation.php | 4 ++- .../StrictRules/DatabaseRelatedRulesTest.php | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index af7cae093bb9..491bccf0599e 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -790,7 +790,9 @@ protected function fillPlaceholders(array $rules, array $data): array // Check if the validation rule for the placeholder exists if ($placeholderRules === null) { throw new LogicException( - 'No validation rules for the placeholder: ' . $field + 'No validation rules for the placeholder: "' . $field + . '". You must set the validation rules for the field.' + . ' See .' ); } diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php index 5083bec69fe8..7cf1e8f78deb 100644 --- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php @@ -17,6 +17,7 @@ use Config\Database; use Config\Services; use InvalidArgumentException; +use LogicException; use Tests\Support\Validation\TestRules; /** @@ -139,6 +140,34 @@ public function testIsUniqueWithIgnoreValuePlaceholder(): void $this->assertTrue($this->validation->run($data)); } + public function testIsUniqueWithPlaceholderAndNoValidationRulesForIt(): void + { + $this->expectException(LogicException::class); + $this->expectExceptionMessage('No validation rules for the placeholder: "id". You must set the validation rules for the field.'); + + $this->hasInDatabase('user', [ + 'name' => 'Derek', + 'email' => 'derek@world.co.uk', + 'country' => 'GB', + ]); + + $row = Database::connect() + ->table('user') + ->limit(1) + ->get() + ->getRow(); + + $data = [ + 'id' => $row->id, + 'email' => 'derek@world.co.uk', + ]; + + $this->validation->setRules([ + 'email' => 'is_unique[user.email,id,{id}]', + ]); + $this->validation->run($data); + } + public function testIsUniqueByManualRun(): void { Database::connect() From 56990e6bf5c28b0d69fddd11a64dad928f20ab77 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 20 Mar 2024 09:23:09 +0900 Subject: [PATCH 6399/8282] docs: improve note for Validation placeholder --- user_guide_src/source/libraries/validation.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index c7c8449562a5..f99f5879256f 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -517,15 +517,18 @@ Validation Placeholders ======================= The Validation class provides a simple method to replace parts of your rules based on data that's being passed into it. This -sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply +sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. + +Placeholders are simply the name of the field (or array key) that was passed in as ``$data`` surrounded by curly brackets. It will be replaced by the **value** of the matched incoming field. An example should clarify this: .. literalinclude:: validation/020.php :lines: 2- -.. note:: Since v4.3.5, you must set the validation rules for the placeholder - field (the ``id`` field in the sample code above) for security. +.. warning:: Since v4.3.5, you must set the validation rules for the placeholder + field (the ``id`` field in the sample code above) for security reasons. Because + attackers can send any data to your application. In this set of rules, it states that the email address should be unique in the database, except for the row that has an id matching the placeholder's value. Assuming that the form POST data had the following: From c9a1bfec7aac1a8c38fc9710eb50728ee3ea93ce Mon Sep 17 00:00:00 2001 From: Cleric-K Date: Mon, 18 Mar 2024 11:26:02 +0200 Subject: [PATCH 6400/8282] esc() for 'raw' context (Fixes #8624) --- system/Common.php | 18 +++++++++--------- tests/system/CommonFunctionsTest.php | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/system/Common.php b/system/Common.php index 093943effb47..2ad287fb26ea 100644 --- a/system/Common.php +++ b/system/Common.php @@ -426,6 +426,15 @@ function env(string $key, $default = null) */ function esc($data, string $context = 'html', ?string $encoding = null) { + $context = strtolower($context); + + // Provide a way to NOT escape data since + // this could be called automatically by + // the View library. + if ($context === 'raw') { + return $data; + } + if (is_array($data)) { foreach ($data as &$value) { $value = esc($value, $context); @@ -433,15 +442,6 @@ function esc($data, string $context = 'html', ?string $encoding = null) } if (is_string($data)) { - $context = strtolower($context); - - // Provide a way to NOT escape data since - // this could be called automatically by - // the View library. - if ($context === 'raw') { - return $data; - } - if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true)) { throw new InvalidArgumentException('Invalid escape context provided.'); } diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index a097cb2a81a0..89da3e89c4ad 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -247,6 +247,27 @@ public function testEscapeBadContextZero(): void esc('', 'http://example.com'); - - $this->assertSame('Custom', $this->request->getMethod()); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options); - $this->assertSame('Custom', $options[CURLOPT_CUSTOMREQUEST]); - } - - public function testRequestSetsBasicCurlOptions(): void - { - $this->request->request('get', 'http://example.com'); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_URL, $options); - $this->assertSame('http://example.com', $options[CURLOPT_URL]); - - $this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options); - $this->assertTrue($options[CURLOPT_RETURNTRANSFER]); - - $this->assertArrayHasKey(CURLOPT_HEADER, $options); - $this->assertTrue($options[CURLOPT_HEADER]); - - $this->assertArrayHasKey(CURLOPT_FRESH_CONNECT, $options); - $this->assertTrue($options[CURLOPT_FRESH_CONNECT]); - - $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options); - $this->assertEqualsWithDelta(0.0, $options[CURLOPT_TIMEOUT_MS], PHP_FLOAT_EPSILON); - - $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options); - $this->assertEqualsWithDelta(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS], PHP_FLOAT_EPSILON); - } - - public function testAuthBasicOption(): void - { - $this->request->request('get', 'http://example.com', [ - 'auth' => [ - 'username', - 'password', - ], - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_USERPWD, $options); - $this->assertSame('username:password', $options[CURLOPT_USERPWD]); - - $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options); - $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); - } - - public function testAuthBasicOptionExplicit(): void - { - $this->request->request('get', 'http://example.com', [ - 'auth' => [ - 'username', - 'password', - 'basic', - ], - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_USERPWD, $options); - $this->assertSame('username:password', $options[CURLOPT_USERPWD]); - - $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options); - $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); - } - - public function testAuthDigestOption(): void - { - $output = "HTTP/1.1 401 Unauthorized -Server: ddos-guard -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT -WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK -Server: ddos-guard -Connection: keep-alive -Keep-Alive: timeout=60 -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT -Date: Tue, 07 Jul 2020 15:13:14 GMT -Expires: Thu, 19 Nov 1981 08:52:00 GMT -Cache-Control: no-store, no-cache, must-revalidate -Pragma: no-cache -Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/ -Content-Type: application/xml; charset=utf-8 -Transfer-Encoding: chunked\x0d\x0a\x0d\x0aUpdate success! config"; - - $this->request->setOutput($output); - - $response = $this->request->request('get', 'http://example.com', [ - 'auth' => [ - 'username', - 'password', - 'digest', - ], - ]); - - $options = $this->request->curl_options; - - $this->assertSame('Update success! config', $response->getBody()); - $this->assertSame(200, $response->getStatusCode()); - - $this->assertArrayHasKey(CURLOPT_USERPWD, $options); - $this->assertSame('username:password', $options[CURLOPT_USERPWD]); - - $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options); - $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); - } - - public function testSetAuthBasic(): void - { - $this->request->setAuth('username', 'password')->get('http://example.com'); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_USERPWD, $options); - $this->assertSame('username:password', $options[CURLOPT_USERPWD]); - - $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options); - $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]); - } - - public function testSetAuthDigest(): void - { - $output = "HTTP/1.1 401 Unauthorized -Server: ddos-guard -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT -WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK -Server: ddos-guard -Connection: keep-alive -Keep-Alive: timeout=60 -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT -Date: Tue, 07 Jul 2020 15:13:14 GMT -Expires: Thu, 19 Nov 1981 08:52:00 GMT -Cache-Control: no-store, no-cache, must-revalidate -Pragma: no-cache -Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/ -Content-Type: application/xml; charset=utf-8 -Transfer-Encoding: chunked\x0d\x0a\x0d\x0aUpdate success! config"; - - $this->request->setOutput($output); - - $response = $this->request->setAuth('username', 'password', 'digest')->get('http://example.com'); - - $options = $this->request->curl_options; - - $this->assertSame('Update success! config', $response->getBody()); - $this->assertSame(200, $response->getStatusCode()); - - $this->assertArrayHasKey(CURLOPT_USERPWD, $options); - $this->assertSame('username:password', $options[CURLOPT_USERPWD]); - - $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options); - $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]); - } - - public function testCertOption(): void - { - $file = __FILE__; - - $this->request->request('get', 'http://example.com', [ - 'cert' => $file, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_SSLCERT, $options); - $this->assertSame($file, $options[CURLOPT_SSLCERT]); - } - - public function testCertOptionWithPassword(): void - { - $file = __FILE__; - - $this->request->request('get', 'http://example.com', [ - 'cert' => [ - $file, - 'password', - ], - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_SSLCERT, $options); - $this->assertSame($file, $options[CURLOPT_SSLCERT]); - - $this->assertArrayHasKey(CURLOPT_SSLCERTPASSWD, $options); - $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]); - } - - public function testMissingCertOption(): void - { - $file = 'something_obviously_bogus'; - $this->expectException(HTTPException::class); - - $this->request->request('get', 'http://example.com', [ - 'cert' => $file, - ]); - } - - public function testSSLVerification(): void - { - $file = __FILE__; - - $this->request->request('get', 'http://example.com', [ - 'verify' => $file, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_CAINFO, $options); - $this->assertSame($file, $options[CURLOPT_CAINFO]); - - $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options); - $this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]); - - $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options); - $this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]); - } - - public function testNoSSL(): void - { - $this->request->request('get', 'http://example.com', [ - 'verify' => false, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options); - $this->assertFalse($options[CURLOPT_SSL_VERIFYPEER]); - - $this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options); - $this->assertSame(0, $options[CURLOPT_SSL_VERIFYHOST]); - } - - public function testSSLWithBadKey(): void - { - $file = 'something_obviously_bogus'; - $this->expectException(HTTPException::class); - - $this->request->request('get', 'http://example.com', [ - 'verify' => $file, - ]); - } - - public function testProxyuOption(): void - { - $this->request->request('get', 'http://example.com', [ - 'proxy' => 'http://localhost:3128', - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_PROXY, $options); - $this->assertSame('http://localhost:3128', $options[CURLOPT_PROXY]); - $this->assertArrayHasKey(CURLOPT_HTTPPROXYTUNNEL, $options); - $this->assertTrue($options[CURLOPT_HTTPPROXYTUNNEL]); - } - - public function testDebugOptionTrue(): void - { - $this->request->request('get', 'http://example.com', [ - 'debug' => true, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_VERBOSE, $options); - $this->assertSame(1, $options[CURLOPT_VERBOSE]); - - $this->assertArrayHasKey(CURLOPT_STDERR, $options); - $this->assertIsResource($options[CURLOPT_STDERR]); - } - - public function testDebugOptionFalse(): void - { - $this->request->request('get', 'http://example.com', [ - 'debug' => false, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayNotHasKey(CURLOPT_VERBOSE, $options); - $this->assertArrayNotHasKey(CURLOPT_STDERR, $options); - } - - public function testDebugOptionFile(): void - { - $file = SUPPORTPATH . 'Files/baker/banana.php'; - - $this->request->request('get', 'http://example.com', [ - 'debug' => $file, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_VERBOSE, $options); - $this->assertSame(1, $options[CURLOPT_VERBOSE]); - - $this->assertArrayHasKey(CURLOPT_STDERR, $options); - $this->assertIsResource($options[CURLOPT_STDERR]); - } - - public function testDecodeContent(): void - { - $this->request->setHeader('Accept-Encoding', 'cobol'); - $this->request->request('get', 'http://example.com', [ - 'decode_content' => true, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_ENCODING, $options); - $this->assertSame('cobol', $options[CURLOPT_ENCODING]); - } - - public function testDecodeContentWithoutAccept(): void - { - // $this->request->setHeader('Accept-Encoding', 'cobol'); - $this->request->request('get', 'http://example.com', [ - 'decode_content' => true, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_ENCODING, $options); - $this->assertSame('', $options[CURLOPT_ENCODING]); - $this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options); - $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]); - } - - public function testAllowRedirectsOptionFalse(): void - { - $this->request->request('get', 'http://example.com', [ - 'allow_redirects' => false, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options); - $this->assertSame(0, $options[CURLOPT_FOLLOWLOCATION]); - - $this->assertArrayNotHasKey(CURLOPT_MAXREDIRS, $options); - $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options); - } - - public function testAllowRedirectsOptionTrue(): void - { - $this->request->request('get', 'http://example.com', [ - 'allow_redirects' => true, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options); - $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]); - - $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options); - $this->assertSame(5, $options[CURLOPT_MAXREDIRS]); - $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options); - $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]); - } - - public function testAllowRedirectsOptionDefaults(): void - { - $this->request->request('get', 'http://example.com', [ - 'allow_redirects' => true, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options); - $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]); - - $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options); - $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options); - } - - public function testAllowRedirectsArray(): void - { - $this->request->request('get', 'http://example.com', [ - 'allow_redirects' => ['max' => 2], - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options); - $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]); - - $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options); - $this->assertSame(2, $options[CURLOPT_MAXREDIRS]); - } - - public function testSendWithQuery(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'query' => [ - 'name' => 'Henry', - 'd.t' => 'value', - ], - ]); - - $request->get('products'); - - $options = $request->curl_options; - - $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]); - } - - public function testSendWithDelay(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->get('products'); - - // we still need to check the code coverage to make sure this was done - $this->assertEqualsWithDelta(0.1, $request->getDelay(), PHP_FLOAT_EPSILON); - } - - public function testSendContinued(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there"); - $response = $request->get('answer'); - $this->assertSame('Hi there', $response->getBody()); - } - - /** - * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261 - */ - public function testSendContinuedWithManyHeaders(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $output = "HTTP/1.1 100 Continue -Server: ddos-guard -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT\x0d\x0a\x0d\x0aHTTP/1.1 200 OK -Server: ddos-guard -Connection: keep-alive -Keep-Alive: timeout=60 -Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT -Date: Tue, 07 Jul 2020 15:13:14 GMT -Expires: Thu, 19 Nov 1981 08:52:00 GMT -Cache-Control: no-store, no-cache, must-revalidate -Pragma: no-cache -Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/ -Content-Type: application/xml; charset=utf-8 -Transfer-Encoding: chunked\x0d\x0a\x0d\x0aUpdate success! config"; - $request->setOutput($output); - - $response = $request->get('answer'); - - $this->assertSame('Update success! config', $response->getBody()); - - $responseHeaderKeys = [ - 'Cache-Control', - 'Server', - 'Connection', - 'Keep-Alive', - 'Set-Cookie', - 'Date', - 'Expires', - 'Pragma', - 'Content-Type', - 'Transfer-Encoding', - ]; - $this->assertSame($responseHeaderKeys, array_keys($response->headers())); - - $this->assertSame(200, $response->getStatusCode()); - } - - public function testSendProxied(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $output = "HTTP/1.1 200 Connection established -Proxy-Agent: Fortinet-Proxy/1.0\x0d\x0a\x0d\x0aHTTP/1.1 200 OK\x0d\x0a\x0d\x0aHi there"; - $request->setOutput($output); - - $response = $request->get('answer'); - $this->assertSame('Hi there', $response->getBody()); - } - - /** - * See: https://github.com/codeigniter4/CodeIgniter4/issues/7394 - */ - public function testResponseHeadersWithMultipleRequests(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - ]); - - $output = "HTTP/2.0 200 OK -Server: ddos-guard -Expires: Thu, 19 Nov 1981 08:52:00 GMT -Cache-Control: no-store, no-cache, must-revalidate -Pragma: no-cache -Content-Type: application/xml; charset=utf-8 -Transfer-Encoding: chunked\x0d\x0a\x0d\x0aHello1"; - $request->setOutput($output); - - $response = $request->get('answer1'); - - $this->assertSame('Hello1', $response->getBody()); - - $responseHeaderKeys = [ - 'Cache-Control', - 'Server', - 'Expires', - 'Pragma', - 'Content-Type', - 'Transfer-Encoding', - ]; - $this->assertSame($responseHeaderKeys, array_keys($response->headers())); - - $this->assertSame(200, $response->getStatusCode()); - - $output = "HTTP/2.0 200 OK -Expires: Thu, 19 Nov 1982 08:52:00 GMT -Cache-Control: no-store, no-cache, must-revalidate -Content-Type: application/xml; charset=utf-8 -Transfer-Encoding: chunked\x0d\x0a\x0d\x0aHello2"; - $request->setOutput($output); - - $response = $request->get('answer2'); - - $this->assertSame('Hello2', $response->getBody()); - - $responseHeaderKeys = [ - 'Cache-Control', - 'Expires', - 'Content-Type', - 'Transfer-Encoding', - ]; - $this->assertSame($responseHeaderKeys, array_keys($response->headers())); - - $this->assertSame(200, $response->getStatusCode()); - } - - public function testResponseHeadersWithMultipleSetCookies(): void - { - $request = $this->getRequest([ - 'base_uri' => 'https://github.com/', - ]); - - $output = "HTTP/2 200 -server: GitHub.com -date: Sat, 11 Nov 2023 02:26:55 GMT -content-type: text/html; charset=utf-8 -set-cookie: _gh_sess=PlRlha1YumlLhLuo5MuNbIWJRO9RRuR%2FHfYsWRh5B0mkalFIZstlAbTmSstl8q%2FAC57IsWMVuFHWQc6L4qDHQJrwhuYVO5ZaigPCUjAStnhh%2FieZQVqIf92Al7vusuzx2o8XH%2Fv6nd9qzMTAWc2%2FkRsl8jxPQYGNaWeuUBY2w3%2FDORSikN4c0vHOyedhU7Xcv3Ryz5xD3DNxK9R8xKNZ6OSXLJ6bjX8iIT6LxvroVIf2HjvowW9cQsq0kN08mS6KtTnH0mD3ANWqsVVWeMzFNA%3D%3D--Jx830Q9Nmkfz9OGA--kEcPtNphvjNMopYqFDxUbw%3D%3D; Path=/; HttpOnly; Secure; SameSite=Lax -set-cookie: _octo=GH1.1.599292127.1699669625; Path=/; Domain=github.com; Expires=Mon, 11 Nov 2024 02:27:05 GMT; Secure; SameSite=Lax -set-cookie: logged_in=no; Path=/; Domain=github.com; Expires=Mon, 11 Nov 2024 02:27:05 GMT; HttpOnly; Secure; SameSite=Lax -accept-ranges: bytes\x0d\x0a\x0d\x0a"; - $request->setOutput($output); - - $response = $request->get('/'); - - $setCookieHeaders = $response->header('set-cookie'); - - $this->assertCount(3, $setCookieHeaders); - $this->assertSame( - 'logged_in=no; Path=/; Domain=github.com; Expires=Mon, 11 Nov 2024 02:27:05 GMT; HttpOnly; Secure; SameSite=Lax', - $setCookieHeaders[2]->getValue() - ); - - $this->assertSame( - '_octo=GH1.1.599292127.1699669625; Path=/; Domain=github.com; Expires=Mon, 11 Nov 2024 02:27:05 GMT; Secure; SameSite=Lax', - $setCookieHeaders[1]->getValueLine() - ); - } - - public function testSplitResponse(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there"); - $response = $request->get('answer'); - $this->assertSame('Hi there', $response->getBody()); - } - - public function testApplyBody(): void + public function testBodyIsResetOnSecondRequest(): void { $request = $this->getRequest([ 'base_uri' => 'http://www.foo.com/api/v1/', 'delay' => 100, ]); - $request->setBody('name=George'); $request->setOutput('Hi there'); - $response = $request->post('answer'); - - $this->assertSame('Hi there', $response->getBody()); - $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); - } - - public function testApplyBodyByOptions(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput('Hi there'); - $response = $request->post('answer', [ - 'body' => 'name=George', - ]); - - $this->assertSame('Hi there', $response->getBody()); - $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]); - } - - public function testResponseHeaders(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there"); - $response = $request->get('bogus'); - - $this->assertSame('2.0', $response->getProtocolVersion()); - $this->assertSame(234, $response->getStatusCode()); - } - - public function testResponseHeadersShortProtocol(): void - { - $request = $this->getRequest([ - 'base_uri' => 'http://www.foo.com/api/v1/', - 'delay' => 100, - ]); - - $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie"); - $response = $request->get('bogus'); - - $this->assertSame('2.0', $response->getProtocolVersion()); - $this->assertSame(235, $response->getStatusCode()); - } - - public function testPostFormEncoded(): void - { - $params = [ - 'foo' => 'bar', - 'baz' => [ - 'hi', - 'there', - ], - ]; - $this->request->request('POST', '/post', [ - 'form_params' => $params, - ]); - - $this->assertSame('POST', $this->request->getMethod()); - - $options = $this->request->curl_options; - - $expected = http_build_query($params); - $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options); - $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]); - } - - public function testPostFormMultipart(): void - { - $params = [ - 'foo' => 'bar', - 'baz' => [ - 'hi', - 'there', - ], - 'afile' => new CURLFile(__FILE__), - ]; - $this->request->request('POST', '/post', [ - 'multipart' => $params, - ]); - - $this->assertSame('POST', $this->request->getMethod()); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options); - $this->assertSame($params, $options[CURLOPT_POSTFIELDS]); - } - - public function testSetForm(): void - { - $params = [ - 'foo' => 'bar', - 'baz' => [ - 'hi', - 'there', - ], - ]; - - $this->request->setForm($params)->post('/post'); - - $this->assertSame( - http_build_query($params), - $this->request->curl_options[CURLOPT_POSTFIELDS] - ); - - $params['afile'] = new CURLFile(__FILE__); - - $this->request->setForm($params, true)->post('/post'); - - $this->assertSame( - $params, - $this->request->curl_options[CURLOPT_POSTFIELDS] - ); - } - - public function testJSONData(): void - { - $params = [ - 'foo' => 'bar', - 'baz' => [ - 'hi', - 'there', - ], - ]; - $this->request->request('POST', '/post', [ - 'json' => $params, - ]); - - $this->assertSame('POST', $this->request->getMethod()); - - $expected = json_encode($params); - $this->assertSame( - $expected, - $this->request->curl_options[CURLOPT_POSTFIELDS] - ); - $this->assertSame($expected, $this->request->getBody()); - } - - public function testSetJSON(): void - { - $params = [ - 'foo' => 'bar', - 'baz' => [ - 'hi', - 'there', - ], - ]; - $this->request->setJSON($params)->post('/post'); - - $expected = json_encode($params); - $this->assertSame( - $expected, - $this->request->curl_options[CURLOPT_POSTFIELDS] - ); - $this->assertSame($expected, $this->request->getBody()); - - $this->assertSame( - 'Content-Type: application/json', - $this->request->curl_options[CURLOPT_HTTPHEADER][0] - ); - } - - public function testHTTPv1(): void - { - $this->request->request('POST', '/post', [ - 'version' => 1.0, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options); - $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]); - } - - public function testHTTPv11(): void - { - $this->request->request('POST', '/post', [ - 'version' => 1.1, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options); - $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]); - } - - public function testHTTPv2(): void - { - $this->request->request('POST', '/post', [ - 'version' => 2.0, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options); - $this->assertSame(CURL_HTTP_VERSION_2_0, $options[CURLOPT_HTTP_VERSION]); - } - - public function testCookieOption(): void - { - $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt'; - $this->request->request('POST', '/post', [ - 'cookie' => $holder, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options); - $this->assertSame($holder, $options[CURLOPT_COOKIEJAR]); - $this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options); - $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]); - } - - public function testUserAgentOption(): void - { - $agent = 'CodeIgniter Framework'; - - $this->request->request('POST', '/post', [ - 'user_agent' => $agent, - ]); - - $options = $this->request->curl_options; - - $this->assertArrayHasKey(CURLOPT_USERAGENT, $options); - $this->assertSame($agent, $options[CURLOPT_USERAGENT]); - } - - /** - * @see https://github.com/codeigniter4/CodeIgniter4/issues/8347 - */ - public function testMultipleHTTP100(): void - { - $jsonBody = '{"name":"John Doe","age":30}'; - - $output = "HTTP/1.1 100 Continue -Mark bundle as not supporting multiuse -HTTP/1.1 100 Continue -Mark bundle as not supporting multiuse -HTTP/1.1 200 OK -Server: Werkzeug/2.2.2 Python/3.7.17 -Date: Sun, 28 Jan 2024 06:05:36 GMT -Content-Type: application/json -Content-Length: 33\r\n\r\n" . $jsonBody; - - $this->request->setOutput($output); - - $response = $this->request->request('GET', 'http://example.com'); - - $this->assertSame($jsonBody, $response->getBody()); - - $this->assertSame(200, $response->getStatusCode()); - } - - public function testGetHeaderLineContentType(): void - { - $output = 'HTTP/2 200 -date: Thu, 11 Apr 2024 07:26:00 GMT -content-type: text/html; charset=UTF-8 -cache-control: no-store, max-age=0, no-cache -server: cloudflare -content-encoding: br -alt-svc: h3=":443"; ma=86400' . "\x0d\x0a\x0d\x0aResponse Body"; - - $this->request->setOutput($output); - $response = $this->request->request('get', 'http://example.com'); + $request->post('answer'); + $request->post('answer'); - $this->assertSame('text/html; charset=UTF-8', $response->getHeaderLine('Content-Type')); + // The body is not reset! + $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $request->curl_options); } } diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 32d6a4dd919d..722fe1270c02 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -26,10 +26,12 @@ * @internal * * @group Others + * + * @no-final */ -final class CURLRequestTest extends CIUnitTestCase +class CURLRequestTest extends CIUnitTestCase { - private MockCURLRequest $request; + protected MockCURLRequest $request; protected function setUp(): void { From c6c4f812c84afebe8e8dd2344ba2aabfc10130c4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 11 Apr 2024 18:02:04 +0900 Subject: [PATCH 6705/8282] docs: add array types --- phpstan-baseline.php | 50 --------------------------- system/HTTP/CURLRequest.php | 2 ++ tests/system/HTTP/CURLRequestTest.php | 3 ++ 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 61841f81795a..3da30e816317 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -5336,11 +5336,6 @@ 'count' => 10, 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:__construct\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/HTTP/CURLRequest.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:applyBody\\(\\) has parameter \\$curlOptions with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -12901,36 +12896,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/HTTP/CLIRequestTest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Assigning \'10\' directly on offset \'HTTP_CONTENT_LENGTH\' of \\$_SERVER is discouraged\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Assigning \'en\\-US\' directly on offset \'HTTP_ACCEPT_LANGUAGE\' of \\$_SERVER is discouraged\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Assigning \'gzip, deflate, br\' directly on offset \'HTTP_ACCEPT_ENCODING\' of \\$_SERVER is discouraged\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Assigning \'site1\\.com\' directly on offset \'HTTP_HOST\' of \\$_SERVER is discouraged\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequestDoNotShareOptionsTest\\:\\:getRequest\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Access to an undefined property CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:\\$curl_options\\.$#', - 'count' => 39, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestTest.php', -]; $ignoreErrors[] = [ 'message' => '#^Assigning \'10\' directly on offset \'HTTP_CONTENT_LENGTH\' of \\$_SERVER is discouraged\\.$#', 'count' => 1, @@ -12951,21 +12916,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestTest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Call to an undefined method CodeIgniter\\\\HTTP\\\\CURLRequest\\:\\:setOutput\\(\\)\\.$#', - 'count' => 4, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequestTest\\:\\:getRequest\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestTest.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\HTTP\\\\CURLRequestTest\\:\\:getRequest\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/HTTP/CURLRequestTest.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\HTTP\\\\ContentSecurityPolicyTest\\:\\:work\\(\\) has no return type specified\\.$#', 'count' => 1, diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 3040f29b9feb..4b1c9c625399 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -107,6 +107,8 @@ class CURLRequest extends OutgoingRequest * - baseURI * - timeout * - any other request options to use as defaults. + * + * @param array $options */ public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = []) { diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 722fe1270c02..1f53a57a8465 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -41,6 +41,9 @@ protected function setUp(): void $this->request = $this->getRequest(); } + /** + * @param array $options + */ protected function getRequest(array $options = []): MockCURLRequest { $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI(); From 0bb441476b5578722190213beac3056f87e95fe1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 12:00:45 +0900 Subject: [PATCH 6706/8282] fix: not work for minior update --- admin/create-new-changelog.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/create-new-changelog.php b/admin/create-new-changelog.php index ff371345d166..ff333f42693f 100644 --- a/admin/create-new-changelog.php +++ b/admin/create-new-changelog.php @@ -29,7 +29,9 @@ function replace_file_content(string $path, string $pattern, string $replace): v $isMinorUpdate = ($minorCurrent !== $minor); // Creates a branch for release. -system('git switch develop'); +if (! $isMinorUpdate) { + system('git switch develop'); +} system('git switch -c docs-changelog-' . $version); system('git switch docs-changelog-' . $version); From 349507d8f07aa25cef935dee5e215a520a58c4bc Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 11 Apr 2024 10:31:26 +0900 Subject: [PATCH 6707/8282] refactor: fix method name (should be lc first) --- system/View/Plugins.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/View/Plugins.php b/system/View/Plugins.php index 19b431a0fab3..7142e44c452e 100644 --- a/system/View/Plugins.php +++ b/system/View/Plugins.php @@ -85,7 +85,7 @@ public static function lang(array $params = []): string * * @param array{field?: string} $params */ - public static function ValidationErrors(array $params = []): string + public static function validationErrors(array $params = []): string { $validator = service('validation'); if ($params === []) { From 7f86e00140b370810f841d2f2513ba74bae4551e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 11 Apr 2024 10:32:20 +0900 Subject: [PATCH 6708/8282] test: add test cases --- tests/system/View/ParserPluginTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php index d0295ef387b5..9d6b97dec716 100644 --- a/tests/system/View/ParserPluginTest.php +++ b/tests/system/View/ParserPluginTest.php @@ -93,6 +93,10 @@ public function testLang(): void $template = '{+ lang Number.terabyteAbbr +}'; $this->assertSame('TB', $this->parser->renderString($template)); + + $template = '{+ lang Time.years 2024 +}'; + + $this->assertSame('2,024 years', $this->parser->renderString($template)); } public function testValidationErrors(): void @@ -122,6 +126,10 @@ public function testSiteURL(): void $template = '{+ siteURL +}'; $this->assertSame('http://example.com/index.php', $this->parser->renderString($template)); + + $template = '{+ siteURL login +}'; + + $this->assertSame('http://example.com/index.php/login', $this->parser->renderString($template)); } public function testValidationErrorsList(): void From 999f7e42dfc23b5c0b3fc0a009bf890cd82521f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 15:29:43 +0900 Subject: [PATCH 6709/8282] docs: remove unneeded space --- user_guide_src/source/installation/installing_composer.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 557f81e8d5b8..e4811abd355f 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -89,7 +89,7 @@ the framework version: Then, run the ``composer update`` command. .. note:: If you fix the version number like ``"codeigniter4/framework": "4.4.8"`` - in your **composer.json**, ``composer update`` command will not update the + in your **composer.json**, ``composer update`` command will not update the framework. See `Writing Version Constraints`_ for how to specify the version. .. _Writing Version Constraints: https://getcomposer.org/doc/articles/versions.md#writing-version-constraints @@ -132,7 +132,7 @@ the framework version: Then, run the ``composer update`` command. .. note:: If you fix the version number like ``"codeigniter4/framework": "4.4.8"`` - in your **composer.json**, ``composer update`` command will not update the + in your **composer.json**, ``composer update`` command will not update the framework. See `Writing Version Constraints`_ for how to specify the version. Pros From 9ae7f43a8180457c85c562f913f2e958ed4486fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 16:13:13 +0900 Subject: [PATCH 6710/8282] refactor: update param name --- system/Test/Interfaces/FabricatorModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php index d4a4c270919c..186f1d4cc468 100644 --- a/system/Test/Interfaces/FabricatorModel.php +++ b/system/Test/Interfaces/FabricatorModel.php @@ -51,7 +51,7 @@ public function find($id = null); * * @throws ReflectionException */ - public function insert($data = null, bool $returnID = true); + public function insert($row = null, bool $returnID = true); /** * The following properties and methods are optional, but if present should From c02ce684fba57bd17499eea951bcc88853f5e528 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 16:15:15 +0900 Subject: [PATCH 6711/8282] docs: make array type more precise --- system/Test/Interfaces/FabricatorModel.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php index 186f1d4cc468..a5860e22fb83 100644 --- a/system/Test/Interfaces/FabricatorModel.php +++ b/system/Test/Interfaces/FabricatorModel.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test\Interfaces; +use CodeIgniter\BaseModel; use Faker\Generator; use ReflectionException; @@ -27,6 +28,8 @@ * @property string $returnType * @property string $primaryKey * @property string $dateFormat + * + * @phpstan-import-type row_array from BaseModel */ interface FabricatorModel { @@ -34,9 +37,9 @@ interface FabricatorModel * Fetches the row of database from $this->table with a primary key * matching $id. * - * @param array|mixed|null $id One primary key or an array of primary keys + * @param int|list|string|null $id One primary key or an array of primary keys * - * @return array|object|null The resulting row of data, or null. + * @phpstan-return ($id is int|string ? row_array|object|null : list) */ public function find($id = null); @@ -44,8 +47,9 @@ public function find($id = null); * Inserts data into the current table. If an object is provided, * it will attempt to convert it to an array. * - * @param array|object $data - * @param bool $returnID Whether insert ID should be returned or not. + * @param array|object|null $row + * @phpstan-param row_array|object|null $row + * @param bool $returnID Whether insert ID should be returned or not. * * @return bool|int|string * From 3cd7572f0dbcd5397f2ef7d9c6b9fdb52e7d0f79 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 16:15:57 +0900 Subject: [PATCH 6712/8282] refactor: add return type --- tests/_support/Models/FabricatorModel.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/_support/Models/FabricatorModel.php b/tests/_support/Models/FabricatorModel.php index 2903b5036402..1cae9394b9a3 100644 --- a/tests/_support/Models/FabricatorModel.php +++ b/tests/_support/Models/FabricatorModel.php @@ -28,8 +28,10 @@ class FabricatorModel extends Model 'description', ]; - // Return a faked entity - public function fake(Generator &$faker) + /** + * Return a faked entity + */ + public function fake(Generator &$faker): object { return (object) [ 'name' => $faker->ipv4(), From b7443388303801737cbbafb157f2bb5415821eaf Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 16:16:18 +0900 Subject: [PATCH 6713/8282] chore: update phpstan-baseline --- phpstan-baseline.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index dd91befad54a..5734ae93e1ef 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -8616,16 +8616,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Test/Fabricator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Interfaces\\\\FabricatorModel\\:\\:find\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Interfaces/FabricatorModel.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Interfaces\\\\FabricatorModel\\:\\:insert\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Interfaces/FabricatorModel.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockBuilder\\:\\:\\$supportedIgnoreStatements type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -10401,11 +10391,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Models/EventModel.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Models\\\\FabricatorModel\\:\\:fake\\(\\) has no return type specified\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Models/FabricatorModel.php', -]; $ignoreErrors[] = [ 'message' => '#^Property Tests\\\\Support\\\\Models\\\\JobModel\\:\\:\\$description has no type specified\\.$#', 'count' => 1, From ba4d372b52c3f8d9bebae84a8d6dad2616b21f17 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 16:26:48 +0900 Subject: [PATCH 6714/8282] docs: add method stubs to sample Model code --- user_guide_src/source/testing/fabricator/001.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/user_guide_src/source/testing/fabricator/001.php b/user_guide_src/source/testing/fabricator/001.php index 8fbf136032ca..f237d56b1324 100644 --- a/user_guide_src/source/testing/fabricator/001.php +++ b/user_guide_src/source/testing/fabricator/001.php @@ -6,5 +6,15 @@ class MyModel implements FabricatorModel { + public function find($id = null) + { + // TODO: Implement find() method. + } + + public function insert($row = null, bool $returnID = true) + { + // TODO: Implement insert() method. + } + // ... } From fd782e70b03f0d2cf73036d0ed45adf958def20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87a=C4=9Fda=C5=9F=20SAYGILI?= Date: Wed, 10 Apr 2024 16:08:51 +0300 Subject: [PATCH 6715/8282] refactor: system/Debug/Toolbar/Collectors/Routes.php --- phpstan-baseline.php | 5 ----- system/Debug/Toolbar/Collectors/Routes.php | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index dd91befad54a..0d6049d02bac 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -4446,11 +4446,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Logs.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Routes\\:\\:display\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Debug/Toolbar/Collectors/Routes.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Debug\\\\Toolbar\\\\Collectors\\\\Timers\\:\\:formatTimelineData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php index 737c86bff692..2dc03dce9651 100644 --- a/system/Debug/Toolbar/Collectors/Routes.php +++ b/system/Debug/Toolbar/Collectors/Routes.php @@ -51,6 +51,25 @@ class Routes extends BaseCollector /** * Returns the data of this collector to be formatted in the toolbar * + * @return array{ + * matchedRoute: array + * }>, + * routes: array + * } + * * @throws ReflectionException */ public function display(): array From 528e51386ccd758b035cdee42e01a7b19077b406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20=C3=87a=C4=9Fda=C5=9F=20SAYGILI?= Date: Fri, 12 Apr 2024 17:55:16 +0300 Subject: [PATCH 6716/8282] apply suggestions. --- system/Debug/Toolbar/Collectors/Routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php index 2dc03dce9651..b6862dcee73c 100644 --- a/system/Debug/Toolbar/Collectors/Routes.php +++ b/system/Debug/Toolbar/Collectors/Routes.php @@ -58,12 +58,12 @@ class Routes extends BaseCollector * method: string, * paramCount: int, * truePCount: int, - * params: array * }>, - * routes: array Date: Sat, 13 Apr 2024 06:48:37 +0900 Subject: [PATCH 6717/8282] docs: fix by proofreading Co-authored-by: Michal Sniatala --- .../source/installation/installing_composer.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index e4811abd355f..3dd4c2a6a1b7 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -88,9 +88,9 @@ the framework version: Then, run the ``composer update`` command. -.. note:: If you fix the version number like ``"codeigniter4/framework": "4.4.8"`` +.. note:: When you use a fixed version number like ``"codeigniter4/framework": "4.4.8"`` in your **composer.json**, ``composer update`` command will not update the - framework. See `Writing Version Constraints`_ for how to specify the version. + framework to the latest version. See `Writing Version Constraints`_ for how to specify the version. .. _Writing Version Constraints: https://getcomposer.org/doc/articles/versions.md#writing-version-constraints @@ -131,9 +131,9 @@ the framework version: Then, run the ``composer update`` command. -.. note:: If you fix the version number like ``"codeigniter4/framework": "4.4.8"`` +.. note:: When you use a fixed version number like ``"codeigniter4/framework": "4.4.8"`` in your **composer.json**, ``composer update`` command will not update the - framework. See `Writing Version Constraints`_ for how to specify the version. + framework to the latest version. See `Writing Version Constraints`_ for how to specify the version. Pros ---- @@ -272,7 +272,7 @@ and check Breaking Changes and Enhancements. Upgrading to a Specified Version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -For example, you may want to upgrade to v4.4.8 after v4.5.0 has been released. +For example, you may want to upgrade from v4.4.7 to v4.4.8 after v4.5.0 has been released. In that case, open **composer.json** in your project root folder, and specify the framework version: From bdf9cea8eeca2a605d284af430502261a9d1ad6e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 09:07:43 +0900 Subject: [PATCH 6718/8282] docs: add README.md --- admin/css/debug-toolbar/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 admin/css/debug-toolbar/README.md diff --git a/admin/css/debug-toolbar/README.md b/admin/css/debug-toolbar/README.md new file mode 100644 index 000000000000..2c70e8147eae --- /dev/null +++ b/admin/css/debug-toolbar/README.md @@ -0,0 +1 @@ +See [contributing/css.md](../../../contributing/css.md). From 60f54c02be6e025d1606d070c1beaf792cd4b806 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 09:07:57 +0900 Subject: [PATCH 6719/8282] docs: remove unneeded "`" --- contributing/css.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/css.md b/contributing/css.md index 267d4f7a5609..4de86e069973 100644 --- a/contributing/css.md +++ b/contributing/css.md @@ -10,7 +10,7 @@ Open your terminal, and navigate to CodeIgniter's root folder. To generate the CSS file, use the following command: ```console -sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css` +sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css ``` Details: From b32370249e26d80d12fb789043a909453264e45c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 09:09:03 +0900 Subject: [PATCH 6720/8282] refactory: remove unneeded `px` --- admin/css/debug-toolbar/toolbar.scss | 4 ++-- system/Debug/Toolbar/Views/toolbar.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index e129a4b1c5b6..f7d3c0d08d77 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -28,8 +28,8 @@ width: 36px; // Spacing - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; // Content clear: both; diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index 4154f4c5c4ca..82d40fe8c4e7 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -13,8 +13,8 @@ z-index: 10000; height: 36px; width: 36px; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; clear: both; text-align: center; cursor: pointer; From cd6ba4822607f94bf6836e05720e54d0d7134598 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 09:09:31 +0900 Subject: [PATCH 6721/8282] fix: add padding and font-family If a dev changes CSS for h1, the toolbar dislpay will be broken. --- admin/css/debug-toolbar/toolbar.scss | 2 ++ system/Debug/Toolbar/Views/toolbar.css | 2 ++ 2 files changed, 4 insertions(+) diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss index f7d3c0d08d77..97a92690b937 100644 --- a/admin/css/debug-toolbar/toolbar.scss +++ b/admin/css/debug-toolbar/toolbar.scss @@ -85,6 +85,8 @@ display: flex; font-weight: normal; margin: 0 0 0 auto; + padding: 0; + font-family: $base-font; svg { width: 16px; diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css index 82d40fe8c4e7..2e165b825e99 100644 --- a/system/Debug/Toolbar/Views/toolbar.css +++ b/system/Debug/Toolbar/Views/toolbar.css @@ -52,6 +52,8 @@ display: flex; font-weight: normal; margin: 0 0 0 auto; + padding: 0; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji"; } #debug-bar h1 svg { width: 16px; From 8a76cb67719f2e45aa4f026b7cf3a7b28ca6fcfb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 11:55:48 +0900 Subject: [PATCH 6722/8282] chore: move PHPUnit cache to build/ --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 45b6b07231c4..d97e10c0244f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,7 +4,7 @@ bootstrap="system/Test/bootstrap.php" backupGlobals="false" beStrictAboutOutputDuringTests="true" colors="true" columns="max" failOnRisky="true" failOnWarning="true" - cacheDirectory=".phpunit.cache"> + cacheDirectory="build/.phpunit.cache"> From b8655869c72f85eecbf26660d6c03f67c5e6fbc9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 13:41:50 +0900 Subject: [PATCH 6723/8282] docs: fix Postgre DSN sample See "Table 33.1. SSL Mode Descriptions" in https://www.postgresql.org/docs/12/libpq-ssl.html#LIBPQ-SSL-PROTECTION --- user_guide_src/source/database/configuration/010.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration/010.php b/user_guide_src/source/database/configuration/010.php index de06d231b015..d1f89b31fa64 100644 --- a/user_guide_src/source/database/configuration/010.php +++ b/user_guide_src/source/database/configuration/010.php @@ -10,7 +10,7 @@ class Database extends Config // Postgre public array $default = [ - 'DSN' => 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1', + 'DSN' => 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=require', // ... ]; From 7b3a01a297ed0e03f4b93f9fe9df0f40157181ef Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:20:51 +0900 Subject: [PATCH 6724/8282] chore: change coding style --- phpunit.xml.dist | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d97e10c0244f..6d2cf4c07478 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,10 +1,15 @@ - + From 930a44ff66252a8c8d00cff21f85d3bf31a836f7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:24:05 +0900 Subject: [PATCH 6725/8282] chore: change coding style --- admin/framework/phpunit.xml.dist | 102 +++++++++++++++++-------------- admin/starter/phpunit.xml.dist | 102 +++++++++++++++++-------------- 2 files changed, 112 insertions(+), 92 deletions(-) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index 0235b8a739c1..f159284ba4ba 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -1,48 +1,58 @@ - - - - - - - - - - - - ./tests - - - - - - - - - - - - - - - - - - - - - ./app - - - ./app/Views - ./app/Config/Routes.php - - + + + + + + + + + + + + ./tests + + + + + + + + + + + + + + + + + + + + + ./app + + + ./app/Views + ./app/Config/Routes.php + + diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index 7cd6d3af600a..6727513624a9 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -1,48 +1,58 @@ - - - - - - - - - - - - ./tests - - - - - - - - - - - - - - - - - - - - - ./app - - - ./app/Views - ./app/Config/Routes.php - - + + + + + + + + + + + + ./tests + + + + + + + + + + + + + + + + + + + + + ./app + + + ./app/Views + ./app/Config/Routes.php + + From fc303daf755b72ba5507c0eacee10dafc464b759 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:29:09 +0900 Subject: [PATCH 6726/8282] chore: update PHPUnit schema version --- phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6d2cf4c07478..ea45832f9566 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@ Date: Sat, 13 Apr 2024 18:30:48 +0900 Subject: [PATCH 6727/8282] chore: move PHPUnit cache to build/ --- admin/framework/phpunit.xml.dist | 2 +- admin/starter/phpunit.xml.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index f159284ba4ba..dba006b5a13d 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -9,7 +9,7 @@ stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" - cacheDirectory=".phpunit.cache"> + cacheDirectory="build/.phpunit.cache"> diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index 6727513624a9..a3f4c958a7b5 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -9,7 +9,7 @@ stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" - cacheDirectory=".phpunit.cache"> + cacheDirectory="build/.phpunit.cache"> From 601593679c06e46f01b5d4a081b502de8152794c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:30:59 +0900 Subject: [PATCH 6728/8282] chore: change attribute order Make the same as the main repositoy's phpunit.xml.dist. --- admin/framework/phpunit.xml.dist | 10 +++++----- admin/starter/phpunit.xml.dist | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index dba006b5a13d..5f51d97f922c 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -1,14 +1,14 @@ diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index a3f4c958a7b5..5f51d97f922c 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -1,14 +1,14 @@ From 43889b151b21564787778af0db0847ccd97a86d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:38:26 +0900 Subject: [PATCH 6729/8282] chore: add default attributes to coverage No change will be made. --- admin/framework/phpunit.xml.dist | 6 +++++- admin/starter/phpunit.xml.dist | 6 +++++- phpunit.xml.dist | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index 5f51d97f922c..1dc6c6fbbe98 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -10,7 +10,11 @@ failOnRisky="true" failOnWarning="true" cacheDirectory="build/.phpunit.cache"> - + diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index 5f51d97f922c..1dc6c6fbbe98 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -10,7 +10,11 @@ failOnRisky="true" failOnWarning="true" cacheDirectory="build/.phpunit.cache"> - + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ea45832f9566..7464323e4078 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,7 +10,11 @@ failOnRisky="true" failOnWarning="true" cacheDirectory="build/.phpunit.cache"> - + From e7fca57c38cec44e8c6dad99c758e96b892a053f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:44:08 +0900 Subject: [PATCH 6730/8282] chore: move up --- admin/framework/phpunit.xml.dist | 18 +++++++++--------- admin/starter/phpunit.xml.dist | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index 1dc6c6fbbe98..5f0c2e9a2f76 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -32,6 +32,15 @@ + + + ./app + + + ./app/Views + ./app/Config/Routes.php + + @@ -50,13 +59,4 @@ --> - - - ./app - - - ./app/Views - ./app/Config/Routes.php - - diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index 1dc6c6fbbe98..5f0c2e9a2f76 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -32,6 +32,15 @@ + + + ./app + + + ./app/Views + ./app/Config/Routes.php + + @@ -50,13 +59,4 @@ --> - - - ./app - - - ./app/Views - ./app/Config/Routes.php - - From 2c112a6ebe264fbc55c2d34acc8708c19520ced5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:53:40 +0900 Subject: [PATCH 6731/8282] chore: add CODEIGNITER_SCREAM_DEPRECATIONS but disabled --- admin/framework/phpunit.xml.dist | 1 + admin/starter/phpunit.xml.dist | 1 + 2 files changed, 2 insertions(+) diff --git a/admin/framework/phpunit.xml.dist b/admin/framework/phpunit.xml.dist index 5f0c2e9a2f76..dea940878617 100644 --- a/admin/framework/phpunit.xml.dist +++ b/admin/framework/phpunit.xml.dist @@ -43,6 +43,7 @@ + diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index 5f0c2e9a2f76..dea940878617 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -43,6 +43,7 @@ + From 754309e78217feba2b1e3fc73de42b80a22564ac Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 18:57:04 +0900 Subject: [PATCH 6732/8282] chore: update .gitignore --- .gitignore | 2 -- admin/framework/.gitignore | 2 -- admin/starter/.gitignore | 2 -- 3 files changed, 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0334b660bb60..988be09b1948 100644 --- a/.gitignore +++ b/.gitignore @@ -125,7 +125,5 @@ nb-configuration.xml /results/ /phpunit*.xml -/.phpunit.*.cache -/.phpunit.cache /.php-cs-fixer.php diff --git a/admin/framework/.gitignore b/admin/framework/.gitignore index 696da9cb0a91..8071bd3d07f8 100644 --- a/admin/framework/.gitignore +++ b/admin/framework/.gitignore @@ -124,5 +124,3 @@ nb-configuration.xml /results/ /phpunit*.xml -/.phpunit.*.cache - diff --git a/admin/starter/.gitignore b/admin/starter/.gitignore index 696da9cb0a91..8071bd3d07f8 100644 --- a/admin/starter/.gitignore +++ b/admin/starter/.gitignore @@ -124,5 +124,3 @@ nb-configuration.xml /results/ /phpunit*.xml -/.phpunit.*.cache - From 9f850f79d9e5cd81a59ff04131133741f84f9fa1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 13 Apr 2024 21:53:03 +0900 Subject: [PATCH 6733/8282] fix: Cannot declare class CodeIgniter\Config\Services, because the name is already in use See https://github.com/codeigniter4/CodeIgniter4/pull/8745#issuecomment-2052569997 --- system/Config/BaseService.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index 2f8df2a35420..cd770dc667ed 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -389,8 +389,15 @@ protected static function buildServicesCache(): void $locator = static::locator(); $files = $locator->search('Config/Services'); + $systemPath = static::autoloader()->getNamespace('CodeIgniter')[0]; + // Get instances of all service classes and cache them locally. foreach ($files as $file) { + // Does not search `CodeIgniter` namespace to prevent from loading twice. + if (str_starts_with($file, $systemPath)) { + continue; + } + $classname = $locator->findQualifiedNameFromPath($file); if ($classname === false) { From d4f15146a0c02fcdca4f6fb60a6d237541c33218 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 13 Apr 2024 19:17:17 +0200 Subject: [PATCH 6734/8282] docs: Small typo in routing.rst Fix "a HTTP" to "an HTTP" --- user_guide_src/source/incoming/routing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst index 134b0e248134..2515d1a888b9 100644 --- a/user_guide_src/source/incoming/routing.rst +++ b/user_guide_src/source/incoming/routing.rst @@ -814,7 +814,7 @@ Consider this URI:: example.com/index.php/helloworld/hello/1 -In the above example, when you send a HTTP request with **GET** method, +In the above example, when you send an HTTP request with **GET** method, Auto Routing would attempt to find a controller named ``App\Controllers\Helloworld`` and executes ``getHello()`` method with passing ``'1'`` as the first argument. @@ -918,7 +918,7 @@ or to use :ref:`auto-routing-improved`, Auto Routing (Legacy) feature. It is easy to create vulnerable apps where controller filters or CSRF protection are bypassed. -.. important:: Auto Routing (Legacy) routes a HTTP request with **any** HTTP method to a controller method. +.. important:: Auto Routing (Legacy) routes an HTTP request with **any** HTTP method to a controller method. Enable Auto Routing (Legacy) ============================ From c6de161db89a9fd1bad8fa819e02320d91dc2402 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 13 Apr 2024 19:20:02 +0200 Subject: [PATCH 6735/8282] docs: Small typo in controllers.rst Fix "a HTTP" to "an HTTP". --- user_guide_src/source/incoming/controllers.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst index dcbe950b2e36..bd1f011df78b 100644 --- a/user_guide_src/source/incoming/controllers.rst +++ b/user_guide_src/source/incoming/controllers.rst @@ -11,7 +11,7 @@ Controllers are the heart of your application, as they determine how HTTP reques What is a Controller? ********************* -A Controller is simply a class file that handles a HTTP request. +A Controller is simply a class file that handles an HTTP request. :doc:`URI Routing ` associates a URI with a controller. It returns a view string or ``Response`` object. @@ -477,7 +477,7 @@ without route definitions. The auto-routing is disabled by default. Auto Routing (Legacy). It is easy to create vulnerable apps where controller filters or CSRF protection are bypassed. -.. important:: Auto Routing (Legacy) routes a HTTP request with **any** HTTP method to a controller method. +.. important:: Auto Routing (Legacy) routes an HTTP request with **any** HTTP method to a controller method. .. important:: Since v4.5.0, if Auto Routing (Legacy) doesn't find the controller, it will throw ``PageNotFoundException`` exception before the Controller Filters From 799b5056d17875d385451d6bf3ed2a0dcd2c986a Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:11:02 +0900 Subject: [PATCH 6736/8282] docs: add note on view() and View Renderer relationship --- user_guide_src/source/general/common_functions.rst | 1 + user_guide_src/source/outgoing/views.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index b16b5576ee45..05e43026675d 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -180,6 +180,7 @@ Service Accessors :rtype: string Grabs the current RendererInterface-compatible class + (:doc:`View <../outgoing/view_renderer>` class by default) and tells it to render the specified view. Simply provides a convenience method that can be used in Controllers, libraries, and routed closures. diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index fabd811de87a..611631ea6d5a 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -47,6 +47,8 @@ Where *name* is the name of your view file. .. important:: If the file extension is omitted, then the views are expected to end with the **.php** extension. +.. note:: The ``view()`` function uses :doc:`view_renderer` internally. + Now, create a file called **Blog.php** in the **app/Controllers** directory, and put this in it: From a25275ab175a5c26c34132f3d6c89cd4c1d1466c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:16:21 +0900 Subject: [PATCH 6737/8282] docs: change page order "Views" page is an explanation of the standard views. The standard views use View Renderer. So the two pages should be close. --- user_guide_src/source/outgoing/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/index.rst b/user_guide_src/source/outgoing/index.rst index a08a2e52a125..7b643ae5aad7 100644 --- a/user_guide_src/source/outgoing/index.rst +++ b/user_guide_src/source/outgoing/index.rst @@ -8,9 +8,9 @@ View components are used to build what is returned to the user. :titlesonly: views - view_cells view_renderer view_layouts + view_cells view_parser view_decorators table From 2091c4265f0b725b9e53db25307e04baa349dee8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:29:07 +0900 Subject: [PATCH 6738/8282] docs: capitalize first letter --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 6b82129c64c9..d06161c2840f 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -81,7 +81,7 @@ need to be unique, or a later parameter setting will over-ride an earlier one. This also impacts escaping parameter values for different contexts inside your script. You will have to give each escaped value a unique parameter name. -Parser templates +Parser Templates ================ You can use the ``render()`` method to parse (or render) simple templates, From 312778454869cc88790446ba09d25a836c8bf407 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:29:46 +0900 Subject: [PATCH 6739/8282] docs: decorate method name --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index d06161c2840f..4202f478e1fe 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -102,7 +102,7 @@ Parser Configuration Options Several options can be passed to the ``render()`` or ``renderString()`` methods. -- ``cache`` - the time in seconds, to save a view's results; ignored for renderString() +- ``cache`` - the time in seconds, to save a view's results; ignored for ``renderString()`` - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath; ignored for renderString() - ``saveData`` - true if the view data parameters should be retained for subsequent calls; From 7b45a2b5281c89f365da270f95044ebcc989056d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:30:16 +0900 Subject: [PATCH 6740/8282] docs: improve description The views in "Views" page is pure PHP views. It is different from Parser Template views. So I removed the link to "Views" page. --- user_guide_src/source/outgoing/view_parser.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index 4202f478e1fe..dab40c9b9750 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -90,10 +90,12 @@ like this: .. literalinclude:: view_parser/003.php View parameters are passed to ``setData()`` as an associative -array of data to be replaced in the template. In the above example, the -template would contain two variables: ``{blog_title}`` and ``{blog_heading}`` -The first parameter to ``render()`` contains the name of the :doc:`view -file `, Where *blog_template* is the name of your view file. +array of data to be replaced in the template. + +In the above example, the template would contain two variables: ``{blog_title}`` and ``{blog_heading}`` + +The first parameter to ``render()`` contains the name of the template, where +``blog_template``` is the name of your view template file. .. important:: If the file extension is omitted, then the views are expected to end with the .php extension. From 4d88c19c30bb09befb59abd9f28280dac34897ff Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 09:42:12 +0900 Subject: [PATCH 6741/8282] docs: add section titles and descriptions --- .../source/outgoing/view_decorators.rst | 18 +++++++++++++++++- .../source/outgoing/view_decorators/002.php | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst index f0b2239b0f65..29c8c25c7418 100644 --- a/user_guide_src/source/outgoing/view_decorators.rst +++ b/user_guide_src/source/outgoing/view_decorators.rst @@ -2,20 +2,36 @@ View Decorators ############### +.. contents:: + :local: + :depth: 2 + +************************* +What are View Decorators? +************************* + View Decorators allow your application to modify the HTML output during the rendering process. This happens just prior to being cached, and allows you to apply custom functionality to your views. +You can use View Decorators with :doc:`view_renderer` or :doc:`view_parser`. + ******************* Creating Decorators ******************* +Creating Decorator Class +======================== + Creating your own view decorators requires creating a new class that implements ``CodeIgniter\View\ViewDecoratorInterface``. This requires a single method that takes the generated HTML string, performs any modifications on it, and returns the resulting HTML. .. literalinclude:: view_decorators/001.php -Once created, the class must be registered in ``app/Config/View.php``: +Registering Decorator Class +=========================== + +Once created, the class must be registered in **app/Config/View.php**: .. literalinclude:: view_decorators/002.php diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php index ba56ea1e80ad..b0634187b51d 100644 --- a/user_guide_src/source/outgoing/view_decorators/002.php +++ b/user_guide_src/source/outgoing/view_decorators/002.php @@ -6,9 +6,9 @@ class View extends BaseView { + // ... + public array $decorators = [ 'App\Views\Decorators\MyDecorator', ]; - - // ... } From 9483b354431be24b6a9a82d1d31e98eb47d1fc9e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 10:08:04 +0900 Subject: [PATCH 6742/8282] docs: fix typo Co-authored-by: Pooya Parsa --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index dab40c9b9750..a439d907a1de 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -95,7 +95,7 @@ array of data to be replaced in the template. In the above example, the template would contain two variables: ``{blog_title}`` and ``{blog_heading}`` The first parameter to ``render()`` contains the name of the template, where -``blog_template``` is the name of your view template file. +``blog_template`` is the name of your view template file. .. important:: If the file extension is omitted, then the views are expected to end with the .php extension. From 092231850b70a7c3017a0beb7198388735fb0211 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 12:05:41 +0900 Subject: [PATCH 6743/8282] Prep for 4.5.1 release --- CHANGELOG.md | 29 +++++++++++++++++ phpdoc.dist.xml | 2 +- system/CodeIgniter.php | 2 +- user_guide_src/source/changelogs/v4.5.1.rst | 18 +---------- user_guide_src/source/conf.py | 2 +- .../source/installation/upgrade_451.rst | 32 +++++-------------- 6 files changed, 41 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60950f4cf0f0..5148b0faad05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## [v4.5.1](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.1) (2024-04-14) +[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.5.0...v4.5.1) + +### Fixed Bugs + +* fix: TypeError in form() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8736 +* fix: [DebugBar] TypeError in Toolbar by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8727 +* fix: TypeError when Time is passed to Model by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8738 +* docs: added Config\Feature::$oldFilterOrder to app/Config/Feature.php… by @mullernato in https://github.com/codeigniter4/CodeIgniter4/pull/8749 +* fix: Factories::get() cannot get defined classes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8744 +* fix: `BaseConnection::escape()` does not accept Stringable by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8756 +* fix: [CURLRequest] `getHeaderLine('Content-Type')` causes InvalidArgumentException by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8760 +* fix: [CURLRequest] construct param $config is not used by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8761 +* fix: [FileLocator] Cannot declare class XXX, because the name is already in use by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8745 +* fix: [DebugBar] Toolbar display may be broken by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8772 +* fix: Cannot declare class CodeIgniter\Config\Services, because the name is already in use by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8776 +* docs: fix Postgre DSN sample by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8774 + +### Refactoring + +* test: refactor Config/Registrar.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8731 +* test: add return void by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8746 +* refactor: system/CLI/BaseCommand.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8741 +* refactor: system/View/Plugins.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8742 +* refactor: fix method name `ValidationErrors` in View\Plugins by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8758 +* refactor: system/Debug/Toolbar/Collectors/Routes.php by @mcsaygili in https://github.com/codeigniter4/CodeIgniter4/pull/8751 +* refactor: improve error message in BaseExceptionHandler by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8766 +* refactor: FabricatorModel by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8770 + ## [v4.5.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.5.0) (2024-04-07) [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.8...v4.5.0) diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml index b93122ac193f..546630d3f446 100644 --- a/phpdoc.dist.xml +++ b/phpdoc.dist.xml @@ -10,7 +10,7 @@ api/build/ api/cache/ - + system diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 7fdade26fb99..1758228076ab 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -56,7 +56,7 @@ class CodeIgniter /** * The current version of CodeIgniter Framework */ - public const CI_VERSION = '4.5.0'; + public const CI_VERSION = '4.5.1'; /** * App startup time. diff --git a/user_guide_src/source/changelogs/v4.5.1.rst b/user_guide_src/source/changelogs/v4.5.1.rst index 9f00193bcf6c..c2407f651ae1 100644 --- a/user_guide_src/source/changelogs/v4.5.1.rst +++ b/user_guide_src/source/changelogs/v4.5.1.rst @@ -2,7 +2,7 @@ Version 4.5.1 ############# -Release Date: Unreleased +Release Date: April 14, 2024 **4.5.1 release of CodeIgniter4** @@ -10,22 +10,6 @@ Release Date: Unreleased :local: :depth: 3 -******** -BREAKING -******** - -*************** -Message Changes -*************** - -******* -Changes -******* - -************ -Deprecations -************ - ********** Bugs Fixed ********** diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index 100b9cb012cb..1bc7efd9d0ab 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -26,7 +26,7 @@ version = '4.5' # The full version, including alpha/beta/rc tags. -release = '4.5.0' +release = '4.5.1' # -- General configuration --------------------------------------------------- diff --git a/user_guide_src/source/installation/upgrade_451.rst b/user_guide_src/source/installation/upgrade_451.rst index 3fc97dc3cffe..2900209474f0 100644 --- a/user_guide_src/source/installation/upgrade_451.rst +++ b/user_guide_src/source/installation/upgrade_451.rst @@ -12,18 +12,6 @@ Please refer to the upgrade instructions corresponding to your installation meth :local: :depth: 2 -********************** -Mandatory File Changes -********************** - -**************** -Breaking Changes -**************** - -********************* -Breaking Enhancements -********************* - ************* Project Files ************* @@ -34,21 +22,17 @@ these files being outside of the **system** scope they will not be changed witho There are some third-party CodeIgniter modules available to assist with merging changes to the project space: `Explore on Packagist `_. -Content Changes -=============== - -The following files received significant changes (including deprecations or visual adjustments) -and it is recommended that you merge the updated versions with your application: - -Config ------- - -- @TODO - All Changes =========== This is a list of all files in the **project space** that received changes; many will be simple comments or formatting that have no effect on the runtime: -- @TODO +- .gitignore +- composer.json +- phpunit.xml.dist +- tests/.htaccess +- tests/index.html +- writable/debugbar/.gitkeep (Removed) +- writable/debugbar/index.html +- writable/index.html From df6c93c2857bf0f259d8a1105ed06741d8a47284 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 13:37:20 +0900 Subject: [PATCH 6744/8282] docs: add changelog and upgrade for v4.5.2 --- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.5.2.rst | 35 ++++++++++++ .../source/installation/upgrade_452.rst | 54 +++++++++++++++++++ .../source/installation/upgrading.rst | 1 + 4 files changed, 91 insertions(+) create mode 100644 user_guide_src/source/changelogs/v4.5.2.rst create mode 100644 user_guide_src/source/installation/upgrade_452.rst diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 8f5c5df8d290..299644d7f060 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.5.2 v4.5.1 v4.5.0 v4.4.8 diff --git a/user_guide_src/source/changelogs/v4.5.2.rst b/user_guide_src/source/changelogs/v4.5.2.rst new file mode 100644 index 000000000000..d578360b720a --- /dev/null +++ b/user_guide_src/source/changelogs/v4.5.2.rst @@ -0,0 +1,35 @@ +############# +Version 4.5.2 +############# + +Release Date: Unreleased + +**4.5.2 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 3 + +******** +BREAKING +******** + +*************** +Message Changes +*************** + +******* +Changes +******* + +************ +Deprecations +************ + +********** +Bugs Fixed +********** + +See the repo's +`CHANGELOG.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/installation/upgrade_452.rst b/user_guide_src/source/installation/upgrade_452.rst new file mode 100644 index 000000000000..9b7071b99bf9 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_452.rst @@ -0,0 +1,54 @@ +############################# +Upgrading from 4.5.1 to 4.5.2 +############################# + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +********************** +Mandatory File Changes +********************** + +**************** +Breaking Changes +**************** + +********************* +Breaking Enhancements +********************* + +************* +Project Files +************* + +Some files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. + +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +Content Changes +=============== + +The following files received significant changes (including deprecations or visual adjustments) +and it is recommended that you merge the updated versions with your application: + +Config +------ + +- @TODO + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +- @TODO diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index 9e5e1730daba..b89d0619c89d 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_452 upgrade_451 upgrade_450 upgrade_448 From ea3450a1e6f5a95ec16a848614c1477d97892750 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 14 Apr 2024 13:39:28 +0900 Subject: [PATCH 6745/8282] chore: fix phpunit.xml.dist for appstarter --- admin/starter/phpunit.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/starter/phpunit.xml.dist b/admin/starter/phpunit.xml.dist index dea940878617..b408a99d988c 100644 --- a/admin/starter/phpunit.xml.dist +++ b/admin/starter/phpunit.xml.dist @@ -2,7 +2,7 @@ Date: Sun, 14 Apr 2024 23:07:05 +0800 Subject: [PATCH 6746/8282] fix: handle other behavior of sql server. --- system/Database/SQLSRV/Builder.php | 9 +++++++++ tests/system/Database/Builder/FromTest.php | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index a624dced38d2..1ba2094ed720 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -290,6 +290,15 @@ private function getFullName(string $table): string } if ($this->db->escapeChar === '"') { + if (str_contains($table, '.')) { + $dbInfo = explode('.', $table); + $database = str_replace('"', '', $dbInfo[0]); + $schema = str_replace('"', '', $dbInfo[1]); + $tableName = str_replace('"', '', $dbInfo[2]); + + return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; + } + return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias; } diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index 36edaa1dcf0c..6abff01ab241 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -153,4 +153,20 @@ public function testFromSubqueryWithSQLSRV(): void $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); } + + /** + * See https://github.com/codeigniter4/CodeIgniter4/issues/8697 + * + * @return void + */ + public function testConstructorWithMultipleSegmentTableWithSQLSRV(): void + { + $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']); + + $builder = new SQLSRVBuilder('database.dbo.table', $this->db); + + $expectedSQL = 'SELECT * FROM "database"."dbo"."table"'; + + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + } } From 8ce148f0c04f6061b7e231a91bc83911cf2a9777 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Sun, 14 Apr 2024 23:27:47 +0800 Subject: [PATCH 6747/8282] docs: change the comment. --- tests/system/Database/Builder/FromTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index 6abff01ab241..384509155542 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -155,9 +155,7 @@ public function testFromSubqueryWithSQLSRV(): void } /** - * See https://github.com/codeigniter4/CodeIgniter4/issues/8697 - * - * @return void + * @see https://github.com/codeigniter4/CodeIgniter4/issues/8697 */ public function testConstructorWithMultipleSegmentTableWithSQLSRV(): void { From 349f996cccf4de2fcafa2f2e4202592092846dfe Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Sun, 14 Apr 2024 23:32:27 +0800 Subject: [PATCH 6748/8282] style: fix the code style. --- system/Database/SQLSRV/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index 1ba2094ed720..982492610d06 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -298,7 +298,7 @@ private function getFullName(string $table): string return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; } - + return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias; } From eef2c84e121df837eb15579c8cfbb676d0ef3d01 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 12 Apr 2024 11:56:27 +0900 Subject: [PATCH 6749/8282] docs: add changelog and upgrade for v4.6.0 --- user_guide_src/source/changelogs/index.rst | 1 + user_guide_src/source/changelogs/v4.6.0.rst | 84 +++++++++++++++++++ .../source/installation/upgrade_460.rst | 54 ++++++++++++ .../source/installation/upgrading.rst | 1 + 4 files changed, 140 insertions(+) create mode 100644 user_guide_src/source/changelogs/v4.6.0.rst create mode 100644 user_guide_src/source/installation/upgrade_460.rst diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index 299644d7f060..b0992e086a6b 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -12,6 +12,7 @@ See all the changes. .. toctree:: :titlesonly: + v4.6.0 v4.5.2 v4.5.1 v4.5.0 diff --git a/user_guide_src/source/changelogs/v4.6.0.rst b/user_guide_src/source/changelogs/v4.6.0.rst new file mode 100644 index 000000000000..998e5ba269d6 --- /dev/null +++ b/user_guide_src/source/changelogs/v4.6.0.rst @@ -0,0 +1,84 @@ +############# +Version 4.6.0 +############# + +Release Date: Unreleased + +**4.6.0 release of CodeIgniter4** + +.. contents:: + :local: + :depth: 3 + +********** +Highlights +********** + +- TBD + +******** +BREAKING +******** + +Behavior Changes +================ + +Interface Changes +================= + +Method Signature Changes +======================== + +************ +Enhancements +************ + +Commands +======== + +Testing +======= + +Database +======== + +Query Builder +------------- + +Forge +----- + +Others +------ + +Model +===== + +Libraries +========= + +Helpers and Functions +===================== + +Others +====== + +*************** +Message Changes +*************** + +******* +Changes +******* + +************ +Deprecations +************ + +********** +Bugs Fixed +********** + +See the repo's +`CHANGELOG.md `_ +for a complete list of bugs fixed. diff --git a/user_guide_src/source/installation/upgrade_460.rst b/user_guide_src/source/installation/upgrade_460.rst new file mode 100644 index 000000000000..15af1aca3c4a --- /dev/null +++ b/user_guide_src/source/installation/upgrade_460.rst @@ -0,0 +1,54 @@ +############################# +Upgrading from 4.5.x to 4.6.0 +############################# + +Please refer to the upgrade instructions corresponding to your installation method. + +- :ref:`Composer Installation App Starter Upgrading ` +- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading ` +- :ref:`Manual Installation Upgrading ` + +.. contents:: + :local: + :depth: 2 + +********************** +Mandatory File Changes +********************** + +**************** +Breaking Changes +**************** + +********************* +Breaking Enhancements +********************* + +************* +Project Files +************* + +Some files in the **project space** (root, app, public, writable) received updates. Due to +these files being outside of the **system** scope they will not be changed without your intervention. + +There are some third-party CodeIgniter modules available to assist with merging changes to +the project space: `Explore on Packagist `_. + +Content Changes +=============== + +The following files received significant changes (including deprecations or visual adjustments) +and it is recommended that you merge the updated versions with your application: + +Config +------ + +- @TODO + +All Changes +=========== + +This is a list of all files in the **project space** that received changes; +many will be simple comments or formatting that have no effect on the runtime: + +- @TODO diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst index b89d0619c89d..949bfeb15d96 100644 --- a/user_guide_src/source/installation/upgrading.rst +++ b/user_guide_src/source/installation/upgrading.rst @@ -16,6 +16,7 @@ See also :doc:`./backward_compatibility_notes`. backward_compatibility_notes + upgrade_460 upgrade_452 upgrade_451 upgrade_450 From 53093c9ad3cd4802e82436e3ba288270811ee048 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 15 Apr 2024 08:33:00 +0900 Subject: [PATCH 6750/8282] chore: update gitattributes --- .gitattributes | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index e2219ef90a4e..c41e331ff63c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,18 +17,21 @@ CONTRIBUTING.md export-ignore # contributor/development files tests/ export-ignore +tools/ export-ignore utils/ export-ignore .php-cs-fixer.dist.php export-ignore .php-cs-fixer.no-header.php export-ignore +.php-cs-fixer.tests.php export-ignore .php-cs-fixer.user-guide.php export-ignore deptrac.yaml export-ignore -phpstan-baseline.neon.dist export-ignore +phpmetrics.json export-ignore +phpstan-baseline.php export-ignore phpstan-bootstrap.php export-ignore phpstan.neon.dist export-ignore phpunit.xml.dist export-ignore -psalm_autoload.php export-ignore -psalm-baseline.php export-ignore +psalm-baseline.xml export-ignore psalm.xml export-ignore +psalm_autoload.php export-ignore rector.php export-ignore # source user guide From 5750027a9d0870700ec13752b6ff4e5cdb140fba Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 15 Apr 2024 08:49:45 +0200 Subject: [PATCH 6751/8282] docs: Small typos in incomingrequest.rst Change "a HTTP" to "an HTTP", "an lowercase" to "a lowercase" an "lower-case" to "lowercase". --- user_guide_src/source/incoming/incomingrequest.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst index 4ca22ba4d09d..0b6f3daab39e 100644 --- a/user_guide_src/source/incoming/incomingrequest.rst +++ b/user_guide_src/source/incoming/incomingrequest.rst @@ -47,7 +47,7 @@ is() .. versionadded:: 4.3.0 -Since v4.3.0, you can use the ``is()`` method. It accepts a HTTP method, ``'ajax'``, +Since v4.3.0, you can use the ``is()`` method. It accepts an HTTP method, ``'ajax'``, or ``'json'``, and returns boolean. .. note:: HTTP method should be case-sensitive, but the parameter is case-insensitive. @@ -64,10 +64,10 @@ You can check the HTTP method that this request represents with the ``getMethod( The HTTP method is case-sensitive, and by convention, standardized methods are defined in all-uppercase US-ASCII letters. -.. note:: Prior to v4.5.0, by default, the method was returned as a lower-case +.. note:: Prior to v4.5.0, by default, the method was returned as a lowercase string (i.e., ``'get'``, ``'post'``, etc). But it was a bug. -You can get an lowercase version by wrapping the call in ``strtolower()``:: +You can get a lowercase version by wrapping the call in ``strtolower()``:: // Returns 'get' $method = strtolower($request->getMethod()); From 82ece196f1c046102b470c384ff2cbcf552f7843 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Wed, 10 Apr 2024 23:35:22 +0800 Subject: [PATCH 6752/8282] chore: Reverts disabling custom fixers for PHP 7.4 --- .php-cs-fixer.dist.php | 18 +++++++----------- .php-cs-fixer.no-header.php | 18 +++++++----------- .php-cs-fixer.tests.php | 18 +++++++----------- .php-cs-fixer.user-guide.php | 18 +++++++----------- 4 files changed, 28 insertions(+), 44 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index b47b4d6480c9..fc47ed2f87e5 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -43,20 +43,16 @@ $overrides = []; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.cache', - 'finder' => $finder, + 'cacheFile' => 'build/.php-cs-fixer.cache', + 'finder' => $finder, + 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), + 'customRules' => [ + NoCodeSeparatorCommentFixer::name() => true, + ], ]; -$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( +return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( 'CodeIgniter 4 framework', 'CodeIgniter Foundation', 'admin@codeigniter.com' ); - -$config - ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) - ->setRules(array_merge($config->getRules(), [ - NoCodeSeparatorCommentFixer::name() => true, - ])); - -return $config; diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index 3729d434acba..cd10717aa5a2 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -32,16 +32,12 @@ $overrides = []; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', - 'finder' => $finder, -]; - -$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); - -$config - ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) - ->setRules(array_merge($config->getRules(), [ + 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', + 'finder' => $finder, + 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), + 'customRules' => [ NoCodeSeparatorCommentFixer::name() => true, - ])); + ], +]; -return $config; +return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); diff --git a/.php-cs-fixer.tests.php b/.php-cs-fixer.tests.php index c6b13a135a7c..7d5c1fad5e67 100644 --- a/.php-cs-fixer.tests.php +++ b/.php-cs-fixer.tests.php @@ -38,20 +38,16 @@ ]; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.tests.cache', - 'finder' => $finder, + 'cacheFile' => 'build/.php-cs-fixer.tests.cache', + 'finder' => $finder, + 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), + 'customRules' => [ + NoCodeSeparatorCommentFixer::name() => true, + ], ]; -$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( +return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary( 'CodeIgniter 4 framework', 'CodeIgniter Foundation', 'admin@codeigniter.com' ); - -$config - ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) - ->setRules(array_merge($config->getRules(), [ - NoCodeSeparatorCommentFixer::name() => true, - ])); - -return $config; diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 9f9f9b79a464..6382201525e4 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -42,16 +42,12 @@ ]; $options = [ - 'cacheFile' => 'build/.php-cs-fixer.user-guide.cache', - 'finder' => $finder, -]; - -$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); - -$config - ->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer')) - ->setRules(array_merge($config->getRules(), [ + 'cacheFile' => 'build/.php-cs-fixer.user-guide.cache', + 'finder' => $finder, + 'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'), + 'customRules' => [ NoCodeSeparatorCommentFixer::name() => true, - ])); + ], +]; -return $config; +return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects(); From acdbc5dd0fb02bba0b87ef254d3d8b9ad2636796 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Thu, 11 Apr 2024 00:33:34 +0800 Subject: [PATCH 6753/8282] style: enable modernize_strpos --- .php-cs-fixer.dist.php | 5 ++++- .php-cs-fixer.no-header.php | 5 ++++- .php-cs-fixer.tests.php | 2 ++ .php-cs-fixer.user-guide.php | 2 ++ spark | 2 +- user_guide_src/source/libraries/curlrequest/012.php | 2 +- 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index b47b4d6480c9..dfd23faaf463 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -40,7 +40,10 @@ __DIR__ . '/spark', ]); -$overrides = []; +$overrides = [ + // for updating to coding-standard + 'modernize_strpos' => true, +]; $options = [ 'cacheFile' => 'build/.php-cs-fixer.cache', diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index 3729d434acba..34c4c3819f86 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -29,7 +29,10 @@ __DIR__ . '/admin/starter/builds', ]); -$overrides = []; +$overrides = [ + // for updating to coding-standard + 'modernize_strpos' => true, +]; $options = [ 'cacheFile' => 'build/.php-cs-fixer.no-header.cache', diff --git a/.php-cs-fixer.tests.php b/.php-cs-fixer.tests.php index c6b13a135a7c..e72378587e83 100644 --- a/.php-cs-fixer.tests.php +++ b/.php-cs-fixer.tests.php @@ -35,6 +35,8 @@ $overrides = [ 'void_return' => true, + // for updating to coding-standard + 'modernize_strpos' => true, ]; $options = [ diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 9f9f9b79a464..a95fd5f1c0ff 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -39,6 +39,8 @@ 'import_symbols' => false, 'leading_backslash_in_global_namespace' => true, ], + // for updating to coding-standard + 'modernize_strpos' => true, ]; $options = [ diff --git a/spark b/spark index a56fbc1bd7b6..992d044c9ee2 100755 --- a/spark +++ b/spark @@ -25,7 +25,7 @@ */ // Refuse to run when called from php-cgi -if (strpos(PHP_SAPI, 'cgi') === 0) { +if (str_starts_with(PHP_SAPI, 'cgi')) { exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n"); } diff --git a/user_guide_src/source/libraries/curlrequest/012.php b/user_guide_src/source/libraries/curlrequest/012.php index 59439c17d569..dfb37fa57bcc 100644 --- a/user_guide_src/source/libraries/curlrequest/012.php +++ b/user_guide_src/source/libraries/curlrequest/012.php @@ -1,5 +1,5 @@ header('content-type'), 'application/json') !== false) { +if (str_contains($response->header('content-type'), 'application/json')) { $body = json_decode($body); } From 6a6a0f20020583d11978c0de30b416f62fdfaef9 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Tue, 16 Apr 2024 02:03:49 +0800 Subject: [PATCH 6754/8282] feat: add the validation. --- system/Database/SQLSRV/Builder.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index 982492610d06..57a9434d6e98 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -291,10 +291,16 @@ private function getFullName(string $table): string if ($this->db->escapeChar === '"') { if (str_contains($table, '.')) { - $dbInfo = explode('.', $table); - $database = str_replace('"', '', $dbInfo[0]); - $schema = str_replace('"', '', $dbInfo[1]); - $tableName = str_replace('"', '', $dbInfo[2]); + $dbInfo = explode('.', $table); + $database = $this->db->getDatabase(); + $schema = $this->db->schema; + $table = $dbInfo[0]; + + if (isset($dbInfo[1], $dbInfo[2])) { + $database = str_replace('"', '', $dbInfo[0]); + $schema = str_replace('"', '', $dbInfo[1]); + $tableName = str_replace('"', '', $dbInfo[2]); + } return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; } From b19a785e271f3e803e52dccc3606f2a6b020afa4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 08:56:14 +0900 Subject: [PATCH 6755/8282] fix: ad hoc fix for join() with BETWEEN --- system/Database/BaseBuilder.php | 8 ++++++++ system/Database/SQLSRV/Builder.php | 7 +++++++ tests/system/Database/Builder/JoinTest.php | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 1f0807cdbbde..46d94661aca6 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -654,6 +654,7 @@ public function join(string $table, $cond, string $type = '', ?bool $escape = nu $cond = ' ON ' . $cond; } else { // Split multiple conditions + // @TODO This does not parse `BETWEEN a AND b` correctly. if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE)) { $conditions = []; $joints = $joints[0]; @@ -676,6 +677,13 @@ public function join(string $table, $cond, string $type = '', ?bool $escape = nu foreach ($conditions as $i => $condition) { $operator = $this->getOperator($condition); + // Workaround for BETWEEN + if ($operator === false) { + $cond .= $joints[$i] . $condition; + + continue; + } + $cond .= $joints[$i]; $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition; } diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index a624dced38d2..ffc72bd41d66 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -145,6 +145,13 @@ public function join(string $table, $cond, string $type = '', ?bool $escape = nu foreach ($conditions as $i => $condition) { $operator = $this->getOperator($condition); + // Workaround for BETWEEN + if ($operator === false) { + $cond .= $joints[$i] . $condition; + + continue; + } + $cond .= $joints[$i]; $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition; } diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php index 0ab74729ed7a..83c7ea4f3ab9 100644 --- a/tests/system/Database/Builder/JoinTest.php +++ b/tests/system/Database/Builder/JoinTest.php @@ -80,6 +80,25 @@ public function testJoinMultipleConditions(): void $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); } + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/8791 + */ + public function testJoinMultipleConditionsBetween(): void + { + $builder = new BaseBuilder('table1', $this->db); + + $builder->join( + 'leases', + 'units.unit_id = leases.unit_id AND CURDATE() BETWEEN lease_start_date AND lease_exp_date', + 'LEFT' + ); + + // @TODO Should be `... CURDATE() BETWEEN "lease_start_date" AND "lease_exp_date"` + $expectedSQL = 'SELECT * FROM "table1" LEFT JOIN "leases" ON "units"."unit_id" = "leases"."unit_id" AND CURDATE() BETWEEN lease_start_date AND lease_exp_date'; + + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + } + /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/3832 */ From 76593b06d9d20b6e15dd0c6357e4ae26883ac78e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 11:08:57 +0900 Subject: [PATCH 6756/8282] refactor: remove deprecated failValidationError() --- system/API/ResponseTrait.php | 12 ------------ tests/system/API/ResponseTraitTest.php | 18 ------------------ user_guide_src/source/changelogs/v4.6.0.rst | 8 ++++++++ .../source/installation/upgrade_460.rst | 7 +++++++ 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php index 01ce42860b32..7d70feab5f8c 100644 --- a/system/API/ResponseTrait.php +++ b/system/API/ResponseTrait.php @@ -224,18 +224,6 @@ protected function failNotFound(string $description = 'Not Found', ?string $code return $this->fail($description, $this->codes['resource_not_found'], $code, $message); } - /** - * Used when the data provided by the client cannot be validated. - * - * @return ResponseInterface - * - * @deprecated Use failValidationErrors instead - */ - protected function failValidationError(string $description = 'Bad Request', ?string $code = null, string $message = '') - { - return $this->fail($description, $this->codes['invalid_data'], $code, $message); - } - /** * Used when the data provided by the client cannot be validated on one or more fields. * diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index b54f3037b247..266b5c548cfd 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -447,24 +447,6 @@ public function testNotFound(): void $this->assertSame($this->formatter->format($expected), $this->response->getBody()); } - public function testValidationError(): void - { - $controller = $this->makeController(); - - $this->invoke($controller, 'failValidationError', ['Nope', 'FAT CHANCE', 'A Custom Reason']); - - $expected = [ - 'status' => 400, - 'error' => 'FAT CHANCE', - 'messages' => [ - 'error' => 'Nope', - ], - ]; - $this->assertSame('A Custom Reason', $this->response->getReasonPhrase()); - $this->assertSame(400, $this->response->getStatusCode()); - $this->assertSame($this->formatter->format($expected), $this->response->getBody()); - } - public function testValidationErrors(): void { $controller = $this->makeController(); diff --git a/user_guide_src/source/changelogs/v4.6.0.rst b/user_guide_src/source/changelogs/v4.6.0.rst index 998e5ba269d6..63e10d4b9454 100644 --- a/user_guide_src/source/changelogs/v4.6.0.rst +++ b/user_guide_src/source/changelogs/v4.6.0.rst @@ -29,6 +29,14 @@ Interface Changes Method Signature Changes ======================== +.. _v460-removed-deprecated-items: + +Removed Deprecated Items +======================== + +- **API:** The deprecated ``failValidationError()`` method in ``CodeIgniter\API\ResponseTrait`` + has been removed. Use ``failValidationErrors()`` instead. + ************ Enhancements ************ diff --git a/user_guide_src/source/installation/upgrade_460.rst b/user_guide_src/source/installation/upgrade_460.rst index 15af1aca3c4a..4344f7565b55 100644 --- a/user_guide_src/source/installation/upgrade_460.rst +++ b/user_guide_src/source/installation/upgrade_460.rst @@ -20,6 +20,13 @@ Mandatory File Changes Breaking Changes **************** +Removed Deprecated Items +======================== + +Some deprecated items have been removed. If you are still using these items, or +extending these classes, upgrade your code. +See :ref:`ChangeLog ` for details. + ********************* Breaking Enhancements ********************* From 060041e07172eed224dac38fc7666ab09b140ef3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 11:26:26 +0900 Subject: [PATCH 6757/8282] chore: vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php --- phpstan-baseline.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index cfee07815e8a..bc99f1faf04e 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -10782,42 +10782,42 @@ 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:__construct\\(\\) has parameter \\$request with no type specified\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:__construct\\(\\) has parameter \\$request with no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:__construct\\(\\) has parameter \\$response with no type specified\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:__construct\\(\\) has parameter \\$response with no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:fail\\(\\) has parameter \\$messages with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:format\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:respond\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:respondCreated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:respondDeleted\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:respondUpdated\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; @@ -10867,17 +10867,17 @@ 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:\\$format \\(\'html\'\\|\'json\'\\|\'xml\'\\|null\\) does not accept \'txt\'\\.$#', + 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:\\$format \\(\'html\'\\|\'json\'\\|\'xml\'\\|null\\) does not accept \'txt\'\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:\\$request has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:\\$request has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:639\\:\\:\\$response has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/API/ResponseTraitTest\\.php\\:621\\:\\:\\$response has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/API/ResponseTraitTest.php', ]; From e46175ee1f6a719319554ed575ee9b1d17e6ea3e Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 11:32:55 +0900 Subject: [PATCH 6758/8282] docs: update sample code --- user_guide_src/source/outgoing/api_responses/002.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/api_responses/002.php b/user_guide_src/source/outgoing/api_responses/002.php index e383ddc3c09f..6eefa7faae39 100644 --- a/user_guide_src/source/outgoing/api_responses/002.php +++ b/user_guide_src/source/outgoing/api_responses/002.php @@ -25,7 +25,7 @@ $this->failNotFound($description); // Data did not validate -$this->failValidationError($description); +$this->failValidationErrors($description); // Resource already exists $this->failResourceExists($description); From 6a29ef3656b380a30e26777e15acf18ee37106c7 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 17 Apr 2024 01:28:50 +0800 Subject: [PATCH 6759/8282] feat: Add more validation. --- system/Database/SQLSRV/Builder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index 57a9434d6e98..9f54c68a4e5e 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -290,19 +290,19 @@ private function getFullName(string $table): string } if ($this->db->escapeChar === '"') { - if (str_contains($table, '.')) { + if (str_contains($table, '.') && !str_starts_with($table, '.') && !str_ends_with($table, '.')) { $dbInfo = explode('.', $table); $database = $this->db->getDatabase(); - $schema = $this->db->schema; $table = $dbInfo[0]; if (isset($dbInfo[1], $dbInfo[2])) { $database = str_replace('"', '', $dbInfo[0]); $schema = str_replace('"', '', $dbInfo[1]); $tableName = str_replace('"', '', $dbInfo[2]); - } return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; + } + } return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias; From f7d4499d0d9e8fec06daebcb3b68cac8072ac310 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 17 Apr 2024 01:43:26 +0800 Subject: [PATCH 6760/8282] style: do cs fix. --- system/Database/SQLSRV/Builder.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index 9f54c68a4e5e..b8f6d16b8466 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -290,7 +290,7 @@ private function getFullName(string $table): string } if ($this->db->escapeChar === '"') { - if (str_contains($table, '.') && !str_starts_with($table, '.') && !str_ends_with($table, '.')) { + if (str_contains($table, '.') && ! str_starts_with($table, '.') && ! str_ends_with($table, '.')) { $dbInfo = explode('.', $table); $database = $this->db->getDatabase(); $table = $dbInfo[0]; @@ -300,9 +300,8 @@ private function getFullName(string $table): string $schema = str_replace('"', '', $dbInfo[1]); $tableName = str_replace('"', '', $dbInfo[2]); - return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; + return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; } - } return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias; From 55e0a3a3507d9537ba7a66c9c95bd596906c53f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 17 Apr 2024 09:05:10 +0900 Subject: [PATCH 6761/8282] docs: fix/add @return types --- phpstan-baseline.php | 25 ------------------------- system/Database/BaseConnection.php | 2 +- system/Database/MySQLi/Connection.php | 2 ++ system/Database/Postgre/Connection.php | 2 ++ system/Database/SQLSRV/Connection.php | 2 ++ system/Database/SQLite3/Connection.php | 2 ++ system/Test/Mock/MockConnection.php | 2 ++ 7 files changed, 11 insertions(+), 26 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index cfee07815e8a..caaad61d6e84 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -3001,11 +3001,6 @@ 'count' => 11, 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/MySQLi/Connection.php', -]; $ignoreErrors[] = [ 'message' => '#^Only booleans are allowed in &&, int given on the left side\\.$#', 'count' => 1, @@ -3391,11 +3386,6 @@ 'count' => 2, 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Connection.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Connection\\:\\:buildDSN\\(\\) has no return type specified\\.$#', 'count' => 1, @@ -3756,11 +3746,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Connection.php', -]; $ignoreErrors[] = [ 'message' => '#^PHPDoc type string of property CodeIgniter\\\\Database\\\\SQLSRV\\\\Connection\\:\\:\\$escapeChar is not the same as PHPDoc type array\\|string of overridden property CodeIgniter\\\\Database\\\\BaseConnection\\\\:\\:\\$escapeChar\\.$#', 'count' => 1, @@ -3951,11 +3936,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Connection.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Connection\\:\\:getFieldNames\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -8661,11 +8641,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_close\\(\\) should return mixed but return statement is missing\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Test/Mock/MockConnection.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Test\\\\Mock\\\\MockConnection\\:\\:_fieldData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index b597c6d6cd10..77c9bd39ef3e 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -479,7 +479,7 @@ public function close() /** * Platform dependent way method for closing the connection. * - * @return mixed + * @return void */ abstract protected function _close(); diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index c2ef98adb0b3..b25f2e1af390 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -246,6 +246,8 @@ public function reconnect() /** * Close the database connection. + * + * @return void */ protected function _close() { diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php index bce4209c64d2..126aa98bb1c2 100644 --- a/system/Database/Postgre/Connection.php +++ b/system/Database/Postgre/Connection.php @@ -146,6 +146,8 @@ public function reconnect() /** * Close the database connection. + * + * @return void */ protected function _close() { diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php index 411470d8e34c..0626a63c998b 100755 --- a/system/Database/SQLSRV/Connection.php +++ b/system/Database/SQLSRV/Connection.php @@ -173,6 +173,8 @@ public function reconnect() /** * Close the database connection. + * + * @return void */ protected function _close() { diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php index d15c64213952..945434184f33 100644 --- a/system/Database/SQLite3/Connection.php +++ b/system/Database/SQLite3/Connection.php @@ -110,6 +110,8 @@ public function reconnect() /** * Close the database connection. + * + * @return void */ protected function _close() { diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php index 83826c347c98..020d6e3dd340 100644 --- a/system/Test/Mock/MockConnection.php +++ b/system/Test/Mock/MockConnection.php @@ -220,6 +220,8 @@ protected function _foreignKeyData(string $table): array /** * Close the connection. + * + * @return void */ protected function _close() { From 97f63ff041a5659a1fecbccf88e3b5bd7a80ccc7 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 17 Apr 2024 06:54:21 +0200 Subject: [PATCH 6762/8282] docs: Fix typo in table.rst Fix typo in table.rst, clear function description. --- user_guide_src/source/outgoing/table.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst index bec15f86dbbf..0da5d1971d3d 100644 --- a/user_guide_src/source/outgoing/table.rst +++ b/user_guide_src/source/outgoing/table.rst @@ -210,7 +210,7 @@ Class Reference Lets you clear the table heading, row data and caption. If you need to show multiple tables with different data you - should to call this method after each table has been + should call this method after each table has been generated to clear the previous table information. Example From e3ada75a5b3f0615877205e77e5467eebc0b0233 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 17 Apr 2024 06:56:07 +0200 Subject: [PATCH 6763/8282] docs: Fix typo view_parser.rst Fix typo view_parser.rst. --- user_guide_src/source/outgoing/view_parser.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst index a439d907a1de..dc2a702fe000 100644 --- a/user_guide_src/source/outgoing/view_parser.rst +++ b/user_guide_src/source/outgoing/view_parser.rst @@ -495,7 +495,7 @@ You can also use closures, but these can only be defined in the config file's co .. literalinclude:: view_parser/015.php -If the callable is on its own, it is treated as a single tag, not a open/close one. It will be replaced by +If the callable is on its own, it is treated as a single tag, not an open/close one. It will be replaced by the return value from the plugin: .. literalinclude:: view_parser/016.php From 617f70cd354b13b2415f5f656c1cfac6aed0bbfc Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 17 Apr 2024 13:22:23 +0800 Subject: [PATCH 6764/8282] fix: decrease the verify amount. --- system/Database/SQLSRV/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index b8f6d16b8466..ab41c2f2b361 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -295,7 +295,7 @@ private function getFullName(string $table): string $database = $this->db->getDatabase(); $table = $dbInfo[0]; - if (isset($dbInfo[1], $dbInfo[2])) { + if (isset($dbInfo[2])) { $database = str_replace('"', '', $dbInfo[0]); $schema = str_replace('"', '', $dbInfo[1]); $tableName = str_replace('"', '', $dbInfo[2]); From cc31b09d4ed431d66cfe10af60c73053272711f0 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 17 Apr 2024 07:23:16 +0200 Subject: [PATCH 6765/8282] docs: Small change in Class Reference description in response.rst Small change in Class Reference description in response.rst. --- user_guide_src/source/outgoing/response.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 043ce61133e1..721956fbff1e 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -255,7 +255,7 @@ Class Reference .. note:: In addition to the methods listed here, this class inherits the methods from the :doc:`Message Class `. -The methods provided by the parent class that are available are: +The methods inherited from the Message Class are: * :meth:`CodeIgniter\\HTTP\\Message::body` * :meth:`CodeIgniter\\HTTP\\Message::setBody` From 1434af4a6434b5ec050ffaaadec42494231b8895 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 17 Apr 2024 15:27:15 +0800 Subject: [PATCH 6766/8282] feat: extend the code to implement the scenario without database. --- system/Database/SQLSRV/Builder.php | 13 +++++++++---- tests/system/Database/Builder/FromTest.php | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index ab41c2f2b361..f01e733f9119 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -295,10 +295,15 @@ private function getFullName(string $table): string $database = $this->db->getDatabase(); $table = $dbInfo[0]; - if (isset($dbInfo[2])) { - $database = str_replace('"', '', $dbInfo[0]); - $schema = str_replace('"', '', $dbInfo[1]); - $tableName = str_replace('"', '', $dbInfo[2]); + if (count($dbInfo) >= 2) { + if (count($dbInfo) === 3) { + $database = str_replace('"', '', $dbInfo[0]); + $schema = str_replace('"', '', $dbInfo[1]); + $tableName = str_replace('"', '', $dbInfo[2]); + } else { + $schema = str_replace('"', '', $dbInfo[0]); + $tableName = str_replace('"', '', $dbInfo[1]); + } return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; } diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index 384509155542..e003353c12f8 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -167,4 +167,18 @@ public function testConstructorWithMultipleSegmentTableWithSQLSRV(): void $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); } + + /** + * @see https://github.com/codeigniter4/CodeIgniter4/issues/8697 + */ + public function testConstructorWithMultipleSegmentTableWithoutDatabaseWithSQLSRV(): void + { + $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']); + + $builder = new SQLSRVBuilder('dbo.table', $this->db); + + $expectedSQL = 'SELECT * FROM "test"."dbo"."table"'; + + $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect())); + } } From d7dd6b4cdf0fa72aa4428287ad642847fab853ef Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Wed, 17 Apr 2024 15:29:28 +0800 Subject: [PATCH 6767/8282] feat: add the validation. --- system/Database/SQLSRV/Builder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index f01e733f9119..baa4e0406c7f 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -295,8 +295,8 @@ private function getFullName(string $table): string $database = $this->db->getDatabase(); $table = $dbInfo[0]; - if (count($dbInfo) >= 2) { - if (count($dbInfo) === 3) { + if (count($dbInfo) >= 2 && isset($dbInfo[1])) { + if (count($dbInfo) === 3 && isset($dbInfo[2])) { $database = str_replace('"', '', $dbInfo[0]); $schema = str_replace('"', '', $dbInfo[1]); $tableName = str_replace('"', '', $dbInfo[2]); From 4ac35c07f35307fe64742ed0fd2904296c8565d8 Mon Sep 17 00:00:00 2001 From: ping-yee <611077101@mail.nknu.edu.tw> Date: Thu, 18 Apr 2024 13:57:52 +0800 Subject: [PATCH 6768/8282] feat: change the condition. --- system/Database/SQLSRV/Builder.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php index baa4e0406c7f..c1b61947c90d 100755 --- a/system/Database/SQLSRV/Builder.php +++ b/system/Database/SQLSRV/Builder.php @@ -295,18 +295,16 @@ private function getFullName(string $table): string $database = $this->db->getDatabase(); $table = $dbInfo[0]; - if (count($dbInfo) >= 2 && isset($dbInfo[1])) { - if (count($dbInfo) === 3 && isset($dbInfo[2])) { - $database = str_replace('"', '', $dbInfo[0]); - $schema = str_replace('"', '', $dbInfo[1]); - $tableName = str_replace('"', '', $dbInfo[2]); - } else { - $schema = str_replace('"', '', $dbInfo[0]); - $tableName = str_replace('"', '', $dbInfo[1]); - } - - return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; + if (count($dbInfo) === 3) { + $database = str_replace('"', '', $dbInfo[0]); + $schema = str_replace('"', '', $dbInfo[1]); + $tableName = str_replace('"', '', $dbInfo[2]); + } else { + $schema = str_replace('"', '', $dbInfo[0]); + $tableName = str_replace('"', '', $dbInfo[1]); } + + return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias; } return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias; From 3a70a22b06913be7fa57598f8bb8ee9d88fca6cc Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 18 Apr 2024 16:12:10 +0200 Subject: [PATCH 6769/8282] docs: Fix typo in response.rst Fix typo in response.rst "This are" to "This is" --- user_guide_src/source/outgoing/response.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst index 043ce61133e1..8557f6d38f30 100644 --- a/user_guide_src/source/outgoing/response.rst +++ b/user_guide_src/source/outgoing/response.rst @@ -234,7 +234,7 @@ Built into the HTTP specification are tools help the client (often the web brows this can lead to a huge performance boost to your application because it will tell the client that they don't need to contact the server at all since nothing has changed. And you can't get faster than that. -This are handled through the ``Cache-Control`` and ``ETag`` headers. This guide is not the proper place for a thorough +This is handled through the ``Cache-Control`` and ``ETag`` headers. This guide is not the proper place for a thorough introduction to all of the cache headers power, but you can get a good understanding over at `Google Developers `_. From e6ef70c97b9dc5f3f3fb8bd4b7460df1291f84cb Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 19 Apr 2024 07:49:28 +0900 Subject: [PATCH 6770/8282] fix: [ErrorException] Undefined array key If a setting does not exists, ini_get_all() does not have the key. --- system/Security/CheckPhpIni.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Security/CheckPhpIni.php b/system/Security/CheckPhpIni.php index 6bbd8619c090..633c087080cf 100644 --- a/system/Security/CheckPhpIni.php +++ b/system/Security/CheckPhpIni.php @@ -142,8 +142,8 @@ public static function checkIni(): array foreach ($items as $key => $values) { $output[$key] = [ - 'global' => $ini[$key]['global_value'], - 'current' => $ini[$key]['local_value'], + 'global' => array_key_exists($key, $ini) ? $ini[$key]['global_value'] : 'disabled', + 'current' => array_key_exists($key, $ini) ? $ini[$key]['local_value'] : 'disabled', 'recommended' => $values['recommended'] ?? '', 'remark' => $values['remark'] ?? '', ]; From 4ee58090f725660d01ed8e8cd19fb27ac5c310d3 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 19 Apr 2024 12:04:20 +0900 Subject: [PATCH 6771/8282] chore: update for 4.5 --- preload.php | 22 ++++++---------------- system/Boot.php | 13 +++++++++++++ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/preload.php b/preload.php index 2fa699388270..75d86f5cf572 100644 --- a/preload.php +++ b/preload.php @@ -29,19 +29,6 @@ // Path to the front controller define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR); -/** - * See https://www.php.net/manual/en/function.str-contains.php#126277 - */ -if (! function_exists('str_contains')) { - /** - * Polyfill of str_contains() - */ - function str_contains(string $haystack, string $needle): bool - { - return empty($needle) || strpos($haystack, $needle) !== false; - } -} - class preload { /** @@ -51,6 +38,7 @@ class preload [ 'include' => __DIR__ . '/vendor/codeigniter4/framework/system', // Change this path if using manual installation 'exclude' => [ + '/system/bootstrap.php', // Not needed if you don't use them. '/system/Database/OCI8/', '/system/Database/Postgre/', @@ -77,16 +65,18 @@ public function __construct() $this->loadAutoloader(); } - private function loadAutoloader() + private function loadAutoloader(): void { $paths = new Config\Paths(); - require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php'; + require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php'; + + CodeIgniter\Boot::preload($paths); } /** * Load PHP files. */ - public function load() + public function load(): void { foreach ($this->paths as $path) { $directory = new RecursiveDirectoryIterator($path['include']); diff --git a/system/Boot.php b/system/Boot.php index 8a769bbb6866..54468a5cc192 100644 --- a/system/Boot.php +++ b/system/Boot.php @@ -122,6 +122,19 @@ public static function bootTest(Paths $paths): void static::autoloadHelpers(); } + /** + * Used by `preload.php` + */ + public static function preload(Paths $paths): void + { + static::definePathConstants($paths); + static::loadConstants(); + static::defineEnvironment(); + static::loadEnvironmentBootstrap($paths, false); + + static::loadAutoloader(); + } + /** * Load environment settings from .env files into $_SERVER and $_ENV */ From 7aec7ccff0b93261e182414281a1673374249938 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 19 Apr 2024 12:08:12 +0900 Subject: [PATCH 6772/8282] chore: add preload.php to php-cs-fixer --- .php-cs-fixer.dist.php | 1 + 1 file changed, 1 insertion(+) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 78dea1429202..521cddf17deb 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -36,6 +36,7 @@ __DIR__ . '/.php-cs-fixer.no-header.php', __DIR__ . '/.php-cs-fixer.tests.php', __DIR__ . '/.php-cs-fixer.user-guide.php', + __DIR__ . '/preload.php', __DIR__ . '/rector.php', __DIR__ . '/spark', ]); From 8d5143380a4e6bd6995dcf425b0a49592802c8b4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 19 Apr 2024 17:01:23 +0900 Subject: [PATCH 6773/8282] refactor: don't call array_key_exists() twice --- system/Security/CheckPhpIni.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Security/CheckPhpIni.php b/system/Security/CheckPhpIni.php index 633c087080cf..4cef565ad7d6 100644 --- a/system/Security/CheckPhpIni.php +++ b/system/Security/CheckPhpIni.php @@ -141,9 +141,10 @@ public static function checkIni(): array $ini = ini_get_all(); foreach ($items as $key => $values) { + $hasKeyInIni = array_key_exists($key, $ini); $output[$key] = [ - 'global' => array_key_exists($key, $ini) ? $ini[$key]['global_value'] : 'disabled', - 'current' => array_key_exists($key, $ini) ? $ini[$key]['local_value'] : 'disabled', + 'global' => $hasKeyInIni ? $ini[$key]['global_value'] : 'disabled', + 'current' => $hasKeyInIni ? $ini[$key]['local_value'] : 'disabled', 'recommended' => $values['recommended'] ?? '', 'remark' => $values['remark'] ?? '', ]; From 98f44fc159cb8eaab14b728d573cf32ab89df540 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Apr 2024 10:49:35 +0900 Subject: [PATCH 6774/8282] docs: fix page title This page is for CI3 users. In CI3 there is no HTTP Response. So it is better to be "Upgrade Output Class". --- user_guide_src/source/installation/upgrade_4xx.rst | 2 +- user_guide_src/source/installation/upgrade_responses.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst index f837180e8bfd..93340648278e 100644 --- a/user_guide_src/source/installation/upgrade_4xx.rst +++ b/user_guide_src/source/installation/upgrade_4xx.rst @@ -254,8 +254,8 @@ Upgrading Libraries upgrade_images upgrade_localization upgrade_migrations - upgrade_pagination upgrade_responses + upgrade_pagination upgrade_routing upgrade_security upgrade_sessions diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst index 26ccfc658e3f..c74f172b620c 100644 --- a/user_guide_src/source/installation/upgrade_responses.rst +++ b/user_guide_src/source/installation/upgrade_responses.rst @@ -1,5 +1,5 @@ -Upgrade HTTP Responses -###################### +Upgrade Output Class +#################### .. contents:: :local: From 8b37b839b3fcdb364eebcddeb7d25ad9750e039e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Apr 2024 10:51:05 +0900 Subject: [PATCH 6775/8282] docs: add explanation --- user_guide_src/source/installation/upgrade_responses.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst index c74f172b620c..a2d45f3e10c5 100644 --- a/user_guide_src/source/installation/upgrade_responses.rst +++ b/user_guide_src/source/installation/upgrade_responses.rst @@ -12,7 +12,8 @@ Documentations What has been changed ===================== -- The methods have been renamed +- The Output class has been changed to the Response class. +- The methods have been renamed. Upgrade Guide ============= From d6f1e88fc5eb1cf8e70a48353c31789089479911 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 21 Apr 2024 10:51:25 +0900 Subject: [PATCH 6776/8282] docs: fix typo --- user_guide_src/source/installation/upgrade_responses.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst index a2d45f3e10c5..41ce2446de5c 100644 --- a/user_guide_src/source/installation/upgrade_responses.rst +++ b/user_guide_src/source/installation/upgrade_responses.rst @@ -17,7 +17,7 @@ What has been changed Upgrade Guide ============= -1. The methods in the HTTP Responses class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on. +1. The methods in the HTTP Response class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on. 2. In the most cases you have to change ``$this->output`` to ``$this->response`` followed by the method. You can find all methods in :doc:`../outgoing/response`. Code Example From fa06a8bf0c12396d88d791a7d9f186493e20db38 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 22 Apr 2024 08:53:27 +0900 Subject: [PATCH 6777/8282] fix: incorrect Security exception message This is a server side misconfiguration, not a client error. --- system/HTTP/ResponseTrait.php | 2 +- system/Language/en/Security.php | 1 + system/Security/Exceptions/SecurityException.php | 10 ++++++++++ tests/system/HTTP/ResponseSendTest.php | 5 +---- user_guide_src/source/changelogs/v4.5.2.rst | 2 ++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index 2d4295116807..45f07d186170 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -670,7 +670,7 @@ private function dispatchCookies(): void foreach ($this->cookieStore->display() as $cookie) { if ($cookie->isSecure() && ! $request->isSecure()) { - throw SecurityException::forDisallowedAction(); + throw SecurityException::forInsecureCookie(); } $name = $cookie->getPrefixedName(); diff --git a/system/Language/en/Security.php b/system/Language/en/Security.php index 145abaab71e7..fd906e378a29 100644 --- a/system/Language/en/Security.php +++ b/system/Language/en/Security.php @@ -14,6 +14,7 @@ // Security language settings return [ 'disallowedAction' => 'The action you requested is not allowed.', + 'insecureCookie' => 'Attempted to send a secure cookie over a non-secure connection.', // @deprecated 'invalidSameSite' => 'The SameSite value must be None, Lax, Strict, or a blank string. Given: "{0}"', diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php index 16383fc25bfc..ed1d76825036 100644 --- a/system/Security/Exceptions/SecurityException.php +++ b/system/Security/Exceptions/SecurityException.php @@ -20,6 +20,7 @@ class SecurityException extends FrameworkException implements HTTPExceptionInter { /** * Throws when some specific action is not allowed. + * This is used for CSRF protection. * * @return static */ @@ -28,6 +29,15 @@ public static function forDisallowedAction() return new static(lang('Security.disallowedAction'), 403); } + /** + * Throws if a secure cookie is dispatched when the current connection is not + * secure. + */ + public static function forInsecureCookie(): static + { + return new static(lang('Security.insecureCookie')); + } + /** * Throws when the source string contains invalid UTF-8 characters. * diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php index a4cc67765d3d..6159ee1140ba 100644 --- a/tests/system/HTTP/ResponseSendTest.php +++ b/tests/system/HTTP/ResponseSendTest.php @@ -162,14 +162,11 @@ public function testRedirectResponseCookies(): void /** * Make sure secure cookies are not sent with HTTP request - * - * @ runInSeparateProcess - * @ preserveGlobalState disabled */ public function testDoNotSendUnSecureCookie(): void { $this->expectException(SecurityException::class); - $this->expectExceptionMessage('The action you requested is not allowed'); + $this->expectExceptionMessage('Attempted to send a secure cookie over a non-secure connection.'); $request = $this->createMock(IncomingRequest::class); $request->method('isSecure')->willReturn(false); diff --git a/user_guide_src/source/changelogs/v4.5.2.rst b/user_guide_src/source/changelogs/v4.5.2.rst index d578360b720a..8824d3c72b96 100644 --- a/user_guide_src/source/changelogs/v4.5.2.rst +++ b/user_guide_src/source/changelogs/v4.5.2.rst @@ -18,6 +18,8 @@ BREAKING Message Changes *************** +- Added ``Security.insecureCookie`` message. + ******* Changes ******* From 7e8ebbcda98516e91526b7749f61634b48437c14 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:02:44 +0700 Subject: [PATCH 6778/8282] docs: @param BaseBuilder.php --- system/Database/BaseBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 1f0807cdbbde..62916eeaa63b 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -2865,7 +2865,7 @@ public function deleteBatch($set = null, $constraints = null, int $batchSize = 1 * * @param string $table Protected table name * @param list $keys QBKeys - * @paramst> $values QBSet + * @param list $values QBSet */ protected function _deleteBatch(string $table, array $keys, array $values): string { From 590793e139ea326e79659319adfa5bbf7b91727e Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 19 Apr 2024 17:41:32 +0700 Subject: [PATCH 6779/8282] docs: specify phpdoc BaseBuilder --- phpstan-baseline.php | 98 +++++---------------------------- system/Database/BaseBuilder.php | 14 +++-- 2 files changed, 23 insertions(+), 89 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index caaad61d6e84..a7f3f149999b 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1791,36 +1791,11 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/BaseBuilder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_like\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Database/BaseBuilder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -2206,6 +2181,11 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/BaseBuilder.php', ]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#3 \\.\\.\\.\\$arrays of function array_map expects array, int\\|string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/BaseBuilder.php', +]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$QBFrom type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3121,21 +3101,6 @@ 'count' => 3, 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3156,6 +3121,11 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', ]; +$ignoreErrors[] = [ + 'message' => '#^Parameter \\#3 \\.\\.\\.\\$arrays of function array_map expects array, int\\|string given\\.$#', + 'count' => 1, + 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', +]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:\\$randomKeyword type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3317,27 +3287,17 @@ 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', + 'message' => '#^Parameter \\#3 \\.\\.\\.\\$arrays of function array_map expects array, int\\|string given\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', ]; @@ -3676,26 +3636,6 @@ 'count' => 9, 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_insert\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_insert\\(\\) has parameter \\$unescapedKeys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3907,17 +3847,7 @@ 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_deleteBatch\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_replace\\(\\) has parameter \\$keys with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLite3\\\\Builder\\:\\:_replace\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', + 'message' => '#^Parameter \\#3 \\.\\.\\.\\$arrays of function array_map expects array, int\\|string given\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Database/SQLite3/Builder.php', ]; diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 62916eeaa63b..4c80edc0aa39 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -2376,7 +2376,9 @@ protected function validateInsert(): bool /** * Generates a platform-specific insert string from the supplied data * - * @param string $table Protected table name + * @param string $table Protected table name + * @param list $keys QBKeys + * @param list $unescapedKeys QBSet */ protected function _insert(string $table, array $keys, array $unescapedKeys): string { @@ -2416,7 +2418,9 @@ public function replace(?array $set = null) /** * Generates a platform-specific replace string from the supplied data * - * @param string $table Protected table name + * @param string $table Protected table name + * @param list $keys QBKeys + * @param list $values QBSet */ protected function _replace(string $table, array $keys, array $values): string { @@ -2863,9 +2867,9 @@ public function deleteBatch($set = null, $constraints = null, int $batchSize = 1 * * @used-by batchExecute() * - * @param string $table Protected table name - * @param list $keys QBKeys - * @param list $values QBSet + * @param string $table Protected table name + * @param list $keys QBKeys + * @param list $values QBSet */ protected function _deleteBatch(string $table, array $keys, array $values): string { From abfb7f6a2d3ffec3d33875abce76684753b6c372 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Mon, 22 Apr 2024 09:23:24 +0700 Subject: [PATCH 6780/8282] docs: generate baseline --- phpstan-baseline.php | 20 -------------------- system/Database/BaseBuilder.php | 11 ++++++----- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index a7f3f149999b..3260e4b6f8cb 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1796,11 +1796,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/BaseBuilder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', 'count' => 1, @@ -3101,11 +3096,6 @@ 'count' => 3, 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/OCI8/Builder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\OCI8\\\\Builder\\:\\:fieldsFromQuery\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3286,11 +3276,6 @@ 'count' => 7, 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/Postgre/Builder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:replace\\(\\) has parameter \\$set with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -3636,11 +3621,6 @@ 'count' => 9, 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:_update\\(\\) has parameter \\$values with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/SQLSRV/Builder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\SQLSRV\\\\Builder\\:\\:fieldsFromQuery\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 4c80edc0aa39..d552580703ec 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -2377,8 +2377,8 @@ protected function validateInsert(): bool * Generates a platform-specific insert string from the supplied data * * @param string $table Protected table name - * @param list $keys QBKeys - * @param list $unescapedKeys QBSet + * @param list $keys Keys of QBSet + * @param list $unescapedKeys Values of QBSet */ protected function _insert(string $table, array $keys, array $unescapedKeys): string { @@ -2419,8 +2419,8 @@ public function replace(?array $set = null) * Generates a platform-specific replace string from the supplied data * * @param string $table Protected table name - * @param list $keys QBKeys - * @param list $values QBSet + * @param list $keys Keys of QBSet + * @param list $values Values of QBSet */ protected function _replace(string $table, array $keys, array $values): string { @@ -2516,7 +2516,8 @@ public function update($set = null, $where = null, ?int $limit = null): bool /** * Generates a platform-specific update string from the supplied data * - * @param string $table Protected table name + * @param string $table Protected table name + * @param array $values QBSet */ protected function _update(string $table, array $values): string { From 715dff050873b7bf1183ef24e2af0678bf22659d Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Mon, 22 Apr 2024 09:45:41 +0700 Subject: [PATCH 6781/8282] docs: _like phpdocs --- phpstan-baseline.php | 5 ----- system/Database/BaseBuilder.php | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 3260e4b6f8cb..3fdb6424df80 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1791,11 +1791,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Database/BaseBuilder.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_like\\(\\) has parameter \\$field with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Database/BaseBuilder.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:_whereIn\\(\\) has parameter \\$values with no signature specified for Closure\\.$#', 'count' => 1, diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index d552580703ec..36a6ba7d73b9 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -1090,7 +1090,7 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both * @used-by notHavingLike() * @used-by orNotHavingLike() * - * @param array|RawSql|string $field + * @param list|RawSql|string $field * * @return $this */ From d7a5a878cc4383570b50a7f11fe1f4d844778651 Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 22 Apr 2024 19:55:09 +0200 Subject: [PATCH 6782/8282] docs: Change connecting and Query Builder link names in database/examples.rst Change connecting and Query Builder link names in database/examples.rst --- user_guide_src/source/database/examples.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst index a88608e85651..f7dfc4b85891 100644 --- a/user_guide_src/source/database/examples.rst +++ b/user_guide_src/source/database/examples.rst @@ -24,7 +24,7 @@ your :doc:`configuration ` settings: Once loaded the class is ready to be used as described below. .. note:: If all your pages require database access you can connect - automatically. See the :doc:`connecting ` page for details. + automatically. See the :doc:`Connecting to a Database ` page for details. Standard Query With Multiple Results (Object Version) ===================================================== @@ -66,7 +66,7 @@ Standard Insert Query Builder Query =================== -The :doc:`Query Builder Pattern ` gives you a simplified +The :doc:`Query Builder ` gives you a simplified means of retrieving data: .. literalinclude:: examples/007.php From a53ae657b644475adb8bc869532abab71b3def1d Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 22 Apr 2024 20:07:30 +0200 Subject: [PATCH 6783/8282] docs: Change page header in database/examples.rst Change page header in database/examples.rst --- user_guide_src/source/database/examples.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst index f7dfc4b85891..43a2bdceac62 100644 --- a/user_guide_src/source/database/examples.rst +++ b/user_guide_src/source/database/examples.rst @@ -1,6 +1,6 @@ -################################## -Database Quick Start: Example Code -################################## +########################### +Quick Start: Usage Examples +########################### The following page contains example code showing how the database class is used. For complete details please read the individual pages From dde1de7ebcaa825c59cada173a16b312957a9f61 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 23 Apr 2024 11:35:48 +0900 Subject: [PATCH 6784/8282] test: add test for Model returns Entity with Casts --- tests/_support/Entity/UserWithCasts.php | 23 +++++++++++++++ .../Models/UserEntityWithCastsModel.php | 29 +++++++++++++++++++ tests/system/Models/FindModelTest.php | 19 ++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 tests/_support/Entity/UserWithCasts.php create mode 100644 tests/_support/Models/UserEntityWithCastsModel.php diff --git a/tests/_support/Entity/UserWithCasts.php b/tests/_support/Entity/UserWithCasts.php new file mode 100644 index 000000000000..cfe1981fa3fa --- /dev/null +++ b/tests/_support/Entity/UserWithCasts.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Tests\Support\Entity; + +use CodeIgniter\Entity\Entity; + +class UserWithCasts extends Entity +{ + protected $casts = [ + 'email' => 'json', + ]; +} diff --git a/tests/_support/Models/UserEntityWithCastsModel.php b/tests/_support/Models/UserEntityWithCastsModel.php new file mode 100644 index 000000000000..2ea32c88f842 --- /dev/null +++ b/tests/_support/Models/UserEntityWithCastsModel.php @@ -0,0 +1,29 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Tests\Support\Models; + +use CodeIgniter\Model; +use Tests\Support\Entity\UserWithCasts; + +class UserEntityWithCastsModel extends Model +{ + protected $table = 'user'; + protected $allowedFields = [ + 'name', + 'email', + 'country', + 'deleted_at', + ]; + protected $returnType = UserWithCasts::class; +} diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php index d27fcb791bb3..24946b4e2965 100644 --- a/tests/system/Models/FindModelTest.php +++ b/tests/system/Models/FindModelTest.php @@ -15,8 +15,10 @@ use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Exceptions\ModelException; +use Tests\Support\Entity\UserWithCasts; use Tests\Support\Models\JobModel; use Tests\Support\Models\SecondaryModel; +use Tests\Support\Models\UserEntityWithCastsModel; use Tests\Support\Models\UserModel; /** @@ -32,6 +34,23 @@ public function testFindReturnsRow(): void $this->assertSame('Musician', $this->model->find(4)->name); } + public function testFindReturnsEntityWithCasts(): void + { + $this->createModel(UserEntityWithCastsModel::class); + $this->model->builder()->truncate(); + $user = new UserWithCasts([ + 'name' => 'John Smith', + 'email' => ['foo@example.jp', 'bar@example.com'], + 'country' => 'US', + ]); + $id = $this->model->insert($user, true); + + $user = $this->model->find($id); + + $this->assertSame('John Smith', $user->name); + $this->assertSame(['foo@example.jp', 'bar@example.com'], $user->email); + } + public function testFindReturnsMultipleRows(): void { $this->createModel(JobModel::class); From c6e17476f319df179d0b18c967e7732f039abb22 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Tue, 23 Apr 2024 11:24:25 +0700 Subject: [PATCH 6785/8282] Update system/Database/BaseBuilder.php Co-authored-by: kenjis --- system/Database/BaseBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index 36a6ba7d73b9..c20f59920ff2 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -1090,7 +1090,7 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both * @used-by notHavingLike() * @used-by orNotHavingLike() * - * @param list|RawSql|string $field + * @param array|RawSql|string $field * * @return $this */ From c99d08943e5f41877d317023152e3a0059b52270 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 24 Apr 2024 06:37:02 +0200 Subject: [PATCH 6786/8282] docs: Some typos in database/configuration.rst Some typos in database/configuration.rst --- .../source/database/configuration.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 26b7515bab12..2336c2a845af 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -29,13 +29,13 @@ prototype: The name of the class property is the connection name, and can be used while connecting to specify a group name. -.. note:: The default location of the SQLite3 database is in the **writable** folder. - If you want to change the location, you must set the full path to the new folder. +.. note:: The default location of the SQLite3 database is the **writable** folder. + If you want to change the location, you must set the full path to the new folder (e.g., 'database' => '../db/database_name'). DSN --- -Some database drivers (such as Postgre, OCI8) requires a full DSN string to connect. +Some database drivers (such as Postgre, OCI8) requires a full DSN (Data Source Name) string to connect. But if you do not specify a DSN string for a driver that requires it, CodeIgniter will try to build it with the rest of the provided settings. @@ -48,7 +48,7 @@ you're using the driver's underlying native PHP extension, like this: DSN in Universal Manner ^^^^^^^^^^^^^^^^^^^^^^^ -You can also set a Data Source Name in universal manner (URL like). In that case DSNs must have this prototype: +You can also set a DSN in universal manner (URL like). In that case DSNs must have this prototype: .. literalinclude:: configuration/003.php :lines: 11-14 @@ -113,7 +113,7 @@ Configuring with .env File You can also save your configuration values within a **.env** file with the current server's database settings. You only need to enter the values that change from what is in the -default group's configuration settings. The values should be name following this format, where +default group's configuration settings. The values should follow this format, where ``default`` is the group name:: database.default.username = 'root'; @@ -137,11 +137,11 @@ and decode it in the constructor in the Config class: .. _database-config-explanation-of-values: ********************* -Explanation of Values +Description of Values ********************* ================ =========================================================================================================== - Name Config Description + Config Name Description ================ =========================================================================================================== **DSN** The DSN connect string (an all-in-one configuration sequence). **hostname** The hostname of your database server. Often this is 'localhost'. @@ -154,31 +154,31 @@ Explanation of Values **DBDriver** The database driver name. The case must match the driver name. You can set a fully qualified classname to use your custom driver. Supported drivers: ``MySQLi``, ``Postgre``, ``SQLite3``, ``SQLSRV``, and ``OCI8``. -**DBPrefix** An optional table prefix which will added to the table name when running +**DBPrefix** An optional table prefix which will be added to the table name when running :doc:`Query Builder ` queries. This permits multiple CodeIgniter installations to share one database. **pConnect** true/false (boolean) - Whether to use a persistent connection. -**DBDebug** true/false (boolean) - Whether to throw exceptions or not when database errors occur. +**DBDebug** true/false (boolean) - Whether to throw exceptions when database errors occur. **charset** The character set used in communicating with the database. **DBCollat** (``MySQLi`` only) The character collation used in communicating with the database. **swapPre** A default table prefix that should be swapped with ``DBPrefix``. This is useful for distributed applications where you might run manually written queries, and need the prefix to still be customizable by the end user. **schema** (``Postgre`` and ``SQLSRV`` only) The database schema, default value varies by driver. -**encrypt** (``MySQLi`` and ``SQLSRV`` only) Whether or not to use an encrypted connection. +**encrypt** (``MySQLi`` and ``SQLSRV`` only) Whether to use an encrypted connection. See :ref:`MySQLi encrypt ` for ``MySQLi`` settings. ``SQLSRV`` driver accepts true/false. -**compress** (``MySQLi`` only) Whether or not to use client compression. +**compress** (``MySQLi`` only) Whether to use client compression. **strictOn** (``MySQLi`` only) true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL while developing an application. **port** The database port number - Empty string ``''`` for default port (or dynamic port with ``SQLSRV``). -**foreignKeys** (``SQLite3`` only) true/false (boolean) - Whether or not to enable Foreign Key constraint. +**foreignKeys** (``SQLite3`` only) true/false (boolean) - Whether to enable Foreign Key constraint. .. important:: SQLite3 Foreign Key constraint is disabled by default. See `SQLite documentation `_. To enforce Foreign Key constraint, set this config item to true. **busyTimeout** (``SQLite3`` only) milliseconds (int) - Sleeps for a specified amount of time when a table is locked. -**numberNative** (``MySQLi`` only) true/false (boolean) - Whether or not to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE. +**numberNative** (``MySQLi`` only) true/false (boolean) - Whether to enable MYSQLI_OPT_INT_AND_FLOAT_NATIVE. **dateFormat** The default date/time formats as PHP's `DateTime format`_. * ``date`` - date format * ``datetime`` - date and time format @@ -225,4 +225,4 @@ MySQLi driver accepts an array with the following options: * ``ssl_ca`` - Path to the certificate authority file * ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format * ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``) -* ``ssl_verify`` - true/false; Whether to verify the server certificate or not +* ``ssl_verify`` - true/false (boolean) - Whether to verify the server certificate or not From 9333516d428d01bfb8a0c812b05d63bd541f12bc Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 25 Apr 2024 07:44:01 +0200 Subject: [PATCH 6787/8282] docs: Change path for SQLite3 sample in configuration.rst Change path for SQLite3 sample in configuration.rst --- user_guide_src/source/database/configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 2336c2a845af..86155dea0803 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -30,7 +30,7 @@ The name of the class property is the connection name, and can be used while connecting to specify a group name. .. note:: The default location of the SQLite3 database is the **writable** folder. - If you want to change the location, you must set the full path to the new folder (e.g., 'database' => '../db/database_name'). + If you want to change the location, you must set the full path to the new folder (e.g., 'database' => WRITEPATH . 'db/database_name.db'). DSN --- From 8427340e5344c20c2bd6ef0584030f6e69f31457 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 25 Apr 2024 16:49:12 +0900 Subject: [PATCH 6788/8282] test: add @var for PHPStan ------ ----------------------------------------------------- Line tests/system/Models/FindModelTest.php ------ ----------------------------------------------------- 50 Cannot access property $name on array. 51 Cannot access property $email on array. ------ ----------------------------------------------------- --- tests/system/Models/FindModelTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php index 24946b4e2965..b0b835bc1067 100644 --- a/tests/system/Models/FindModelTest.php +++ b/tests/system/Models/FindModelTest.php @@ -45,6 +45,7 @@ public function testFindReturnsEntityWithCasts(): void ]); $id = $this->model->insert($user, true); + /** @var UserWithCasts $user */ $user = $this->model->find($id); $this->assertSame('John Smith', $user->name); From 84fa8f0e4b3c0774b343d05e83e357140d22de42 Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 25 Apr 2024 17:10:22 +0200 Subject: [PATCH 6789/8282] docs: Some typo in database/query_builder.rst Some typo in database/query_builder.rst --- user_guide_src/source/database/query_builder.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 5dac7926f7a8..ba5177093595 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -88,7 +88,7 @@ $query, which can be used to show the results: .. literalinclude:: query_builder/004.php -Please visit the :doc:`getResult*() method ` page for a full +Please visit the :doc:`getResult() method ` page for a full discussion regarding result generation. $builder->getCompiledSelect() @@ -101,14 +101,14 @@ Example: .. literalinclude:: query_builder/005.php -The first parameter enables you to set whether or not the query builder query +The parameter in the first query (false) enables you to set whether or not the query builder will be reset (by default it will be reset, just like when using ``$builder->get()``): .. literalinclude:: query_builder/006.php The key thing to notice in the above example is that the second query did not utilize ``limit(10, 20)`` but the generated SQL query has ``LIMIT 20, 10``. -The reason for this outcome is because the first parameter is set to ``false``. +The reason for this outcome is because the parameter in the first query is set to ``false``, ``limit(10, 20)`` remained in the second query. $builder->getWhere() -------------------- @@ -169,7 +169,7 @@ $builder->selectMin() --------------------- Writes a **SELECT MIN(field)** portion for your query. As with -``selectMax()``, You can optionally include a second parameter to rename +``selectMax()``, you can optionally include a second parameter to rename the resulting field. .. literalinclude:: query_builder/011.php @@ -178,7 +178,7 @@ $builder->selectAvg() --------------------- Writes a **SELECT AVG(field)** portion for your query. As with -``selectMax()``, You can optionally include a second parameter to rename +``selectMax()``, you can optionally include a second parameter to rename the resulting field. .. literalinclude:: query_builder/012.php @@ -187,7 +187,7 @@ $builder->selectSum() --------------------- Writes a **SELECT SUM(field)** portion for your query. As with -``selectMax()``, You can optionally include a second parameter to rename +``selectMax()``, you can optionally include a second parameter to rename the resulting field. .. literalinclude:: query_builder/013.php @@ -196,7 +196,7 @@ $builder->selectCount() ----------------------- Writes a **SELECT COUNT(field)** portion for your query. As with -``selectMax()``, You can optionally include a second parameter to rename +``selectMax()``, you can optionally include a second parameter to rename the resulting field. .. note:: This method is particularly helpful when used with ``groupBy()``. For From 73de4806aa48ab4be531f34f71cfb9932fbade46 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 26 Apr 2024 08:48:19 +0700 Subject: [PATCH 6790/8282] docs: fix Command --- system/CLI/GeneratorTrait.php | 7 ++++++- system/Commands/Encryption/GenerateKey.php | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index 5640a7ae1ac8..7505e3395d26 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -103,6 +103,8 @@ trait GeneratorTrait /** * Execute the command. * + * @param array $params + * * @deprecated use generateClass() instead */ protected function execute(array $params): void @@ -112,6 +114,8 @@ protected function execute(array $params): void /** * Generates a class file from an existing template. + * + * @param array $params */ protected function generateClass(array $params): void { @@ -134,7 +138,8 @@ protected function generateClass(array $params): void /** * Generate a view file from an existing template. * - * @param string $view namespaced view name that is generated + * @param string $view namespaced view name that is generated + * @param array $params */ protected function generateView(string $view, array $params): void { diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php index 820ec48137c9..21a582a06725 100644 --- a/system/Commands/Encryption/GenerateKey.php +++ b/system/Commands/Encryption/GenerateKey.php @@ -124,6 +124,8 @@ protected function generateRandomKey(string $prefix, int $length): string /** * Sets the new encryption key in your .env file. + * + * @param array $params */ protected function setNewEncryptionKey(string $key, array $params): bool { @@ -139,6 +141,8 @@ protected function setNewEncryptionKey(string $key, array $params): bool /** * Checks whether to overwrite existing encryption key. + * + * @param array $params */ protected function confirmOverwrite(array $params): bool { From 7532ae17342e605929a9396c9b8ccf5f42e6dfd7 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 26 Apr 2024 09:20:41 +0700 Subject: [PATCH 6791/8282] run: generate phpstan-baseline.php --- phpstan-baseline.php | 220 ------------------------------------------- 1 file changed, 220 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 3fdb6424df80..d8f96c646890 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -706,31 +706,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Encryption\\\\GenerateKey\\:\\:confirmOverwrite\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Encryption\\\\GenerateKey\\:\\:setNewEncryptionKey\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -756,21 +731,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -796,21 +756,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -836,21 +781,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -876,21 +806,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -916,21 +831,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -956,21 +856,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -996,21 +881,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -1036,21 +906,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -1076,21 +931,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -1116,21 +956,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -1156,21 +981,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9741,21 +9551,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Cells/StarterCell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; $ignoreErrors[] = [ 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9791,21 +9586,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Commands/ParamsReveal.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:execute\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:generateClass\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:generateView\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; $ignoreErrors[] = [ 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, From 3e4b23bcff77fbeef6ad7479b9add983c380c968 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 26 Apr 2024 09:54:54 +0700 Subject: [PATCH 6792/8282] docs: fix Commands --- phpstan-baseline.php | 210 ---------------------------------- system/CLI/GeneratorTrait.php | 5 +- 2 files changed, 4 insertions(+), 211 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index d8f96c646890..bff02e1a156e 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -706,21 +706,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -731,21 +716,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -756,21 +726,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -781,21 +736,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -806,21 +746,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -831,21 +756,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -856,21 +766,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -881,21 +776,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -906,21 +786,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -931,21 +796,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -956,21 +806,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -981,21 +816,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9551,21 +9371,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Cells/StarterCell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; $ignoreErrors[] = [ 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9586,21 +9391,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Commands/ParamsReveal.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:parseTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:parseTemplate\\(\\) has parameter \\$replace with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:parseTemplate\\(\\) has parameter \\$search with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; $ignoreErrors[] = [ 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', 'count' => 1, diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index 7505e3395d26..627cea4ee613 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -357,7 +357,10 @@ protected function renderTemplate(array $data = []): string /** * Performs pseudo-variables contained within view file. * - * @param string $class namespaced classname or namespaced view. + * @param string $class namespaced classname or namespaced view. + * @param list $search + * @param list $replace + * @param array $data * * @return string generated file content */ From 76d11deca011ef346b75959f3dc76c70ce2a0420 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 26 Apr 2024 09:58:10 +0700 Subject: [PATCH 6793/8282] docs: fix Commands --- phpstan-baseline.php | 70 ----------------------------------- system/CLI/GeneratorTrait.php | 2 + 2 files changed, 2 insertions(+), 70 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index bff02e1a156e..053f659cb1d4 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -706,121 +706,61 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9371,11 +9311,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Cells/StarterCell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; $ignoreErrors[] = [ 'message' => '#^Property Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9391,11 +9326,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Commands/ParamsReveal.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:renderTemplate\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; $ignoreErrors[] = [ 'message' => '#^Property Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:\\$params type has no value type specified in iterable type array\\.$#', 'count' => 1, diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index 627cea4ee613..ae0b79816907 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -336,6 +336,8 @@ private function normalizeInputClassName(): string /** * Gets the generator view as defined in the `Config\Generators::$views`, * with fallback to `$template` when the defined view does not exist. + * + * @param array $data */ protected function renderTemplate(array $data = []): string { From b5ec948e0cfe24668afe782bc752d6e7fa9fffda Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 26 Apr 2024 10:14:06 +0700 Subject: [PATCH 6794/8282] docs: fix Commands --- phpstan-baseline.php | 70 ----------------------------------- system/CLI/GeneratorTrait.php | 2 +- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 053f659cb1d4..1959aea9685c 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -706,66 +706,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Commands/Encryption/GenerateKey.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CellGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CellGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\CommandGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/CommandGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ConfigGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ConfigGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ControllerGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ControllerGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\EntityGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/EntityGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\FilterGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/FilterGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\MigrationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/MigrationGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ModelGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ScaffoldGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ScaffoldGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\SeederGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/SeederGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\TestGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/TestGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Commands\\\\Generators\\\\ValidationGenerator\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Commands/Generators/ValidationGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\Commands\\\\ListCommands\\:\\:listFull\\(\\) has no return type specified\\.$#', 'count' => 1, @@ -9311,11 +9251,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Cells/StarterCell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property Tests\\\\Support\\\\Commands\\\\LanguageCommand\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/LanguageCommand.php', -]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 1, @@ -9326,11 +9261,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/_support/Commands/ParamsReveal.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property Tests\\\\Support\\\\Commands\\\\Unsuffixable\\:\\:\\$params type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/_support/Commands/Unsuffixable.php', -]; $ignoreErrors[] = [ 'message' => '#^Method Tests\\\\Support\\\\Config\\\\BadRegistrar\\:\\:RegistrarConfig\\(\\) has no return type specified\\.$#', 'count' => 1, diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index ae0b79816907..759fe0e84ae3 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -96,7 +96,7 @@ trait GeneratorTrait * * @internal * - * @var array + * @var array */ private $params = []; From e49aa37ac7d500a36da90f38ca25a8c297686c0a Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 07:23:08 +0200 Subject: [PATCH 6795/8282] docs: Added getCompiledSelect method parameter's default value in query_builder.rst Added getCompiledSelect method parameter's default value explanation in query_builder.rst --- user_guide_src/source/database/query_builder.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index ba5177093595..434392a74b22 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -101,8 +101,8 @@ Example: .. literalinclude:: query_builder/005.php -The parameter in the first query (false) enables you to set whether or not the query builder -will be reset (by default it will be reset, just like when using ``$builder->get()``): +The parameter (false) in the first query below enables you to set whether or not the query builder +will be reset (because the default value of the parameter is true, ``getCompiledSelect(bool $reset = true)``, by default it will be reset just like when using ``$builder->get()``): .. literalinclude:: query_builder/006.php From 6abf095cf86f4f5961bb8ef789cf5d06a076d7ee Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 08:02:56 +0200 Subject: [PATCH 6796/8282] docs: Added link to getResult() method in results.rst Added link to getResult() method in results.rst --- user_guide_src/source/database/results.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index a5d490a81a20..93e2bef67018 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -12,6 +12,8 @@ There are several ways to generate query results: Result Arrays ************* +.. _getresult: + getResult() =========== From 28d9a43b93a96231b82501eb5364dc7ca0f94ba9 Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 08:08:03 +0200 Subject: [PATCH 6797/8282] docs: Update link to getResult() method in query_builder.rst Update link to getResult() method in query_builder.rst --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 434392a74b22..9be16e2fba82 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -88,7 +88,7 @@ $query, which can be used to show the results: .. literalinclude:: query_builder/004.php -Please visit the :doc:`getResult() method ` page for a full +Please visit the :doc:`getResult() method ` method for a full discussion regarding result generation. $builder->getCompiledSelect() From 9a05a1625dd46e80e6bf3e763ead8eee2435a67c Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 11:18:40 +0200 Subject: [PATCH 6798/8282] docs: Correct getresult link in query_builder.rst Correct getresult link in query_builder.rst --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 9be16e2fba82..682833bff0bd 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -88,7 +88,7 @@ $query, which can be used to show the results: .. literalinclude:: query_builder/004.php -Please visit the :doc:`getResult() method ` method for a full +Please visit the :doc:`getResult() method ` method for a full discussion regarding result generation. $builder->getCompiledSelect() From 5d09e424cdaec3f2fd3a43fdb4f886f363ceabd6 Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 11:53:46 +0200 Subject: [PATCH 6799/8282] docs: Change Query Helper Functions to Methods in database/index.rst Change Query Helper Functions to Methods in database/index.rst --- user_guide_src/source/database/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index 0862ec0f4125..29920f0c9756 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -14,7 +14,7 @@ patterns. The database functions offer clear, simple syntax. Connecting to a Database Running Queries Generating Query Results - Query Helper Functions + Query Helper Methods Query Builder Class Transactions Getting MetaData From 3529d62bc0f976196b92c8905d02495042e9b94c Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 11:55:57 +0200 Subject: [PATCH 6800/8282] docs: Change backwards to backward for consistency in database/results.rst Change backwards to backward for consistency in database/results.rst --- user_guide_src/source/database/results.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst index 93e2bef67018..85e57c3be70e 100644 --- a/user_guide_src/source/database/results.rst +++ b/user_guide_src/source/database/results.rst @@ -95,7 +95,7 @@ digit in the first parameter: .. literalinclude:: results/009.php -In addition, you can walk forward/backwards/first/last through your +In addition, you can walk forward/backward/first/last through your results using these variations: | ``$row = $query->getFirstRow()`` From 1fc8af97de6eb4bf9dad0bdf14d238245974205b Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 26 Apr 2024 11:58:06 +0200 Subject: [PATCH 6801/8282] docs: Delete unnecessary "Example:" in database/helpers.rst Delete unnecessary "Example:" in database/helpers.rst --- user_guide_src/source/database/helpers.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst index 0d640f6422e1..0542057379b1 100644 --- a/user_guide_src/source/database/helpers.rst +++ b/user_guide_src/source/database/helpers.rst @@ -42,7 +42,6 @@ $db->countAll() Permits you to determine the number of rows in a particular table. Submit the table name in the first parameter. This is part of Query Builder. -Example: .. literalinclude:: helpers/001.php @@ -51,7 +50,6 @@ $db->countAllResults() Permits you to determine the number of rows in a particular result set. Submit the table name in the first parameter. This is part of Query Builder. -Example: .. literalinclude:: helpers/002.php From 213fd504ef3b0636fb9d052f817fcdf9bff6e863 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Apr 2024 10:43:45 +0900 Subject: [PATCH 6802/8282] chore: update Kint to 5.1.1 --- system/ThirdParty/Kint/Parser/FsPathPlugin.php | 10 ++++++++-- system/ThirdParty/Kint/Parser/MysqliPlugin.php | 3 ++- system/ThirdParty/Kint/Zval/BlobValue.php | 4 +++- .../Zval/Representation/SplFileInfoRepresentation.php | 2 +- system/ThirdParty/Kint/init.php | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/system/ThirdParty/Kint/Parser/FsPathPlugin.php b/system/ThirdParty/Kint/Parser/FsPathPlugin.php index 7ec49de109cc..1a98c6dcd134 100644 --- a/system/ThirdParty/Kint/Parser/FsPathPlugin.php +++ b/system/ThirdParty/Kint/Parser/FsPathPlugin.php @@ -30,6 +30,7 @@ use Kint\Zval\Representation\SplFileInfoRepresentation; use Kint\Zval\Value; use SplFileInfo; +use TypeError; class FsPathPlugin extends AbstractPlugin { @@ -59,8 +60,13 @@ public function parse(&$var, Value &$o, int $trigger): void return; } - if (!@\file_exists($var)) { - return; + try { + if (!@\file_exists($var)) { + return; + } + } catch (TypeError $e) {// @codeCoverageIgnore + // Only possible in PHP 7 + return; // @codeCoverageIgnore } if (\in_array($var, self::$blacklist, true)) { diff --git a/system/ThirdParty/Kint/Parser/MysqliPlugin.php b/system/ThirdParty/Kint/Parser/MysqliPlugin.php index 90a4abd6b511..22a23a901ccb 100644 --- a/system/ThirdParty/Kint/Parser/MysqliPlugin.php +++ b/system/ThirdParty/Kint/Parser/MysqliPlugin.php @@ -105,7 +105,8 @@ public function parse(&$var, Value &$o, int $trigger): void foreach ($o->value->contents as $key => $obj) { if (isset($this->connected_readable[$obj->name])) { if (!$connected) { - continue; + // No failed connections after PHP 8.1 + continue; // @codeCoverageIgnore } } elseif (isset($this->empty_readable[$obj->name])) { // No failed connections after PHP 8.1 diff --git a/system/ThirdParty/Kint/Zval/BlobValue.php b/system/ThirdParty/Kint/Zval/BlobValue.php index 5e9f129d1181..66f60fdb9043 100644 --- a/system/ThirdParty/Kint/Zval/BlobValue.php +++ b/system/ThirdParty/Kint/Zval/BlobValue.php @@ -182,7 +182,9 @@ public static function detectEncoding(string $string) if (\function_exists('iconv')) { foreach (self::$legacy_encodings as $encoding) { // Iconv detection works by triggering - // "Detected an illegal character in input string" warnings + // "Detected an illegal character in input string" notices + // This notice does not become a TypeError with strict_types + // so we don't have to wrap this in a try catch if (@\iconv($encoding, $encoding, $string) === $string) { return $encoding; } diff --git a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php index 6424ee6a9175..dad9d04cdc9e 100644 --- a/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php +++ b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php @@ -76,7 +76,7 @@ public function __construct(SplFileInfo $fileInfo) } } catch (RuntimeException $e) { if (false === \strpos($e->getMessage(), ' open_basedir ')) { - throw $e; + throw $e; // @codeCoverageIgnore } } diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php index 039489ab43ad..d682d9a9dc36 100644 --- a/system/ThirdParty/Kint/init.php +++ b/system/ThirdParty/Kint/init.php @@ -51,7 +51,7 @@ if (false !== \ini_get('xdebug.file_link_format')) { Kint::$file_link_format = \ini_get('xdebug.file_link_format'); } -if (isset($_SERVER['DOCUMENT_ROOT'])) { +if (isset($_SERVER['DOCUMENT_ROOT']) && false === \strpos($_SERVER['DOCUMENT_ROOT'], "\0")) { Kint::$app_root_dirs = [ $_SERVER['DOCUMENT_ROOT'] => '', ]; From 37d68708e8ee3f237e197a8d89988bbf1ca69762 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 27 Apr 2024 09:35:49 +0200 Subject: [PATCH 6803/8282] docs: Small typos in database/metadata.rst Fix some small typos in database/metadata.rst --- user_guide_src/source/database/metadata.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst index 85dcdc0b1d33..03bf91230e0e 100644 --- a/user_guide_src/source/database/metadata.rst +++ b/user_guide_src/source/database/metadata.rst @@ -1,6 +1,6 @@ -################# -Database Metadata -################# +################ +Getting Metadata +################ .. contents:: :local: @@ -71,9 +71,7 @@ performing an action. Returns a boolean true/false. Usage example: .. literalinclude:: metadata/005.php -.. note:: Replace *field_name* with the name of the column you are looking - for, and replace *table_name* with the name of the table you are - looking for. +.. note:: Replace *field_name* and *table_name* with the column name and the table name you are looking for. Retrieve Field Metadata ======================= @@ -88,7 +86,7 @@ Returns an array of objects containing field information. Sometimes it's helpful to gather the field names or other metadata, like the column type, max length, etc. -.. note:: Not all databases provide meta-data. +.. note:: Not all databases provide metadata. Usage example: From c12915ee0f43c3bd1194824f8cc45e9e7acac44a Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 27 Apr 2024 11:02:21 +0200 Subject: [PATCH 6804/8282] docs: Fix getresult link in database/query_builder.rst Fix getresult link in database/query_builder.rst --- user_guide_src/source/database/query_builder.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst index 682833bff0bd..171c354d1120 100755 --- a/user_guide_src/source/database/query_builder.rst +++ b/user_guide_src/source/database/query_builder.rst @@ -88,7 +88,7 @@ $query, which can be used to show the results: .. literalinclude:: query_builder/004.php -Please visit the :doc:`getResult() method ` method for a full +Please visit the :ref:`getResult() ` method for a full discussion regarding result generation. $builder->getCompiledSelect() From 996893f2c159f4adceaa3bd556b89d08a37c4b29 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Sat, 27 Apr 2024 16:02:41 +0700 Subject: [PATCH 6805/8282] Update system/CLI/GeneratorTrait.php Co-authored-by: kenjis --- system/CLI/GeneratorTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index 759fe0e84ae3..258f12379dd6 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -337,7 +337,7 @@ private function normalizeInputClassName(): string * Gets the generator view as defined in the `Config\Generators::$views`, * with fallback to `$template` when the defined view does not exist. * - * @param array $data + * @param array $data */ protected function renderTemplate(array $data = []): string { From c61c9f8cb8d74f63ca5c46255a1b36d09272b1fa Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 27 Apr 2024 11:36:19 +0200 Subject: [PATCH 6806/8282] docs: Change page header in database/utilities.rst Change page header to be consistent with the menu in database/utilities.rst --- user_guide_src/source/database/utilities.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst index c8c11e51d864..00c04ebaddc9 100644 --- a/user_guide_src/source/database/utilities.rst +++ b/user_guide_src/source/database/utilities.rst @@ -1,6 +1,6 @@ -###################### -Database Utility Class -###################### +################## +Database Utilities +################## The Database Utility Class contains methods that help you manage your database. From c4a58da38fda4c7ace80a7e7f23d9c02ff11393b Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 27 Apr 2024 11:42:08 +0200 Subject: [PATCH 6807/8282] docs: Change MetaData to Metadata in database/metadata.rst Change MetaData to Metadata in database/metadata.rst --- user_guide_src/source/database/metadata.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst index 03bf91230e0e..7674c401b793 100644 --- a/user_guide_src/source/database/metadata.rst +++ b/user_guide_src/source/database/metadata.rst @@ -7,7 +7,7 @@ Getting Metadata :depth: 2 ************** -Table MetaData +Table Metadata ************** These functions let you fetch table information. @@ -39,7 +39,7 @@ running an operation on it. Returns a boolean true/false. Usage example: .. note:: Replace *table_name* with the name of the table you are looking for. ************** -Field MetaData +Field Metadata ************** List the Fields in a Table From 08d8a1aa96717de871d9a7809d7e03a65e40f56f Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 27 Apr 2024 11:44:05 +0200 Subject: [PATCH 6808/8282] docs: Change MetaData to Metadata in database/index.rst Change MetaData to Metadata in database/index.rst --- user_guide_src/source/database/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index 0862ec0f4125..e9ab69ad17cb 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -14,10 +14,10 @@ patterns. The database functions offer clear, simple syntax. Connecting to a Database Running Queries Generating Query Results - Query Helper Functions + Query Helper Methods Query Builder Class Transactions - Getting MetaData + Getting Metadata Custom Function Calls Database Events Database Utilities From d1631d64bf3a4e38102bf35495f67b7e57606298 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Apr 2024 11:18:23 +0900 Subject: [PATCH 6809/8282] docs: add/update description for lang() --- user_guide_src/source/general/common_functions.rst | 10 ++++++---- user_guide_src/source/outgoing/localization.rst | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 05e43026675d..61b92a99df92 100755 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -106,13 +106,15 @@ Service Accessors .. php:function:: lang($line[, $args[, $locale]]) - :param string $line: The line of text to retrieve + :param string $line: The language filename and the key of the text to retrieve. :param array $args: An array of data to substitute for placeholders. - :param string $locale: Specify a different locale to be used instead of default one. + :param string $locale: Specify a different locale to be used instead of the current locale. + :returns: The text in the language file + :rtype: list|string - Retrieves a locale-specific file based on an alias string. + Retrieves text from the language files. - For more information, see the :doc:`Localization ` page. + For more information, see the :ref:`language-localization`. .. php:function:: model($name[, $getShared = true[, &$conn = null]]) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index 50fb7053beb2..c03ddd49b1a5 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -130,6 +130,8 @@ Alternatively, you can use the :doc:`Services class ` to ret .. literalinclude:: localization/006.php +.. _language-localization: + ********************* Language Localization ********************* From 0153a896566db38f06d31dfa378d2cd1236bf548 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Apr 2024 11:18:49 +0900 Subject: [PATCH 6810/8282] docs: add text decration --- user_guide_src/source/outgoing/localization.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst index c03ddd49b1a5..f9f7e096b6e9 100644 --- a/user_guide_src/source/outgoing/localization.rst +++ b/user_guide_src/source/outgoing/localization.rst @@ -159,8 +159,10 @@ Basic Usage =========== You can use the :php:func:`lang()` helper function to retrieve text from any of the language files, by passing the -filename and the language key as the first parameter, separated by a period (.). For example, to load the -``errorEmailMissing`` string from the **Errors.php** language file, you would do the following: +filename and the language key as the first parameter, separated by a period (``.``). + +For example, to load the ``errorEmailMissing`` string from the **Errors.php** +language file, you would do the following: .. literalinclude:: localization/010.php @@ -169,7 +171,7 @@ For nested definition, you would do the following: .. literalinclude:: localization/011.php If the requested language key doesn't exist in the file for the current locale, the string will be passed -back, unchanged. In this example, it would return 'Errors.errorEmailMissing' or 'Errors.nested.error.message' if it didn't exist. +back, unchanged. In this example, it would return ``Errors.errorEmailMissing`` or ``Errors.nested.error.message`` if it didn't exist. Replacing Parameters -------------------- From e98c5e60f2cacbfec15d133de89a4bb86a4b44f9 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 28 Apr 2024 11:41:21 +0200 Subject: [PATCH 6811/8282] docs: Update menu user_guide_src/source/database/index.rst Co-authored-by: kenjis --- user_guide_src/source/database/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index e9ab69ad17cb..e24066e8dc3e 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -14,7 +14,7 @@ patterns. The database functions offer clear, simple syntax. Connecting to a Database Running Queries Generating Query Results - Query Helper Methods + helpers Query Builder Class Transactions Getting Metadata From 6a79a09702bf841d7c28274a9d3bb763b149d423 Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 29 Apr 2024 14:12:14 +0200 Subject: [PATCH 6812/8282] docs: Fix typo in models/model.rst Fix typo in models/model.rst --- user_guide_src/source/models/model.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index 02c97a1b48a7..edc4139a4d42 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -34,7 +34,7 @@ See :ref:`factories-loading-class` for details on the first parameter. CodeIgniter's Model ******************* -CodeIgniter does provide a model class that provides a few nice features, including: +CodeIgniter does provide a model class that has a few nice features, including: - automatic database connection - basic CRUD methods @@ -580,7 +580,7 @@ automatically, based on whether it finds an array key matching the **primary key The save method also can make working with custom class result objects much simpler by recognizing a non-simple object and grabbing its public and protected values into an array, which is then passed to the appropriate insert or update method. This allows you to work with Entity classes in a very clean way. Entity classes are -simple classes that represent a single instance of an object type, like a user, a blog post, job, etc. This +simple classes that represent a single instance of an object type, like a user, a blog post, a job, etc. This class is responsible for maintaining the business logic surrounding the object itself, like formatting elements in a certain way, etc. They shouldn't have any idea about how they are saved to the database. At their simplest, they might look like this: From 75bd0ac69c7a39d0cbd330a54e994f5d2a3c286f Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 29 Apr 2024 16:51:41 +0200 Subject: [PATCH 6813/8282] docs: Fix typo in models/entities.rst Fix typo in models/entities.rst --- user_guide_src/source/models/entities.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst index bcc0c2ec57d0..ce5313f4115d 100644 --- a/user_guide_src/source/models/entities.rst +++ b/user_guide_src/source/models/entities.rst @@ -258,8 +258,8 @@ Array/Json Casting Array/Json casting is especially useful with fields that store serialized arrays or json in them. When cast as: * an **array**, they will automatically be unserialized, -* a **json**, they will automatically be set as an value of ``json_decode($value, false)``, -* a **json-array**, they will automatically be set as an value of ``json_decode($value, true)``, +* a **json**, they will automatically be set as a value of ``json_decode($value, false)``, +* a **json-array**, they will automatically be set as a value of ``json_decode($value, true)``, when you set the property's value. Unlike the rest of the data types that you can cast properties into, the: From f47396a87ae354a727854c9c0bca8df592be38f1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 30 Apr 2024 11:37:56 +0900 Subject: [PATCH 6814/8282] refactor!: remove depreacted ResponseInterface::getReason() --- system/HTTP/Response.php | 15 --------------- system/HTTP/ResponseInterface.php | 10 ---------- user_guide_src/source/changelogs/v4.6.0.rst | 2 ++ 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php index a19fbb5fee14..89ba119b11af 100644 --- a/system/HTTP/Response.php +++ b/system/HTTP/Response.php @@ -205,21 +205,6 @@ public function getStatusCode(): int return $this->statusCode; } - /** - * Gets the response response phrase associated with the status code. - * - * @see http://tools.ietf.org/html/rfc7231#section-6 - * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml - * - * @deprecated Use getReasonPhrase() - * - * @codeCoverageIgnore - */ - public function getReason(): string - { - return $this->getReasonPhrase(); - } - /** * Gets the response reason phrase associated with the status code. * diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index 827eea44e298..68ec5c3fce7f 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -135,16 +135,6 @@ public function getStatusCode(): int; */ public function setStatusCode(int $code, string $reason = ''); - /** - * Gets the response phrase associated with the status code. - * - * @see http://tools.ietf.org/html/rfc7231#section-6 - * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml - * - * @deprecated Use getReasonPhrase() - */ - public function getReason(): string; - /** * Gets the response reason phrase associated with the status code. * diff --git a/user_guide_src/source/changelogs/v4.6.0.rst b/user_guide_src/source/changelogs/v4.6.0.rst index 63e10d4b9454..afc7d89d9d51 100644 --- a/user_guide_src/source/changelogs/v4.6.0.rst +++ b/user_guide_src/source/changelogs/v4.6.0.rst @@ -36,6 +36,8 @@ Removed Deprecated Items - **API:** The deprecated ``failValidationError()`` method in ``CodeIgniter\API\ResponseTrait`` has been removed. Use ``failValidationErrors()`` instead. +- **HTTP:** The deprecated ``getReason()`` method in ``CodeIgniter\HTTP\Response`` + and ``ResponseInterface`` has been removed. Use ``getReasonPhrase()`` instead. ************ Enhancements From 694aa97ebbc0bb0b0cc699beb426d09b1dbcc7ed Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 30 Apr 2024 11:49:03 +0900 Subject: [PATCH 6815/8282] docs: update deprecated method in sample code --- user_guide_src/source/libraries/curlrequest/009.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/curlrequest/009.php b/user_guide_src/source/libraries/curlrequest/009.php index 49eaa5ec7562..934213024009 100644 --- a/user_guide_src/source/libraries/curlrequest/009.php +++ b/user_guide_src/source/libraries/curlrequest/009.php @@ -1,4 +1,4 @@ getStatusCode(); // 200 -$reason = $response->getReason(); // OK +$code = $response->getStatusCode(); // 200 +$reason = $response->getReasonPhrase(); // OK From b4fe6d26617b2da7f58fb741fe58c83c83a466ea Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 30 Apr 2024 06:38:24 +0200 Subject: [PATCH 6816/8282] docs: Solve conflict in database/index.rst Solve conflict in database/index.rst --- user_guide_src/source/database/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst index e24066e8dc3e..e9ab69ad17cb 100644 --- a/user_guide_src/source/database/index.rst +++ b/user_guide_src/source/database/index.rst @@ -14,7 +14,7 @@ patterns. The database functions offer clear, simple syntax. Connecting to a Database Running Queries Generating Query Results - helpers + Query Helper Methods Query Builder Class Transactions Getting Metadata From 46ea07b4fb6519ac6a32870bef1cc99cc944562a Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 30 Apr 2024 11:13:47 +0200 Subject: [PATCH 6817/8282] docs: Fix typo in dbmgmt/forge.rst Fix typo in dbmgmt/forge.rst --- user_guide_src/source/dbmgmt/forge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst index 241743fb487e..00915a5dae81 100644 --- a/user_guide_src/source/dbmgmt/forge.rst +++ b/user_guide_src/source/dbmgmt/forge.rst @@ -41,7 +41,7 @@ Returns true/false based on success or failure: .. literalinclude:: forge/003.php An optional second parameter set to true will add ``IF EXISTS`` statement -or will check if a database exists before create it (depending on DBMS). +or will check if a database exists before creating it (depending on DBMS). .. literalinclude:: forge/004.php From dc050da64aabe2943305182bed7a210dad53a211 Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 30 Apr 2024 11:18:02 +0200 Subject: [PATCH 6818/8282] docs: Shorten the menu item in dbmgmt/index.rst Shorten the menu item "Database Manipulation with Database Forge" to "Database Forge" --- user_guide_src/source/dbmgmt/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/index.rst b/user_guide_src/source/dbmgmt/index.rst index 68bfea3e6098..38701c2e1ac8 100644 --- a/user_guide_src/source/dbmgmt/index.rst +++ b/user_guide_src/source/dbmgmt/index.rst @@ -7,7 +7,7 @@ CodeIgniter comes with tools to restructure or seed your database. .. toctree:: :titlesonly: - Database Manipulation with Database Forge + Database Forge Database Migrations Database Seeding db_commands From f9a2e2441ef999f7dd09950bf53e918bff8ea8f1 Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 30 Apr 2024 13:51:27 +0200 Subject: [PATCH 6819/8282] docs: Fix typo in dbtgmt/migration.rst Fix typo in dbtgmt/migration.rst --- user_guide_src/source/dbmgmt/migration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index 5b6b09dc4414..f0bb37b279a5 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -209,7 +209,7 @@ creates is the Pascal case version of the filename. php spark make:migration [options] -You can use (``make:migration``) with the following options: +You can use (make:migration) with the following options: - ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``. - ``--suffix`` - Append the component title to the class name. From 13702a4f1bb8b472b37f51d53d0e7b1948939395 Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 30 Apr 2024 17:12:16 +0200 Subject: [PATCH 6820/8282] docs: Fix typos in libraries/caching.rst Fix typos in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index dd735a8a12c0..a09f6e9f385b 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -67,7 +67,7 @@ This is an array of settings specific to the ``File`` handler to determine how $memcached ========== -This is an array of servers that will be used when using the ``Memcache(d)`` handler. +This is an array of servers that will be used when using the ``Memcached`` handler. $redis ====== @@ -155,7 +155,7 @@ Class Reference .. literalinclude:: caching/004.php - .. note:: The ``$raw`` parameter is only utilized by Memcache, + .. note:: The ``$raw`` parameter is only utilized by Memcached, in order to allow usage of ``increment()`` and ``decrement()``. .. php:method:: delete($key): bool @@ -280,7 +280,7 @@ Drivers File-based Caching ================== -Unlike caching from the Output Class, the driver file-based caching +Unlike caching from the Output Class, the file-based caching allows for pieces of view files to be cached. Use this with care, and make sure to benchmark your application, as a point can come where disk I/O will negate positive gains by caching. This requires a cache From 1ca470f9ea4fd5f8f1be55d2a584f99298db030f Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 30 Apr 2024 12:01:14 +0900 Subject: [PATCH 6821/8282] refactor!: remove deprecated Logger::cleanFilenames() and TestLogger::cleanup() --- system/Log/Logger.php | 15 --------------- system/Test/TestLogger.php | 14 -------------- user_guide_src/source/changelogs/v4.6.0.rst | 3 +++ 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/system/Log/Logger.php b/system/Log/Logger.php index fca608f91ff8..369db8ffb36d 100644 --- a/system/Log/Logger.php +++ b/system/Log/Logger.php @@ -410,19 +410,4 @@ public function determineFile(): array 'unknown', ]; } - - /** - * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH - * with the actual var. i.e. - * - * /var/www/site/app/Controllers/Home.php - * becomes: - * APPPATH/Controllers/Home.php - * - * @deprecated Use dedicated `clean_path()` function. - */ - protected function cleanFileNames(string $file): string - { - return clean_path($file); - } } diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php index 73fbab5571a7..bbd0839e93b2 100644 --- a/system/Test/TestLogger.php +++ b/system/Test/TestLogger.php @@ -92,18 +92,4 @@ public static function didLog(string $level, $message, bool $useExactComparison return false; } - - /** - * Expose filenames. - * - * @param string $file - * - * @return string - * - * @deprecated No longer needed as underlying protected method is also deprecated. - */ - public function cleanup($file) - { - return clean_path($file); - } } diff --git a/user_guide_src/source/changelogs/v4.6.0.rst b/user_guide_src/source/changelogs/v4.6.0.rst index afc7d89d9d51..becb1ec0688c 100644 --- a/user_guide_src/source/changelogs/v4.6.0.rst +++ b/user_guide_src/source/changelogs/v4.6.0.rst @@ -38,6 +38,9 @@ Removed Deprecated Items has been removed. Use ``failValidationErrors()`` instead. - **HTTP:** The deprecated ``getReason()`` method in ``CodeIgniter\HTTP\Response`` and ``ResponseInterface`` has been removed. Use ``getReasonPhrase()`` instead. +- **Logger:** The deprecated ``CodeIgniter\Log\Logger::cleanFilenames()`` and + ``CodeIgniter\Test\TestLogger::cleanup()`` have been removed. Use the + ``clean_path()`` function instead. ************ Enhancements From adeca44aa3db2719713913f5670288a20e649c05 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 1 May 2024 08:28:14 +0200 Subject: [PATCH 6822/8282] docs: Fix typos for consistency in dbmgmt/migration.rst Fix typos for consistency in dbmgmt/migration.rst --- user_guide_src/source/dbmgmt/migration.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst index f0bb37b279a5..dec16c5037ff 100644 --- a/user_guide_src/source/dbmgmt/migration.rst +++ b/user_guide_src/source/dbmgmt/migration.rst @@ -121,7 +121,7 @@ Migrates a database group with all available migrations: php spark migrate -You can use (migrate) with the following options: +You can use ``migrate`` with the following options: - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run. - ``-n`` - to choose namespace, otherwise ``App`` namespace will be used. @@ -145,8 +145,8 @@ When using the ``--all`` option, it will scan through all namespaces attempting not been run. These will all be collected and then sorted as a group by date created. This should help to minimize any potential conflicts between the main application and any modules. -rollback -======== +migrate:rollback +================ Rolls back all migrations to a blank slate, effectively migration 0: @@ -154,13 +154,13 @@ Rolls back all migrations to a blank slate, effectively migration 0: php spark migrate:rollback -You can use (rollback) with the following options: +You can use ``migrate:rollback`` with the following options: - ``-b`` - to choose a batch: natural numbers specify the batch. - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment. -refresh -======= +migrate:refresh +=============== Refreshes the database state by first rolling back all migrations, and then migrating all: @@ -168,15 +168,15 @@ Refreshes the database state by first rolling back all migrations, and then migr php spark migrate:refresh -You can use (refresh) with the following options: +You can use ``migrate:refresh`` with the following options: - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run. - ``-n`` - to choose namespace, otherwise ``App`` namespace will be used. - ``--all`` - to refresh all namespaces. - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment. -status -====== +migrate:status +============== Displays a list of all migrations and the date and time they ran, or '--' if they have not been run: @@ -194,7 +194,7 @@ Displays a list of all migrations and the date and time they ran, or '--' if the | CodeIgniter\Settings | 2021-11-14-143905 | AddContextColumn | default | 2022-04-06 01:23:08 | 1 | +----------------------+-------------------+-----------------------+---------+---------------------+-------+ -You can use (status) with the following options: +You can use ``migrate:status`` with the following options: - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be checked. If not specified, all migrations will be checked. @@ -209,7 +209,7 @@ creates is the Pascal case version of the filename. php spark make:migration [options] -You can use (make:migration) with the following options: +You can use ``make:migration`` with the following options: - ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``. - ``--suffix`` - Append the component title to the class name. From 723af86bfca9c856e712289ae897cdaea4dd0cd1 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 1 May 2024 10:23:39 +0200 Subject: [PATCH 6823/8282] docs: Fix sentence in File-based Caching in libraries/caching.rst Fix sentence in File-based Caching in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index a09f6e9f385b..fa27a2c53397 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -280,8 +280,7 @@ Drivers File-based Caching ================== -Unlike caching from the Output Class, the file-based caching -allows for pieces of view files to be cached. Use this with care, and +File-based caching allows for pieces of view files to be cached. Use this with care, and make sure to benchmark your application, as a point can come where disk I/O will negate positive gains by caching. This requires a cache directory to be really writable by the application. From 1ff88899e84e02515ab95e5a75754307a8de8f72 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 2 May 2024 10:53:57 +0900 Subject: [PATCH 6824/8282] fix: remove unused undefined param $raw It is not defined in the interface and other classes, and not used at all. --- system/Test/Mock/MockCache.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php index df2179678de5..85b5fd9e7e14 100644 --- a/system/Test/Mock/MockCache.php +++ b/system/Test/Mock/MockCache.php @@ -92,11 +92,10 @@ public function remember(string $key, int $ttl, Closure $callback) * @param string $key Cache item name * @param mixed $value the data to save * @param int $ttl Time To Live, in seconds (default 60) - * @param bool $raw Whether to store the raw value. * * @return bool */ - public function save(string $key, $value, int $ttl = 60, bool $raw = false) + public function save(string $key, $value, int $ttl = 60) { if ($this->bypass) { return false; From 99baa7376e0ffaf8e243abae68a5a57c1717a8ea Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 2 May 2024 09:49:51 +0200 Subject: [PATCH 6825/8282] docs: Change some decorations libraries/caching.rst Change some decorations libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index fa27a2c53397..3b4fdc5d4c53 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -36,14 +36,14 @@ $handler ======== The is the name of the handler that should be used as the primary handler when starting up the engine. -Available names are: dummy, file, memcached, redis, predis, wincache. +Available names are: dummy, file, memcached, redis, predis, wincache. This is commonly the **File** handler +since the file system is always available, but may not fit more complex, multi-server setups. $backupHandler ============== In the case that the first choice ``$handler`` is not available, this is the next cache handler to load. -This is commonly the ``File`` handler since the file system is always available, but may not fit -more complex, multi-server setups. +The default backup handler is **dummy**. $prefix ======= @@ -62,17 +62,17 @@ to projects and modules. This will replace the hard-coded value in a future rele $file ===== -This is an array of settings specific to the ``File`` handler to determine how it should save the cache files. +This is an array of settings specific to the **File** handler to determine how it should save the cache files. $memcached ========== -This is an array of servers that will be used when using the ``Memcached`` handler. +This is an array of servers that will be used when using the **Memcached** handler. $redis ====== -The settings for the Redis server that you wish to use when using the ``Redis`` and ``Predis`` handler. +The settings for the Redis server that you wish to use when using the **Redis** and **Predis** handler. ****************** Command-Line Tools From 6056e30953e4ddc35a2adb87de65638ffbb4b555 Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 2 May 2024 10:05:02 +0200 Subject: [PATCH 6826/8282] docs: Remove $raw parameter from save method in libraries/caching.rst Remove $raw parameter from save method in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 3b4fdc5d4c53..908e429d543d 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -139,12 +139,11 @@ Class Reference Gets an item from the cache. If ``null`` was returned, this will invoke the callback and save the result. Either way, this will return the value. - .. php:method:: save(string $key, $data[, int $ttl = 60[, $raw = false]]) + .. php:method:: save(string $key, $data[, int $ttl = 60]) :param string $key: Cache item name :param mixed $data: the data to save :param int $ttl: Time To Live, in seconds (default 60) - :param bool $raw: Whether to store the raw value :returns: ``true`` on success, ``false`` on failure :rtype: bool @@ -155,9 +154,6 @@ Class Reference .. literalinclude:: caching/004.php - .. note:: The ``$raw`` parameter is only utilized by Memcached, - in order to allow usage of ``increment()`` and ``decrement()``. - .. php:method:: delete($key): bool :param string $key: name of cached item From 7e17608d4ac8798a2267d5f724ede4baed0aaf26 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 4 May 2024 08:46:00 +0200 Subject: [PATCH 6827/8282] docs: Fix typos in libraries/cookies.rst Fix typos in libraries/cookies.rst --- user_guide_src/source/libraries/cookies.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index 40177800ecbb..cd2b5bd48695 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -26,7 +26,7 @@ cookie interaction. Creating Cookies **************** -There are currently four (4) ways to create a new ``Cookie`` value object. +There are currently four ways to create a new ``Cookie`` value object. .. literalinclude:: cookies/001.php @@ -110,7 +110,7 @@ using the ``__Host-`` prefix, cookies must exhibit the following: Validating the SameSite Attribute ================================= -The SameSite attribute only accepts three (3) values: +The SameSite attribute accepts three values: - **Lax**: Cookies are not sent on normal cross-site subrequests (for example to load images or frames into a third party site), but are sent when a user is navigating to the origin site (*i.e.* when following a link). - **Strict**: Cookies will only be sent in a first-party context and not be sent along with requests initiated by third party websites. @@ -167,7 +167,7 @@ instance can be accessed from the current ``Response`` object. Creating CookieStore ==================== -CodeIgniter provides three (3) other ways to create a new instance of the ``CookieStore``. +CodeIgniter provides three other ways to create a new instance of the ``CookieStore``. .. literalinclude:: cookies/008.php @@ -248,7 +248,7 @@ objects. However, you may wish to define your own settings by changing the follo ``Config\Cookie`` class in **app/Config/Cookie.php** file. ==================== ===================================== ========= ===================================================== -Setting Options/ Types Default Description +Setting Options/Types Default Description ==================== ===================================== ========= ===================================================== **$prefix** ``string`` ``''`` Prefix to prepend to the cookie name. **$expires** ``DateTimeInterface|string|int`` ``0`` The expires timestamp. @@ -256,7 +256,7 @@ Setting Options/ Types Default Description **$domain** ``string`` ``''`` The domain property of the cookie.with trailing slash. **$secure** ``true/false`` ``false`` If to be sent over secure HTTPS. **$httponly** ``true/false`` ``true`` If not accessible to JavaScript. -**$samesite** ``Lax|None|Strict|lax|none|strict''`` ``Lax`` The SameSite attribute. +**$samesite** ``Lax|None|Strict`` ``Lax`` The SameSite attribute. **$raw** ``true/false`` ``false`` If to be dispatched using ``setrawcookie()``. ==================== ===================================== ========= ===================================================== From 8ea603aeffc0aaa5cfde316874c378eecae9b081 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 4 May 2024 13:47:04 +0200 Subject: [PATCH 6828/8282] docs: Samesite options typos user_guide_src/source/libraries/cookies.rst Samesite options typos user_guide_src/source/libraries/cookies.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/cookies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index cd2b5bd48695..e05e3c15959f 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -256,7 +256,7 @@ Setting Options/Types Default Description **$domain** ``string`` ``''`` The domain property of the cookie.with trailing slash. **$secure** ``true/false`` ``false`` If to be sent over secure HTTPS. **$httponly** ``true/false`` ``true`` If not accessible to JavaScript. -**$samesite** ``Lax|None|Strict`` ``Lax`` The SameSite attribute. +**$samesite** ``Lax``/``None``/``Strict`` ``Lax`` The SameSite attribute. **$raw** ``true/false`` ``false`` If to be dispatched using ``setrawcookie()``. ==================== ===================================== ========= ===================================================== From ef98a198ec9b9dac619e21a0443ddd28c1aaaf2b Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 4 May 2024 13:47:43 +0200 Subject: [PATCH 6829/8282] docs: Cookie options typos user_guide_src/source/libraries/cookies.rst Cookie options typos user_guide_src/source/libraries/cookies.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/cookies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index e05e3c15959f..6d4096799206 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -257,7 +257,7 @@ Setting Options/Types Default Description **$secure** ``true/false`` ``false`` If to be sent over secure HTTPS. **$httponly** ``true/false`` ``true`` If not accessible to JavaScript. **$samesite** ``Lax``/``None``/``Strict`` ``Lax`` The SameSite attribute. -**$raw** ``true/false`` ``false`` If to be dispatched using ``setrawcookie()``. +**$raw** ``true``/``false`` ``false`` If to be dispatched using ``setrawcookie()``. ==================== ===================================== ========= ===================================================== In runtime, you can manually supply a new default using the ``Cookie::setDefaults()`` method. From 091e15f5598282b5c84618e1b1638d6d28d6b6d5 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 4 May 2024 13:48:07 +0200 Subject: [PATCH 6830/8282] docs: Cookie options typos user_guide_src/source/libraries/cookies.rst Cookie options typos user_guide_src/source/libraries/cookies.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/cookies.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index 6d4096799206..c6ac80706829 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -254,8 +254,8 @@ Setting Options/Types Default Description **$expires** ``DateTimeInterface|string|int`` ``0`` The expires timestamp. **$path** ``string`` ``/`` The path property of the cookie. **$domain** ``string`` ``''`` The domain property of the cookie.with trailing slash. -**$secure** ``true/false`` ``false`` If to be sent over secure HTTPS. -**$httponly** ``true/false`` ``true`` If not accessible to JavaScript. +**$secure** ``true``/``false`` ``false`` If to be sent over secure HTTPS. +**$httponly** ``true``/``false`` ``true`` If not accessible to JavaScript. **$samesite** ``Lax``/``None``/``Strict`` ``Lax`` The SameSite attribute. **$raw** ``true``/``false`` ``false`` If to be dispatched using ``setrawcookie()``. ==================== ===================================== ========= ===================================================== From 9acc52dcdd418054a0e8e0931a10d4943864796d Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 4 May 2024 16:33:01 +0200 Subject: [PATCH 6831/8282] docs: Fix typos and add missing preferences in libraries/email.rst Fix typos and add missing preferences in libraries/email.rst --- user_guide_src/source/libraries/email.rst | 92 ++++++++++++----------- 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst index c506a9044757..4bcf84c4aec9 100644 --- a/user_guide_src/source/libraries/email.rst +++ b/user_guide_src/source/libraries/email.rst @@ -113,35 +113,39 @@ sending email. =================== =================== ============================ ======================================================================= Preference Default Value Options Description =================== =================== ============================ ======================================================================= -**userAgent** CodeIgniter None The "user agent". -**protocol** mail ``mail``, ``sendmail``, The mail sending protocol. +**$fromEmail** The email address to be set in the "from" header. +**$fromName** The name to be set in the "from" header. +**$recipients** The email addresses of the recipients, as a comma separated string or + an array +**$userAgent** CodeIgniter The "user agent". +**$protocol** mail ``mail``, ``sendmail``, The mail sending protocol. or ``smtp`` -**mailPath** /usr/sbin/sendmail None The server path to Sendmail. -**SMTPHost** No Default None SMTP Server Hostname. -**SMTPUser** No Default None SMTP Username. -**SMTPPass** No Default None SMTP Password. -**SMTPPort** 25 None SMTP Port. (If set to ``465``, TLS will be used for the connection +**$mailPath** /usr/sbin/sendmail The server path to Sendmail. +**$SMTPHost** SMTP Server Hostname. +**$SMTPUser** SMTP Username. +**$SMTPPass** SMTP Password. +**$SMTPPort** 25 SMTP Port. (If set to ``465``, TLS will be used for the connection regardless of ``SMTPCrypto`` setting.) -**SMTPTimeout** 5 None SMTP Timeout (in seconds). -**SMTPKeepAlive** false ``true``/``false`` (boolean) Enable persistent SMTP connections. -**SMTPCrypto** tls ``tls``, ``ssl``, or SMTP Encryption. Setting this to ``ssl`` will create a secure +**$SMTPTimeout** 5 SMTP Timeout (in seconds). +**$SMTPKeepAlive** false ``true``/``false`` Enable persistent SMTP connections. +**$SMTPCrypto** tls ``tls``, ``ssl``, or SMTP Encryption. Setting this to ``ssl`` will create a secure empty string (``''``) channel to the server using SSL, and ``tls`` will issue a ``STARTTLS`` command to the server. Connection on port ``465`` should set this to an empty string (``''``). See also :ref:`email-ssl-tls-for-smtp`. -**wordWrap** true ``true``/``false`` (boolean) Enable word-wrap. -**wrapChars** 76 Character count to wrap at. -**mailType** text ``text`` or ``html`` Type of mail. If you send HTML email you must send it as a complete web +**$wordWrap** true ``true``/``false`` Enable word-wrap. +**$wrapChars** 76 Character count to wrap at. +**$mailType** text ``text`` or ``html`` Type of mail. If you send HTML email you must send it as a complete web page. Make sure you don't have any relative links or relative image paths otherwise they will not work. -**charset** utf-8 Character set (``utf-8``, ``iso-8859-1``, etc.). -**validate** true ``true``/``false`` (boolean) Whether to validate the email address. -**priority** 3 1, 2, 3, 4, 5 Email Priority. ``1`` = highest. ``5`` = lowest. ``3`` = normal. -**CRLF** \\n ``\r\n`` or ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822). -**newline** \\n ``\r\n`` or ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822). -**BCCBatchMode** false ``true``/``false`` (boolean) Enable BCC Batch Mode. -**BCCBatchSize** 200 None Number of emails in each BCC batch. -**DSN** false ``true``/``false`` (boolean) Enable notify message from server. +**$charset** UTF-8 Character set (``utf-8``, ``iso-8859-1``, etc.). +**$validate** true ``true``/``false`` Whether to validate the email address. +**$priority** 3 1, 2, 3, 4, 5 Email Priority. ``1`` = highest. ``5`` = lowest. ``3`` = normal. +**$CRLF** \\r\\n ``\r\n``, ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822). +**$newline** \\r\\n ``\r\n``, ``\n`` or ``\r`` Newline character. (Use ``\r\n`` to comply with RFC 822). +**$BCCBatchMode** false ``true``/``false`` Enable BCC Batch Mode. +**$BCCBatchSize** 200 Number of emails in each BCC batch. +**$DSN** false ``true``/``false`` Enable notify message from server. =================== =================== ============================ ======================================================================= Overriding Word Wrapping @@ -173,9 +177,9 @@ Class Reference .. php:method:: setFrom($from[, $name = ''[, $returnPath = null]]) - :param string $from: "From" e-mail address + :param string $from: "From" email address :param string $name: "From" display name - :param string $returnPath: Optional email address to redirect undelivered e-mail to + :param string $returnPath: Optional email address to redirect undelivered email to :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email @@ -192,8 +196,8 @@ Class Reference .. php:method:: setReplyTo($replyto[, $name = '']) - :param string $replyto: E-mail address for replies - :param string $name: Display name for the reply-to e-mail address + :param string $replyto: Email address for replies + :param string $name: Display name for the reply-to email address :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email @@ -204,12 +208,12 @@ Class Reference .. php:method:: setTo($to) - :param mixed $to: Comma-delimited string or an array of e-mail addresses + :param mixed $to: Comma separated string or an array of email addresses :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Sets the email address(s) of the recipient(s). Can be a single e-mail, - a comma-delimited list or an array: + Sets the email address(es) of the recipient(s). Can be a single email, + a comma separated list or an array: .. literalinclude:: email/006.php @@ -219,22 +223,22 @@ Class Reference .. php:method:: setCC($cc) - :param mixed $cc: Comma-delimited string or an array of e-mail addresses + :param mixed $cc: Comma separated string or an array of email addresses :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Sets the CC email address(s). Just like the "to", can be a single e-mail, - a comma-delimited list or an array. + Sets the CC email address(es). Just like the "to", can be a single email, + a comma separated list or an array. .. php:method:: setBCC($bcc[, $limit = '']) - :param mixed $bcc: Comma-delimited string or an array of e-mail addresses - :param int $limit: Maximum number of e-mails to send per batch + :param mixed $bcc: Comma separated string or an array of email addresses + :param int $limit: Maximum number of emails to send per batch :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Sets the BCC email address(s). Just like the ``setTo()`` method, can be a single - e-mail, a comma-delimited list or an array. + Sets the BCC email address(es). Just like the ``setTo()`` method, can be a single + email, a comma separated list or an array. If ``$limit`` is set, "batch mode" will be enabled, which will send the emails to batches, with each batch not exceeding the specified @@ -242,7 +246,7 @@ Class Reference .. php:method:: setSubject($subject) - :param string $subject: E-mail subject line + :param string $subject: Email subject line :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email @@ -252,21 +256,21 @@ Class Reference .. php:method:: setMessage($body) - :param string $body: E-mail message body + :param string $body: Email message body :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Sets the e-mail message body: + Sets the email message body: .. literalinclude:: email/010.php .. php:method:: setAltMessage($str) - :param string $str: Alternative e-mail message body + :param string $str: Alternative email message body :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Sets the alternative e-mail message body: + Sets the alternative email message body: .. literalinclude:: email/011.php @@ -284,7 +288,7 @@ Class Reference :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email - Appends additional headers to the e-mail: + Appends additional headers to the email: .. literalinclude:: email/012.php @@ -311,7 +315,7 @@ Class Reference :returns: true on success, false on failure :rtype: bool - The e-mail sending method. Returns boolean true or false based on + The email sending method. Returns boolean true or false based on success or failure, enabling it to be used conditionally: .. literalinclude:: email/015.php @@ -334,7 +338,7 @@ Class Reference :param string $disposition: 'disposition' of the attachment. Most email clients make their own decision regardless of the MIME specification used here. https://www.iana.org/assignments/cont-disp/cont-disp.xhtml - :param string $newname: Custom file name to use in the e-mail + :param string $newname: Custom file name to use in the email :param string $mime: MIME type to use (useful for buffered data) :returns: CodeIgniter\\Email\\Email instance (method chaining) :rtype: CodeIgniter\\Email\\Email @@ -375,7 +379,7 @@ Class Reference .. literalinclude:: email/022.php - .. note:: Content-ID for each e-mail must be re-created for it to be unique. + .. note:: Content-ID for each email must be re-created for it to be unique. .. php:method:: printDebugger($include = ['headers', 'subject', 'body']) From 20e8388f67d10019f000aa93ca02fa4a99bdc269 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 May 2024 11:18:07 +0900 Subject: [PATCH 6832/8282] docs: update contributing/pull_request.md --- contributing/pull_request.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 4b5b06406124..372cf8d6b0e0 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -2,25 +2,23 @@ ## Contributions -We expect all contributions to -- conform to our [style guide](./styleguide.md), -- be commented (inside the PHP source files), -- be documented (in the [user guide](https://codeigniter4.github.io/userguide/)), -- and unit tested (in the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)). +We expect the following in all pull requests. +- All git commits are [GPG-signed](#signing) +- Must follow our [style guide](#php-style) +- Be [commented](#comments) in the PHP source file +- Be documented in the [user guide](#user-guide) +- Be [unit tested](#unit-testing) +- Pass all checks in GitHub Actions > [!IMPORTANT] > We expect all code changes or bug-fixes to be accompanied by one or more tests > added to our test suite to prove the code works. -If pull requests are not accompanied by relevant tests, they will likely be closed. +If pull requests do not comply with the above, they will likely be closed. Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please make it as painless for your contributions to be included as possible. -If you need help with getting tests running on your local machines, ask for help -on the [forum](https://forum.codeigniter.com/forumdisplay.php?fid=27). We would -be happy to help out. - The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source! @@ -67,13 +65,18 @@ composer cs If you are not familiar with Unit Testing, see [the forum thread](https://forum.codeigniter.com/showthread.php?tid=81830). +If you need help with getting tests running on your local machines, ask for help +on the [forum](https://forum.codeigniter.com/forumdisplay.php?fid=27). We would +be happy to help out. Unit testing is expected for all CodeIgniter components. We use PHPUnit, and run unit tests using GitHub Actions for each PR submitted or changed. -In the CodeIgniter project, there is a `tests` folder, with a structure +In the CodeIgniter project, there is a [tests][tests-folder] folder, with a structure that parallels that of `system`. +[tests-folder]: https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests + The normal practice would be to have a unit test class for each of the classes in `system`, named appropriately. For instance, the `BananaTest` class would test the `Banana` class. There will be occasions when it is From 4a8866b6da96927da31d96da42457dcad38d5d8d Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 5 May 2024 09:21:49 +0200 Subject: [PATCH 6833/8282] docs: Remove mistakenly changed sentence in libraries/caching.rst Remove mistakenly changed sentence in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 908e429d543d..f0a702ddc4fb 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -36,8 +36,7 @@ $handler ======== The is the name of the handler that should be used as the primary handler when starting up the engine. -Available names are: dummy, file, memcached, redis, predis, wincache. This is commonly the **File** handler -since the file system is always available, but may not fit more complex, multi-server setups. +Available names are: dummy, file, memcached, redis, predis, wincache. $backupHandler ============== From acf3e6ce4d15b413429e9ed4223aeb74fec0854f Mon Sep 17 00:00:00 2001 From: Sahil Khatik Date: Sun, 5 May 2024 13:03:00 +0530 Subject: [PATCH 6834/8282] Fix: Resolved phpstan error in Config/Filters.php --- phpstan-baseline.php | 11 ----------- system/Config/Filters.php | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 1959aea9685c..fc9b102f8b3f 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1,11 +1,5 @@ '#^PHPDoc type array\\\\> of property Config\\\\Filters\\:\\:\\$methods is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$methods\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/app/Config/Filters.php', -]; $ignoreErrors[] = [ 'message' => '#^PHPDoc type array\\\\>\\> of property Config\\\\Filters\\:\\:\\$filters is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$filters\\.$#', 'count' => 1, @@ -1151,11 +1145,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/Config/Filters.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$methods type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/Config/Filters.php', -]; $ignoreErrors[] = [ 'message' => '#^Accessing offset \'SERVER_PROTOCOL\' directly on \\$_SERVER is discouraged\\.$#', 'count' => 1, diff --git a/system/Config/Filters.php b/system/Config/Filters.php index 9096dc7ba03f..562eae8a26ef 100644 --- a/system/Config/Filters.php +++ b/system/Config/Filters.php @@ -102,6 +102,8 @@ class Filters extends BaseConfig * If you use this, you should disable auto-routing because auto-routing * permits any HTTP method to access a controller. Accessing the controller * with a method you don't expect could bypass the filter. + * + * @var array> */ public array $methods = []; From af8ad2963bbe663f9d7d02046c3cdee1382b5f4e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 May 2024 17:18:34 +0900 Subject: [PATCH 6835/8282] docs: add "PRs must be sent to the appropriate branch" --- contributing/pull_request.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 372cf8d6b0e0..426ca41a788e 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -2,7 +2,8 @@ ## Contributions -We expect the following in all pull requests. +We expect the following in all Pull Requests (PRs). +- PRs must be sent to the [appropriate branch](#branching) - All git commits are [GPG-signed](#signing) - Must follow our [style guide](#php-style) - Be [commented](#comments) in the PHP source file From b1a42f4ef2506233ca3ecec1b9cfe76a5f5f1eeb Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 May 2024 17:21:35 +0900 Subject: [PATCH 6836/8282] docs: replace "are" with "must be" --- contributing/pull_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 426ca41a788e..46a57e667aa9 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -4,7 +4,7 @@ We expect the following in all Pull Requests (PRs). - PRs must be sent to the [appropriate branch](#branching) -- All git commits are [GPG-signed](#signing) +- All git commits must be [GPG-signed](#signing) - Must follow our [style guide](#php-style) - Be [commented](#comments) in the PHP source file - Be documented in the [user guide](#user-guide) From 33edee13fe0eeb00707076e2f77d78847e7ae39e Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 5 May 2024 10:22:07 +0200 Subject: [PATCH 6837/8282] docs: Updated File-based Caching in libraries/caching.rst Updated File-based Caching in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index f0a702ddc4fb..647055749923 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -275,10 +275,10 @@ Drivers File-based Caching ================== -File-based caching allows for pieces of view files to be cached. Use this with care, and -make sure to benchmark your application, as a point can come where disk -I/O will negate positive gains by caching. This requires a cache -directory to be really writable by the application. +This requires a cache directory to be really writable by the application. + +Use this with care, and make sure to benchmark your application, as a point can +come where disk I/O will negate positive gains by caching. Memcached Caching ================= From 3da5bebb2c78adf3b5addc07f527f840c79063f5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 May 2024 17:22:43 +0900 Subject: [PATCH 6838/8282] docs: update sample branch name to `4.6` --- contributing/pull_request.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 46a57e667aa9..66bdd9151ccd 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -203,7 +203,7 @@ working on your contribution. All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed. -PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__ +PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an emergency security patch) can be applied to the @@ -304,7 +304,7 @@ GitHub means "making a copy of that repo to your account" and "cloning" means - If your PR is for bug fixes: - `> git switch develop` - `> git switch -c ` - - If your PR has any enhancement, create new branch from next minor version branch, e.g. __"4.5"__: + - If your PR has any enhancement, create new branch from next minor version branch, e.g. __"4.6"__: - `> git switch ` - `> git switch -c ` 7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one From 88eebb5f035e7dead3b612d6e637a0068c9d08b9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 5 May 2024 17:53:09 +0900 Subject: [PATCH 6839/8282] fix: correct property default values Make them the same as in the Config\Email. --- system/Email/Email.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/Email/Email.php b/system/Email/Email.php index a686ca0ca06e..b82779eb891d 100644 --- a/system/Email/Email.php +++ b/system/Email/Email.php @@ -151,7 +151,7 @@ class Email * * @var string */ - public $charset = 'utf-8'; + public $charset = 'UTF-8'; /** * Alternative message (for HTML messages only) @@ -182,7 +182,7 @@ class Email * * @var string "\r\n" or "\n" */ - public $newline = "\n"; + public $newline = "\r\n"; /** * CRLF character sequence @@ -197,7 +197,7 @@ class Email * * @var string */ - public $CRLF = "\n"; + public $CRLF = "\r\n"; /** * Whether to use Delivery Status Notification. From fe997e41040cc9bdd5a1e4f7199f8a6d7fda3d7b Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 23 Apr 2024 00:32:06 +0800 Subject: [PATCH 6840/8282] Enable `php_unit_attributes` --- .php-cs-fixer.dist.php | 3 +- .php-cs-fixer.no-header.php | 3 +- .php-cs-fixer.tests.php | 3 +- .php-cs-fixer.user-guide.php | 3 +- tests/system/API/ResponseTraitTest.php | 3 +- tests/system/AutoReview/ComposerJsonTest.php | 6 +- tests/system/AutoReview/FrameworkCodeTest.php | 6 +- tests/system/Autoloader/AutoloaderTest.php | 9 +- .../Autoloader/FileLocatorCachedTest.php | 3 +- tests/system/Autoloader/FileLocatorTest.php | 2 +- tests/system/CLI/CLITest.php | 6 +- tests/system/CLI/ConsoleTest.php | 3 +- tests/system/Cache/CacheFactoryTest.php | 3 +- tests/system/Cache/CacheMockTest.php | 3 +- .../Cache/FactoriesCacheFileHandlerTest.php | 3 +- ...FactoriesCacheFileVarExportHandlerTest.php | 3 +- .../system/Cache/Handlers/BaseHandlerTest.php | 6 +- .../Cache/Handlers/DummyHandlerTest.php | 3 +- .../system/Cache/Handlers/FileHandlerTest.php | 18 +- .../Cache/Handlers/MemcachedHandlerTest.php | 3 +- .../Cache/Handlers/PredisHandlerTest.php | 3 +- .../Cache/Handlers/RedisHandlerTest.php | 3 +- tests/system/Cache/ResponseCacheTest.php | 6 +- tests/system/CodeIgniterTest.php | 12 +- tests/system/Commands/BaseCommandTest.php | 3 +- tests/system/Commands/CellGeneratorTest.php | 3 +- tests/system/Commands/ClearCacheTest.php | 3 +- tests/system/Commands/ClearDebugbarTest.php | 3 +- tests/system/Commands/ClearLogsTest.php | 3 +- .../system/Commands/CommandGeneratorTest.php | 3 +- tests/system/Commands/CommandTest.php | 7 +- tests/system/Commands/ConfigGeneratorTest.php | 3 +- .../Commands/ConfigurableSortImportsTest.php | 3 +- .../Commands/ControllerGeneratorTest.php | 3 +- tests/system/Commands/CreateDatabaseTest.php | 3 +- .../Commands/Database/MigrateStatusTest.php | 3 +- .../Database/ShowTableInfoMockIOTest.php | 3 +- .../Commands/Database/ShowTableInfoTest.php | 3 +- .../system/Commands/DatabaseCommandsTest.php | 3 +- tests/system/Commands/EntityGeneratorTest.php | 3 +- .../Commands/EnvironmentCommandTest.php | 3 +- tests/system/Commands/FilterCheckTest.php | 3 +- tests/system/Commands/FilterGeneratorTest.php | 3 +- tests/system/Commands/GenerateKeyTest.php | 9 +- tests/system/Commands/GeneratorsTest.php | 3 +- tests/system/Commands/HelpCommandTest.php | 3 +- tests/system/Commands/InfoCacheTest.php | 3 +- .../Commands/MigrationGeneratorTest.php | 3 +- .../Commands/MigrationIntegrationTest.php | 3 +- tests/system/Commands/ModelGeneratorTest.php | 3 +- tests/system/Commands/PublishCommandTest.php | 3 +- tests/system/Commands/RoutesTest.php | 3 +- .../system/Commands/ScaffoldGeneratorTest.php | 3 +- tests/system/Commands/SeederGeneratorTest.php | 3 +- tests/system/Commands/TestGeneratorTest.php | 3 +- .../Translation/LocalizationFinderTest.php | 3 +- .../Commands/Utilities/ConfigCheckTest.php | 3 +- .../Commands/Utilities/NamespacesTest.php | 3 +- .../Routes/AutoRouteCollectorTest.php | 3 +- .../AutoRouteCollectorTest.php | 3 +- .../ControllerMethodReaderTest.php | 3 +- .../Utilities/Routes/ControllerFinderTest.php | 3 +- .../Routes/ControllerMethodReaderTest.php | 3 +- .../Utilities/Routes/FilterCollectorTest.php | 3 +- .../Utilities/Routes/FilterFinderTest.php | 3 +- .../Routes/SampleURIGeneratorTest.php | 7 +- .../Commands/ValidationGeneratorTest.php | 3 +- tests/system/CommonFunctionsSendTest.php | 8 +- tests/system/CommonFunctionsTest.php | 62 ++---- tests/system/CommonHelperTest.php | 6 +- tests/system/CommonSingleServiceTest.php | 11 +- tests/system/Config/BaseConfigTest.php | 21 +- tests/system/Config/DotEnvTest.php | 22 +- tests/system/Config/FactoriesTest.php | 11 +- tests/system/Config/MimesTest.php | 11 +- tests/system/Config/ServicesTest.php | 45 ++--- tests/system/ControllerTest.php | 6 +- tests/system/Cookie/CookieStoreTest.php | 3 +- tests/system/Cookie/CookieTest.php | 14 +- .../DataConverter/DataConverterTest.php | 11 +- tests/system/Database/BaseConnectionTest.php | 13 +- tests/system/Database/BaseQueryTest.php | 9 +- tests/system/Database/Builder/AliasTest.php | 3 +- tests/system/Database/Builder/BaseTest.php | 3 +- tests/system/Database/Builder/CountTest.php | 3 +- tests/system/Database/Builder/DeleteTest.php | 3 +- .../system/Database/Builder/DistinctTest.php | 3 +- tests/system/Database/Builder/EmptyTest.php | 3 +- tests/system/Database/Builder/FromTest.php | 3 +- tests/system/Database/Builder/GetTest.php | 3 +- tests/system/Database/Builder/GroupTest.php | 3 +- tests/system/Database/Builder/InsertTest.php | 3 +- tests/system/Database/Builder/JoinTest.php | 3 +- tests/system/Database/Builder/LikeTest.php | 3 +- tests/system/Database/Builder/LimitTest.php | 3 +- tests/system/Database/Builder/OrderTest.php | 3 +- tests/system/Database/Builder/PrefixTest.php | 3 +- tests/system/Database/Builder/ReplaceTest.php | 3 +- tests/system/Database/Builder/SelectTest.php | 3 +- .../system/Database/Builder/TruncateTest.php | 3 +- tests/system/Database/Builder/UnionTest.php | 3 +- tests/system/Database/Builder/UpdateTest.php | 3 +- tests/system/Database/Builder/WhenTest.php | 3 +- tests/system/Database/Builder/WhereTest.php | 9 +- tests/system/Database/ConfigTest.php | 6 +- tests/system/Database/DatabaseSeederTest.php | 3 +- .../DatabaseTestCaseMigrationOnce1Test.php | 3 +- .../DatabaseTestCaseMigrationOnce2Test.php | 3 +- .../system/Database/DatabaseTestCaseTest.php | 3 +- .../system/Database/Forge/CreateTableTest.php | 3 +- .../Database/Forge/DropForeignKeyTest.php | 3 +- tests/system/Database/Live/AliasTest.php | 3 +- tests/system/Database/Live/BadQueryTest.php | 3 +- tests/system/Database/Live/ConnectTest.php | 3 +- tests/system/Database/Live/CountTest.php | 3 +- .../Live/DatabaseTestTraitCaseTest.php | 3 +- tests/system/Database/Live/DbDebugTest.php | 3 +- tests/system/Database/Live/DbUtilsTest.php | 3 +- tests/system/Database/Live/DeleteTest.php | 3 +- tests/system/Database/Live/EmptyTest.php | 3 +- tests/system/Database/Live/EscapeTest.php | 3 +- .../Database/Live/FabricatorLiveTest.php | 3 +- tests/system/Database/Live/ForgeTest.php | 3 +- tests/system/Database/Live/FromTest.php | 3 +- tests/system/Database/Live/GetNumRowsTest.php | 3 +- tests/system/Database/Live/GetTest.php | 3 +- tests/system/Database/Live/GetVersionTest.php | 3 +- tests/system/Database/Live/GroupTest.php | 3 +- tests/system/Database/Live/IncrementTest.php | 3 +- tests/system/Database/Live/InsertTest.php | 3 +- tests/system/Database/Live/JoinTest.php | 3 +- tests/system/Database/Live/LikeTest.php | 3 +- tests/system/Database/Live/LimitTest.php | 3 +- tests/system/Database/Live/MetadataTest.php | 3 +- .../Live/MySQLi/GetFieldDataTestCase.php | 3 +- .../Database/Live/MySQLi/NumberNativeTest.php | 3 +- .../Database/Live/MySQLi/RawSqlTest.php | 3 +- .../Live/OCI8/CallStoredProcedureTest.php | 3 +- .../Live/OCI8/GetFieldDataTestCase.php | 3 +- .../Database/Live/OCI8/LastInsertIDTest.php | 3 +- tests/system/Database/Live/OrderTest.php | 3 +- .../Live/Postgre/GetFieldDataTestCase.php | 3 +- .../Database/Live/PreparedQueryTest.php | 3 +- tests/system/Database/Live/PretendTest.php | 3 +- .../Live/SQLSRV/GetFieldDataTestCase.php | 3 +- .../Database/Live/SQLite3/AlterTableTest.php | 6 +- .../Live/SQLite3/ForgeModifyColumnTest.php | 3 +- .../Live/SQLite3/GetFieldDataTestCase.php | 3 +- .../Live/SQLite3/GetIndexDataTest.php | 3 +- tests/system/Database/Live/SelectTest.php | 3 +- .../Live/TransactionDBDebugFalseTest.php | 3 +- .../Live/TransactionDBDebugTrueTest.php | 3 +- .../system/Database/Live/TransactionTest.php | 3 +- tests/system/Database/Live/UnionTest.php | 3 +- tests/system/Database/Live/UpdateTest.php | 7 +- tests/system/Database/Live/UpsertTest.php | 3 +- tests/system/Database/Live/WhereTest.php | 3 +- .../Database/Live/WriteTypeQueryTest.php | 3 +- .../Migrations/MigrationRunnerTest.php | 3 +- .../Database/Migrations/MigrationTest.php | 3 +- tests/system/Database/RawSqlTest.php | 3 +- tests/system/Debug/ExceptionHandlerTest.php | 3 +- tests/system/Debug/ExceptionsTest.php | 7 +- tests/system/Debug/TimerTest.php | 3 +- .../Debug/Toolbar/Collectors/DatabaseTest.php | 3 +- .../Debug/Toolbar/Collectors/HistoryTest.php | 3 +- tests/system/DebugTraceableTraitTest.php | 6 +- tests/system/Email/EmailTest.php | 6 +- tests/system/Encryption/EncryptionTest.php | 3 +- .../Handlers/OpenSSLHandlerTest.php | 3 +- .../Encryption/Handlers/SodiumHandlerTest.php | 3 +- tests/system/Entity/EntityTest.php | 3 +- tests/system/Events/EventsTest.php | 9 +- tests/system/Files/FileCollectionTest.php | 3 +- tests/system/Files/FileTest.php | 3 +- tests/system/Files/FileWithVfsTest.php | 3 +- tests/system/Filters/CSRFTest.php | 6 +- tests/system/Filters/CorsTest.php | 3 +- tests/system/Filters/DebugToolbarTest.php | 6 +- tests/system/Filters/FiltersTest.php | 12 +- tests/system/Filters/HoneypotTest.php | 18 +- tests/system/Filters/InvalidCharsTest.php | 22 +- tests/system/Filters/SecureHeadersTest.php | 3 +- tests/system/Format/FormatTest.php | 3 +- tests/system/Format/JSONFormatterTest.php | 3 +- tests/system/Format/XMLFormatterTest.php | 7 +- tests/system/HTTP/CLIRequestTest.php | 6 +- .../HTTP/CURLRequestShareOptionsTest.php | 3 +- tests/system/HTTP/CURLRequestTest.php | 11 +- .../system/HTTP/ContentSecurityPolicyTest.php | 189 ++++++------------ tests/system/HTTP/CorsTest.php | 3 +- tests/system/HTTP/DownloadResponseTest.php | 9 +- .../system/HTTP/Files/FileCollectionTest.php | 3 +- tests/system/HTTP/Files/FileMovingTest.php | 3 +- tests/system/HTTP/HeaderTest.php | 3 +- .../HTTP/IncomingRequestDetectingTest.php | 6 +- tests/system/HTTP/IncomingRequestTest.php | 25 +-- tests/system/HTTP/MessageTest.php | 9 +- tests/system/HTTP/NegotiateTest.php | 3 +- tests/system/HTTP/OutgoingRequestTest.php | 3 +- tests/system/HTTP/RedirectExceptionTest.php | 3 +- tests/system/HTTP/RedirectResponseTest.php | 44 ++-- tests/system/HTTP/RequestTest.php | 6 +- tests/system/HTTP/ResponseCookieTest.php | 3 +- tests/system/HTTP/ResponseSendTest.php | 20 +- tests/system/HTTP/ResponseTest.php | 11 +- .../SiteURIFactoryDetectRoutePathTest.php | 9 +- tests/system/HTTP/SiteURIFactoryTest.php | 14 +- tests/system/HTTP/SiteURITest.php | 14 +- tests/system/HTTP/URITest.php | 32 +-- tests/system/HTTP/UserAgentTest.php | 3 +- .../Array/ArrayHelperDotKeyExistsTest.php | 3 +- .../Array/ArrayHelperRecursiveDiffTest.php | 3 +- .../ArrayHelperSortValuesByNaturalTest.php | 3 +- tests/system/Helpers/ArrayHelperTest.php | 33 +-- tests/system/Helpers/CookieHelperTest.php | 3 +- tests/system/Helpers/DateHelperTest.php | 3 +- tests/system/Helpers/FilesystemHelperTest.php | 3 +- tests/system/Helpers/FormHelperTest.php | 21 +- tests/system/Helpers/HTMLHelperTest.php | 3 +- tests/system/Helpers/InflectorHelperTest.php | 7 +- tests/system/Helpers/NumberHelperTest.php | 3 +- tests/system/Helpers/SecurityHelperTest.php | 3 +- tests/system/Helpers/TextHelperTest.php | 3 +- .../Helpers/URLHelper/CurrentUrlTest.php | 18 +- .../system/Helpers/URLHelper/MiscUrlTest.php | 69 ++----- .../Helpers/URLHelper/SiteUrlCliTest.php | 9 +- .../system/Helpers/URLHelper/SiteUrlTest.php | 9 +- tests/system/Helpers/XMLHelperTest.php | 3 +- tests/system/HomeTest.php | 3 +- tests/system/Honeypot/HoneypotTest.php | 6 +- .../HotReloader/DirectoryHasherTest.php | 3 +- tests/system/I18n/TimeDifferenceTest.php | 3 +- tests/system/I18n/TimeLegacyTest.php | 7 +- tests/system/I18n/TimeTest.php | 7 +- tests/system/Images/BaseHandlerTest.php | 3 +- tests/system/Images/GDHandlerTest.php | 3 +- .../system/Images/ImageMagickHandlerTest.php | 10 +- tests/system/Images/ImageTest.php | 3 +- tests/system/Language/LanguageTest.php | 6 +- .../Log/Handlers/ChromeLoggerHandlerTest.php | 3 +- .../Log/Handlers/ErrorlogHandlerTest.php | 3 +- tests/system/Log/Handlers/FileHandlerTest.php | 3 +- tests/system/Log/LoggerTest.php | 3 +- tests/system/Models/AffectedRowsTest.php | 3 +- tests/system/Models/CountAllModelTest.php | 3 +- .../system/Models/DataConverterModelTest.php | 3 +- tests/system/Models/DeleteModelTest.php | 18 +- tests/system/Models/EventsModelTest.php | 3 +- tests/system/Models/FindModelTest.php | 12 +- tests/system/Models/GeneralModelTest.php | 3 +- tests/system/Models/GetCompiledModelTest.php | 3 +- tests/system/Models/InsertModelTest.php | 3 +- .../system/Models/MiscellaneousModelTest.php | 3 +- tests/system/Models/PaginateModelTest.php | 3 +- tests/system/Models/ReplaceModelTest.php | 3 +- tests/system/Models/SaveModelTest.php | 3 +- tests/system/Models/TimestampModelTest.php | 3 +- tests/system/Models/UpdateModelTest.php | 6 +- .../Models/ValidationModelRuleGroupTest.php | 3 +- tests/system/Models/ValidationModelTest.php | 3 +- tests/system/Models/WhenWhenNotModelTest.php | 3 +- tests/system/Pager/PagerRendererTest.php | 3 +- tests/system/Pager/PagerTest.php | 6 +- .../system/Publisher/ContentReplacerTest.php | 3 +- .../Publisher/PublisherContentReplaceTest.php | 3 +- tests/system/Publisher/PublisherInputTest.php | 3 +- .../system/Publisher/PublisherOutputTest.php | 3 +- .../Publisher/PublisherRestrictionsTest.php | 11 +- .../system/Publisher/PublisherSupportTest.php | 3 +- .../system/RESTful/ResourceControllerTest.php | 9 +- .../system/RESTful/ResourcePresenterTest.php | 9 +- .../system/Router/AutoRouterImprovedTest.php | 11 +- .../Router/DefinedRouteCollectorTest.php | 3 +- .../RouteCollectionReverseRouteTest.php | 7 +- tests/system/Router/RouteCollectionTest.php | 17 +- tests/system/Router/RouterTest.php | 7 +- tests/system/Security/CheckPhpIniTest.php | 3 +- .../SecurityCSRFCookieRandomizeTokenTest.php | 3 +- .../SecurityCSRFSessionRandomizeTokenTest.php | 9 +- .../Security/SecurityCSRFSessionTest.php | 9 +- tests/system/Security/SecurityTest.php | 6 +- .../Handlers/Database/MySQLiHandlerTest.php | 3 +- .../Handlers/Database/PostgreHandlerTest.php | 3 +- .../Handlers/Database/RedisHandlerTest.php | 10 +- tests/system/Session/SessionTest.php | 9 +- tests/system/SparkTest.php | 3 +- tests/system/SuperglobalsTest.php | 3 +- tests/system/Test/BootstrapFCPATHTest.php | 3 +- tests/system/Test/ControllerTestTraitTest.php | 9 +- tests/system/Test/DOMParserTest.php | 9 +- tests/system/Test/FabricatorTest.php | 3 +- .../FeatureTestAutoRoutingImprovedTest.php | 3 +- tests/system/Test/FeatureTestTraitTest.php | 6 +- tests/system/Test/FilterTestTraitTest.php | 3 +- tests/system/Test/IniTestTraitTest.php | 3 +- tests/system/Test/ReflectionHelperTest.php | 3 +- tests/system/Test/TestCaseEmissionsTest.php | 16 +- tests/system/Test/TestCaseTest.php | 3 +- tests/system/Test/TestLoggerTest.php | 7 +- tests/system/Test/TestResponseTest.php | 11 +- tests/system/Throttle/ThrottleTest.php | 7 +- tests/system/Typography/TypographyTest.php | 3 +- .../system/Validation/CreditCardRulesTest.php | 7 +- .../Validation/DatabaseRelatedRulesTest.php | 3 +- .../system/Validation/DotArrayFilterTest.php | 3 +- tests/system/Validation/FileRulesTest.php | 3 +- tests/system/Validation/FormatRulesTest.php | 96 +++------ tests/system/Validation/RulesTest.php | 97 +++------ .../StrictRules/CreditCardRulesTest.php | 7 +- .../StrictRules/DatabaseRelatedRulesTest.php | 3 +- .../Validation/StrictRules/FileRulesTest.php | 3 +- .../StrictRules/FormatRulesTest.php | 3 +- .../Validation/StrictRules/RulesTest.php | 27 +-- .../Validation/StrictRules/ValidationTest.php | 3 +- tests/system/Validation/ValidationTest.php | 28 +-- tests/system/View/CellTest.php | 3 +- tests/system/View/ControlledCellTest.php | 3 +- tests/system/View/DecoratorsTest.php | 3 +- tests/system/View/ParserFilterTest.php | 3 +- tests/system/View/ParserPluginTest.php | 12 +- tests/system/View/ParserTest.php | 6 +- tests/system/View/TableTest.php | 19 +- tests/system/View/ViewTest.php | 3 +- 324 files changed, 724 insertions(+), 1549 deletions(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 521cddf17deb..478b266693e8 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -43,7 +43,8 @@ $overrides = [ // for updating to coding-standard - 'modernize_strpos' => true, + 'modernize_strpos' => true, + 'php_unit_attributes' => true, ]; $options = [ diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index 57b93738a859..f46f526120e0 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -31,7 +31,8 @@ $overrides = [ // for updating to coding-standard - 'modernize_strpos' => true, + 'modernize_strpos' => true, + 'php_unit_attributes' => true, ]; $options = [ diff --git a/.php-cs-fixer.tests.php b/.php-cs-fixer.tests.php index 386ebd5a7a82..404959f26fce 100644 --- a/.php-cs-fixer.tests.php +++ b/.php-cs-fixer.tests.php @@ -36,7 +36,8 @@ $overrides = [ 'void_return' => true, // for updating to coding-standard - 'modernize_strpos' => true, + 'modernize_strpos' => true, + 'php_unit_attributes' => true, ]; $options = [ diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 9fb1ec265e19..5356cef28d93 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -40,7 +40,8 @@ 'leading_backslash_in_global_namespace' => true, ], // for updating to coding-standard - 'modernize_strpos' => true, + 'modernize_strpos' => true, + 'php_unit_attributes' => true, ]; $options = [ diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index b54f3037b247..357acf1ad0ef 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -28,9 +28,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ResponseTraitTest extends CIUnitTestCase { private ?MockIncomingRequest $request = null; diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 8a2277ec8931..83f49e499beb 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -19,11 +19,9 @@ /** * @internal - * - * @coversNothing - * - * @group AutoReview */ +#[\PHPUnit\Framework\Attributes\CoversNothing] +#[\PHPUnit\Framework\Attributes\Group('AutoReview')] final class ComposerJsonTest extends TestCase { private array $devComposer; diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php index bb50b8d5f185..346be42e736e 100644 --- a/tests/system/AutoReview/FrameworkCodeTest.php +++ b/tests/system/AutoReview/FrameworkCodeTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group AutoReview */ +#[\PHPUnit\Framework\Attributes\Group('AutoReview')] final class FrameworkCodeTest extends TestCase { /** @@ -41,10 +40,9 @@ final class FrameworkCodeTest extends TestCase ]; /** - * @dataProvider provideEachTestClassHasCorrectGroupAnnotation - * * @param class-string $class */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEachTestClassHasCorrectGroupAnnotation')] public function testEachTestClassHasCorrectGroupAnnotation(string $class): void { $reflection = new ReflectionClass($class); diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index b0e7852c2910..08432101eb3b 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -27,9 +27,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class AutoloaderTest extends CIUnitTestCase { use ReflectionHelper; @@ -390,10 +389,8 @@ public function testAutoloaderLoadsNonClassFiles(): void $loader->unregister(); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testLoadHelpers(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/Autoloader/FileLocatorCachedTest.php b/tests/system/Autoloader/FileLocatorCachedTest.php index a10f1f30781b..5348207f9aa7 100644 --- a/tests/system/Autoloader/FileLocatorCachedTest.php +++ b/tests/system/Autoloader/FileLocatorCachedTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileLocatorCachedTest extends FileLocatorTest { private FileVarExportHandler $handler; diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php index 869c6b36090a..38d2eb98f751 100644 --- a/tests/system/Autoloader/FileLocatorTest.php +++ b/tests/system/Autoloader/FileLocatorTest.php @@ -21,9 +21,9 @@ /** * @internal * - * @group Others * @no-final */ +#[\PHPUnit\Framework\Attributes\Group('Others')] class FileLocatorTest extends CIUnitTestCase { protected FileLocatorInterface $locator; diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index f0dadef1763d..062ffda752da 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CLITest extends CIUnitTestCase { use StreamFilterTrait; @@ -452,12 +451,11 @@ public function testWindow(): void } /** - * @dataProvider provideTable - * * @param array $tbody * @param array $thead * @param array $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideTable')] public function testTable($tbody, $thead, $expected): void { CLI::table($tbody, $thead); diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php index 54f0ff4a6813..b0100693344c 100644 --- a/tests/system/CLI/ConsoleTest.php +++ b/tests/system/CLI/ConsoleTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ConsoleTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php index b358a1eb1eb7..4694dd98fb20 100644 --- a/tests/system/Cache/CacheFactoryTest.php +++ b/tests/system/Cache/CacheFactoryTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CacheFactoryTest extends CIUnitTestCase { private static string $directory = 'CacheFactory'; diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php index 451f7fe7c459..4275bc16bffd 100644 --- a/tests/system/Cache/CacheMockTest.php +++ b/tests/system/Cache/CacheMockTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CacheMockTest extends CIUnitTestCase { public function testMockReturnsMockCacheClass(): void diff --git a/tests/system/Cache/FactoriesCacheFileHandlerTest.php b/tests/system/Cache/FactoriesCacheFileHandlerTest.php index eea51d1f87f9..9cd3e1f182e6 100644 --- a/tests/system/Cache/FactoriesCacheFileHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileHandlerTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FactoriesCacheFileHandlerTest extends FactoriesCacheFileVarExportHandlerTest { /** diff --git a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php index 1566862c2ff9..0d1fe0b4446b 100644 --- a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php @@ -21,9 +21,8 @@ /** * @internal * @no-final - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] class FactoriesCacheFileVarExportHandlerTest extends CIUnitTestCase { protected FactoriesCache $cache; diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php index 49462ffbe04e..02e6c9907c1b 100644 --- a/tests/system/Cache/Handlers/BaseHandlerTest.php +++ b/tests/system/Cache/Handlers/BaseHandlerTest.php @@ -19,16 +19,14 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseHandlerTest extends CIUnitTestCase { /** - * @dataProvider provideValidateKeyInvalidType - * * @param mixed $input */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidateKeyInvalidType')] public function testValidateKeyInvalidType($input): void { $this->expectException('InvalidArgumentException'); diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php index c30c99da733e..363882bfb818 100644 --- a/tests/system/Cache/Handlers/DummyHandlerTest.php +++ b/tests/system/Cache/Handlers/DummyHandlerTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DummyHandlerTest extends CIUnitTestCase { private DummyHandler $handler; diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index 67aa170c75f5..927c2a912fc3 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileHandlerTest extends AbstractHandlerTestCase { private static string $directory = 'FileHandler'; @@ -86,9 +85,8 @@ public function testNew(): void /** * chmod('path', 0444) does not work on Windows - * - * @requires OS Linux|Darwin */ + #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] public function testNewWithNonWritablePath(): void { $this->expectException(CacheException::class); @@ -145,9 +143,8 @@ public function testRemember(): void /** * chmod('path', 0444) does not work on Windows - * - * @requires OS Linux|Darwin */ + #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); @@ -309,13 +306,8 @@ public function testIsSupported(): void $this->assertTrue($this->handler->isSupported()); } - /** - * @dataProvider provideSaveMode - * - * permissions given on Windows are fixed to `0666` - * - * @requires OS Linux|Darwin - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSaveMode')] + #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] public function testSaveMode(int $int, string $string): void { // Initialize mode diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index 06ee0c567239..a5aca356aa90 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -19,10 +19,9 @@ use Exception; /** - * @group CacheLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('CacheLive')] final class MemcachedHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php index 59e68346517b..209c7ea45509 100644 --- a/tests/system/Cache/Handlers/PredisHandlerTest.php +++ b/tests/system/Cache/Handlers/PredisHandlerTest.php @@ -18,10 +18,9 @@ use Config\Cache; /** - * @group CacheLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('CacheLive')] final class PredisHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php index c8182111971a..39e194a82bf1 100644 --- a/tests/system/Cache/Handlers/RedisHandlerTest.php +++ b/tests/system/Cache/Handlers/RedisHandlerTest.php @@ -18,10 +18,9 @@ use Config\Cache; /** - * @group CacheLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('CacheLive')] final class RedisHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index 059ad7d8f905..5acdc756d24b 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -26,12 +26,10 @@ use Exception; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ResponseCacheTest extends CIUnitTestCase { private AppConfig $appConfig; diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index fadfe365307a..f0680cec2a85 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -34,14 +34,11 @@ use Tests\Support\Filters\RedirectFilter; /** - * @runTestsInSeparateProcesses - * - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CodeIgniterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; @@ -839,10 +836,9 @@ public function testPageCacheSendSecureHeaders(): void /** * @param array|bool $cacheQueryStringValue * - * @dataProvider providePageCacheWithCacheQueryString - * * @see https://github.com/codeigniter4/CodeIgniter4/pull/6410 */ + #[\PHPUnit\Framework\Attributes\DataProvider('providePageCacheWithCacheQueryString')] public function testPageCacheWithCacheQueryString( $cacheQueryStringValue, int $expectedPagesInCache, diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php index 7c5aba288db5..2ca2138a6b9a 100644 --- a/tests/system/Commands/BaseCommandTest.php +++ b/tests/system/Commands/BaseCommandTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseCommandTest extends CIUnitTestCase { private Logger $logger; diff --git a/tests/system/Commands/CellGeneratorTest.php b/tests/system/Commands/CellGeneratorTest.php index 84c7a0243be7..e13fa624f5c2 100644 --- a/tests/system/Commands/CellGeneratorTest.php +++ b/tests/system/Commands/CellGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CellGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php index 7e669cc9c851..0f68a8229a6b 100644 --- a/tests/system/Commands/ClearCacheTest.php +++ b/tests/system/Commands/ClearCacheTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ClearCacheTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php index 1e86406f7054..6c17d5c28a3c 100644 --- a/tests/system/Commands/ClearDebugbarTest.php +++ b/tests/system/Commands/ClearDebugbarTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ClearDebugbarTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php index afdd7a56541c..247b3fe1f6f3 100644 --- a/tests/system/Commands/ClearLogsTest.php +++ b/tests/system/Commands/ClearLogsTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ClearLogsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php index a661f4a7783b..0efb8b80352f 100644 --- a/tests/system/Commands/CommandGeneratorTest.php +++ b/tests/system/Commands/CommandGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CommandGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php index 3a0c0adfbd7d..02bcd465c542 100644 --- a/tests/system/Commands/CommandTest.php +++ b/tests/system/Commands/CommandTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CommandTest extends CIUnitTestCase { use StreamFilterTrait; @@ -129,9 +128,7 @@ public function testInexistentCommandsButWithManyAlternatives(): void $this->assertStringContainsString(':clear', $this->getBuffer()); } - /** - * @dataProvider provideCommandParsesArgsCorrectly - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCommandParsesArgsCorrectly')] public function testCommandParsesArgsCorrectly(string $input, array $expected): void { ParamsReveal::$args = null; diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php index c4e9f644a71f..145b7e7af1cc 100644 --- a/tests/system/Commands/ConfigGeneratorTest.php +++ b/tests/system/Commands/ConfigGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ConfigGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php index 3fbec68b0c89..23b6b6424732 100644 --- a/tests/system/Commands/ConfigurableSortImportsTest.php +++ b/tests/system/Commands/ConfigurableSortImportsTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ConfigurableSortImportsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php index e13c8aec839e..5e86a0bbb337 100644 --- a/tests/system/Commands/ControllerGeneratorTest.php +++ b/tests/system/Commands/ControllerGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControllerGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php index 790b0c6c57b0..8bc4489533e9 100644 --- a/tests/system/Commands/CreateDatabaseTest.php +++ b/tests/system/Commands/CreateDatabaseTest.php @@ -22,10 +22,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class CreateDatabaseTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Database/MigrateStatusTest.php b/tests/system/Commands/Database/MigrateStatusTest.php index 33b7edde379d..9fc3cd370b6b 100644 --- a/tests/system/Commands/Database/MigrateStatusTest.php +++ b/tests/system/Commands/Database/MigrateStatusTest.php @@ -19,10 +19,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MigrateStatusTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php index f6f66bc223b4..44130bd6b6d4 100644 --- a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php +++ b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php @@ -19,10 +19,9 @@ use CodeIgniter\Test\Mock\MockInputOutput; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ShowTableInfoMockIOTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php index 79972377f1e6..97dbc26b5bf5 100644 --- a/tests/system/Commands/Database/ShowTableInfoTest.php +++ b/tests/system/Commands/Database/ShowTableInfoTest.php @@ -21,10 +21,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ShowTableInfoTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php index 8a28ebf5fe86..5df1e5ba761d 100644 --- a/tests/system/Commands/DatabaseCommandsTest.php +++ b/tests/system/Commands/DatabaseCommandsTest.php @@ -17,10 +17,9 @@ use CodeIgniter\Test\StreamFilterTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseCommandsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php index fd84207f8f14..b5c35c809adb 100644 --- a/tests/system/Commands/EntityGeneratorTest.php +++ b/tests/system/Commands/EntityGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EntityGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php index d087fdda64f1..54a6fe2fae00 100644 --- a/tests/system/Commands/EnvironmentCommandTest.php +++ b/tests/system/Commands/EnvironmentCommandTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EnvironmentCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php index de543936293b..52bf0edae044 100644 --- a/tests/system/Commands/FilterCheckTest.php +++ b/tests/system/Commands/FilterCheckTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilterCheckTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php index fbb911ab2624..80a7bbb6a981 100644 --- a/tests/system/Commands/FilterGeneratorTest.php +++ b/tests/system/Commands/FilterGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilterGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php index 80d0879bc958..42d27c7604c9 100644 --- a/tests/system/Commands/GenerateKeyTest.php +++ b/tests/system/Commands/GenerateKeyTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class GenerateKeyTest extends CIUnitTestCase { use StreamFilterTrait; @@ -86,10 +85,8 @@ public function testGenerateKeyShowsEncodedKey(): void $this->assertStringContainsString('hex2bin:', $this->getBuffer()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testGenerateKeyCreatesNewKey(): void { command('key:generate'); diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php index 3f4bffb95a77..5677c5daba73 100644 --- a/tests/system/Commands/GeneratorsTest.php +++ b/tests/system/Commands/GeneratorsTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GeneratorsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php index 91832e44e7b2..3370f14f0f92 100644 --- a/tests/system/Commands/HelpCommandTest.php +++ b/tests/system/Commands/HelpCommandTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HelpCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php index f587f63ffeb1..c894d0ce24e0 100644 --- a/tests/system/Commands/InfoCacheTest.php +++ b/tests/system/Commands/InfoCacheTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class InfoCacheTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php index 148faed28d1e..302fdafc544e 100644 --- a/tests/system/Commands/MigrationGeneratorTest.php +++ b/tests/system/Commands/MigrationGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class MigrationGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php index ba9c3c93d923..75c5cc00ea44 100644 --- a/tests/system/Commands/MigrationIntegrationTest.php +++ b/tests/system/Commands/MigrationIntegrationTest.php @@ -17,10 +17,9 @@ use CodeIgniter\Test\StreamFilterTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MigrationIntegrationTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php index 4f780740a7cc..c78f29a41010 100644 --- a/tests/system/Commands/ModelGeneratorTest.php +++ b/tests/system/Commands/ModelGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ModelGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php index 67ad141735d4..c44f7bb6cbad 100644 --- a/tests/system/Commands/PublishCommandTest.php +++ b/tests/system/Commands/PublishCommandTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublishCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 634078e98409..4260d6885208 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RoutesTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php index 92cba333448f..28682b5c53a4 100644 --- a/tests/system/Commands/ScaffoldGeneratorTest.php +++ b/tests/system/Commands/ScaffoldGeneratorTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ScaffoldGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php index 2ac08d508c71..278244217640 100644 --- a/tests/system/Commands/SeederGeneratorTest.php +++ b/tests/system/Commands/SeederGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SeederGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/TestGeneratorTest.php b/tests/system/Commands/TestGeneratorTest.php index 8ffe89c3de55..5a8936d7dee6 100644 --- a/tests/system/Commands/TestGeneratorTest.php +++ b/tests/system/Commands/TestGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TestGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Translation/LocalizationFinderTest.php b/tests/system/Commands/Translation/LocalizationFinderTest.php index 722a812785ac..60046829b801 100644 --- a/tests/system/Commands/Translation/LocalizationFinderTest.php +++ b/tests/system/Commands/Translation/LocalizationFinderTest.php @@ -20,10 +20,9 @@ use Locale; /** - * @group Others - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class LocalizationFinderTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/ConfigCheckTest.php b/tests/system/Commands/Utilities/ConfigCheckTest.php index b7e3890a5e61..d5fcf9b20498 100644 --- a/tests/system/Commands/Utilities/ConfigCheckTest.php +++ b/tests/system/Commands/Utilities/ConfigCheckTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ConfigCheckTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index fae294afb2ff..198a1a710c7e 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class NamespacesTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index c1e8f81f3d4f..25fd288bd5e1 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class AutoRouteCollectorTest extends CIUnitTestCase { public function testGet(): void diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index f906a9298505..cf1e9e0a5e61 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class AutoRouteCollectorTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php index dd60518b57d9..ee9e339283ad 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControllerMethodReaderTest extends CIUnitTestCase { private function createControllerMethodReader( diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php index 90160f39a194..ee74ca9dcdce 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControllerFinderTest extends CIUnitTestCase { public function testFind(): void diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php index 6e01ba162331..d48e470e8dd6 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControllerMethodReaderTest extends CIUnitTestCase { public function testRead(): void diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php index b4925efa936a..d213c2eb5b50 100644 --- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilterCollectorTest extends CIUnitTestCase { public function testGet(): void diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php index 495fbb46f31b..492686122e80 100644 --- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php @@ -32,9 +32,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilterFinderTest extends CIUnitTestCase { use ConfigFromArrayTrait; diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php index e075f984aa6b..ddae1636396f 100644 --- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php +++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php @@ -18,14 +18,11 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SampleURIGeneratorTest extends CIUnitTestCase { - /** - * @dataProvider provideGet - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGet')] public function testGet(string $routeKey, string $expected): void { $generator = new SampleURIGenerator(); diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php index 4a853fb61c54..7fd20feeaa6d 100644 --- a/tests/system/Commands/ValidationGeneratorTest.php +++ b/tests/system/Commands/ValidationGeneratorTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ValidationGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php index ee4090264da2..6e0b8b342451 100644 --- a/tests/system/CommonFunctionsSendTest.php +++ b/tests/system/CommonFunctionsSendTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class CommonFunctionsSendTest extends CIUnitTestCase { protected function setUp(): void @@ -36,10 +35,9 @@ protected function setUp(): void /** * Make sure cookies are set by RedirectResponse this way * See https://github.com/codeigniter4/CodeIgniter4/issues/1393 - * - * @runInSeparateProcess - * @preserveGlobalState disabled */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRedirectResponseCookiesSent(): void { $loginTime = time(); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 7e1e9d27c349..b57458414fa7 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -46,12 +46,10 @@ use Tests\Support\Models\JobModel; /** - * @backupGlobals enabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class CommonFunctionsTest extends CIUnitTestCase { private ?App $config = null; @@ -269,10 +267,8 @@ public function testEscapeRecursiveArrayRaw(): void $this->assertSame($data, esc($data, 'raw')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSessionInstance(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -284,10 +280,8 @@ public function testSessionInstance(): void $this->assertInstanceOf(Session::class, session()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSessionVariable(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -301,10 +295,8 @@ public function testSessionVariable(): void $this->assertSame('Hi there', session('notbogus')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSessionVariableNotThere(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -429,10 +421,8 @@ public function testModelExistsAbsoluteClassname(): void $this->assertInstanceOf(JobModel::class, model(JobModel::class)); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testOldInput(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -468,10 +458,8 @@ public function testOldInput(): void $this->assertSame('fritz', old('zibble')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testOldInputSerializeData(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -507,10 +495,9 @@ public function testOldInputSerializeData(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 - * - * @runInSeparateProcess - * @preserveGlobalState disabled */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testOldInputArray(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -628,10 +615,8 @@ public function testRedirectResponseCookies1(): void $this->assertTrue($answer1->hasCookie('login_time')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testTrace(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -655,10 +640,8 @@ public function testViewNotSaveData(): void $this->assertStringContainsString('

        is_not

        ', view('\Tests\Support\View\Views\simples')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testForceHttpsNullRequestAndResponse(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -709,11 +692,10 @@ public function testForceHttpsWithBaseUrlSubFolder(): void } /** - * @dataProvider provideCleanPathActuallyCleaningThePaths - * * @param mixed $input * @param mixed $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCleanPathActuallyCleaningThePaths')] public function testCleanPathActuallyCleaningThePaths($input, $expected): void { $this->assertSame($expected, clean_path($input)); @@ -774,10 +756,8 @@ public function testDWithCSP(): void Kint::$cli_detection = $cliDetection; } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testTraceWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php index 5195412db940..e0d51327a525 100644 --- a/tests/system/CommonHelperTest.php +++ b/tests/system/CommonHelperTest.php @@ -22,11 +22,9 @@ /** * @internal - * - * @group Others - * - * @covers ::helper */ +#[\PHPUnit\Framework\Attributes\Group('Others')] +#[\PHPUnit\Framework\Attributes\CoversFunction('helper')] final class CommonHelperTest extends CIUnitTestCase { private array $dummyHelpers = [ diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php index 13344db12142..f85d8101a0c6 100644 --- a/tests/system/CommonSingleServiceTest.php +++ b/tests/system/CommonSingleServiceTest.php @@ -23,14 +23,11 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CommonSingleServiceTest extends CIUnitTestCase { - /** - * @dataProvider provideServiceNames - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideServiceNames')] public function testSingleServiceWithNoParamsSupplied(string $service): void { Services::injectMock('security', new MockSecurity(new SecurityConfig())); @@ -44,9 +41,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void $this->assertNotSame($service1, $service2); } - /** - * @dataProvider provideServiceNames - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideServiceNames')] public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void { if ($service === 'commands') { diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 1b59fc623e52..f17dc71fb6c5 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -26,9 +26,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class BaseConfigTest extends CIUnitTestCase { private string $fixturesFolder; @@ -99,10 +98,8 @@ public function testUseDefaultValueTypeStringValue(): void $this->assertSame('123456', $config->password); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testServerValues(): void { $_SERVER = [ @@ -195,10 +192,8 @@ public function testSetsDefaultValues(): void $this->assertSame('bar', $config->second); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -210,10 +205,8 @@ public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void $this->assertSame('OpenSSL', $config->driver); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSetDefaultValuesEncryptionUsingBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php index d5ad1448a036..9e47578206ed 100644 --- a/tests/system/Config/DotEnvTest.php +++ b/tests/system/Config/DotEnvTest.php @@ -19,12 +19,10 @@ use TypeError; /** - * @backupGlobals enabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class DotEnvTest extends CIUnitTestCase { private ?vfsStreamDirectory $root; @@ -62,9 +60,7 @@ public function testReturnsFalseIfCannotFindFile(): void $this->assertFalse($dotenv->load()); } - /** - * @dataProvider provideLoadsVars - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideLoadsVars')] public function testLoadsVars(string $expected, string $varname): void { $dotenv = new DotEnv($this->fixturesFolder); @@ -88,10 +84,8 @@ public static function provideLoadsVars(): iterable ]; } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testLoadsHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -102,10 +96,8 @@ public function testLoadsHex2Bin(): void $this->assertSame('OpenSSL', getenv('encryption.driver')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testLoadsBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index dfca8511ada5..dbb2aec291da 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -28,9 +28,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FactoriesTest extends CIUnitTestCase { protected function setUp(): void @@ -438,9 +437,7 @@ public function testGetComponentInstances() return $data; } - /** - * @depends testGetComponentInstances - */ + #[\PHPUnit\Framework\Attributes\Depends('testGetComponentInstances')] public function testSetComponentInstances(array $data) { $before = Factories::getComponentInstances('config'); @@ -457,9 +454,7 @@ public function testSetComponentInstances(array $data) return $data; } - /** - * @depends testSetComponentInstances - */ + #[\PHPUnit\Framework\Attributes\Depends('testSetComponentInstances')] public function testIsUpdated(array $data): void { Factories::reset(); diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php index bc500caaa2fa..daa377ff9e34 100644 --- a/tests/system/Config/MimesTest.php +++ b/tests/system/Config/MimesTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class MimesTest extends CIUnitTestCase { public static function provideGuessExtensionFromType(): iterable @@ -49,9 +48,7 @@ public static function provideGuessExtensionFromType(): iterable ]; } - /** - * @dataProvider provideGuessExtensionFromType - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGuessExtensionFromType')] public function testGuessExtensionFromType(?string $expected, string $mime): void { $this->assertSame($expected, Mimes::guessExtensionFromType($mime)); @@ -83,9 +80,7 @@ public static function provideGuessTypeFromExtension(): iterable ]; } - /** - * @dataProvider provideGuessTypeFromExtension - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGuessTypeFromExtension')] public function testGuessTypeFromExtension(?string $expected, string $ext): void { $this->assertSame($expected, Mimes::guessTypeFromExtension($ext)); diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 24d2afb7302e..177091dc5c07 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -51,9 +51,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ServicesTest extends CIUnitTestCase { private array $original; @@ -241,30 +240,24 @@ public function testNewViewcell(): void $this->assertInstanceOf(Cell::class, $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testNewSession(): void { $actual = Services::session(); $this->assertInstanceOf(Session::class, $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testNewSessionWithNullConfig(): void { $actual = Services::session(null, false); $this->assertInstanceOf(Session::class, $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testCallStatic(): void { // __callStatic should kick in for this but fail @@ -275,10 +268,8 @@ public function testCallStatic(): void $this->assertInstanceOf(Session::class, $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testCallStaticDirectly(): void { // $actual = \CodeIgniter\Config\Services::SeSsIoN(null, false); // original @@ -286,10 +277,8 @@ public function testCallStaticDirectly(): void $this->assertInstanceOf(Session::class, $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testMockInjection(): void { Services::injectMock('response', new MockResponse(new App())); @@ -308,10 +297,8 @@ public function testMockInjection(): void $this->assertSame($response, $response3); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testReset(): void { Services::injectMock('response', new MockResponse(new App())); @@ -327,10 +314,8 @@ public function testReset(): void $this->assertNotSame($response2, $response); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testResetSingle(): void { Services::injectMock('response', new MockResponse(new App())); diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php index 00a144e1b01c..30505f0f711a 100644 --- a/tests/system/ControllerTest.php +++ b/tests/system/ControllerTest.php @@ -32,12 +32,10 @@ * Not a lot of business logic, so concentrate on making sure * we can exercise everything without blowing up :-/ * - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControllerTest extends CIUnitTestCase { private App $config; diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php index a7014b9a0997..22f01169e28b 100644 --- a/tests/system/Cookie/CookieStoreTest.php +++ b/tests/system/Cookie/CookieStoreTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CookieStoreTest extends CIUnitTestCase { private array $defaults; diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index bdb9b7498f94..a7bf0b7790a8 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CookieTest extends CIUnitTestCase { private array $defaults; @@ -80,9 +79,7 @@ public function testConfigInjectionForDefaults(): void Cookie::setDefaults($old); } - /** - * @dataProvider provideConfigPrefix - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideConfigPrefix')] public function testConfigPrefix(string $configPrefix, string $optionPrefix, string $expected): void { $config = new CookieConfig(); @@ -167,10 +164,9 @@ public function testExpirationTime(): void } /** - * @dataProvider provideInvalidExpires - * * @param bool|float|string $expires */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidExpires')] public function testInvalidExpires($expires): void { $this->expectException(CookieException::class); @@ -190,9 +186,7 @@ public static function provideInvalidExpires(): iterable } } - /** - * @dataProvider provideSetCookieHeaderCreation - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSetCookieHeaderCreation')] public function testSetCookieHeaderCreation(string $header, array $changed): void { $cookie = Cookie::fromHeaderString($header); diff --git a/tests/system/DataConverter/DataConverterTest.php b/tests/system/DataConverter/DataConverterTest.php index e5ae5e7abe90..f2c36a4dbd56 100644 --- a/tests/system/DataConverter/DataConverterTest.php +++ b/tests/system/DataConverter/DataConverterTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DataConverterTest extends CIUnitTestCase { public function testInstantiate(): void @@ -39,9 +38,7 @@ public function testInstantiate(): void $this->assertInstanceOf(DataConverter::class, $converter); } - /** - * @dataProvider provideConvertDataFromDB - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDataFromDB')] public function testConvertDataFromDB(array $types, array $dbData, array $expected): void { $converter = $this->createDataConverter($types); @@ -51,9 +48,7 @@ public function testConvertDataFromDB(array $types, array $dbData, array $expect $this->assertSame($expected, $data); } - /** - * @dataProvider provideConvertDataToDB - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDataToDB')] public function testConvertDataToDB(array $types, array $phpData, array $expected): void { $converter = $this->createDataConverter($types); diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php index 6c7624ce795a..38bc943b2e47 100644 --- a/tests/system/Database/BaseConnectionTest.php +++ b/tests/system/Database/BaseConnectionTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseConnectionTest extends CIUnitTestCase { private array $options = [ @@ -180,9 +179,8 @@ public function testMagicGetMissing(): void /** * These tests are intended to confirm the current behavior. * We do not know if all of these are the correct behavior. - * - * @dataProvider provideProtectIdentifiers */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideProtectIdentifiers')] public function testProtectIdentifiers( bool $prefixSingle, bool $protectIdentifiers, @@ -286,9 +284,8 @@ public static function provideProtectIdentifiers(): iterable /** * These tests are intended to confirm the current behavior. - * - * @dataProvider provideEscapeIdentifiers */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEscapeIdentifiers')] public function testEscapeIdentifiers(string $item, string $expected): void { $db = new MockConnection($this->options); @@ -310,9 +307,7 @@ public static function provideEscapeIdentifiers(): iterable ]; } - /** - * @dataProvider provideEscapeIdentifier - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEscapeIdentifier')] public function testEscapeIdentifier(string $item, string $expected): void { $db = new MockConnection($this->options); diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php index d4685ae2e989..16e640d1b257 100644 --- a/tests/system/Database/BaseQueryTest.php +++ b/tests/system/Database/BaseQueryTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseQueryTest extends CIUnitTestCase { protected $db; @@ -185,11 +184,10 @@ public static function provideIsWriteType(): iterable } /** - * @dataProvider provideIsWriteType - * * @param mixed $expected * @param mixed $sql */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIsWriteType')] public function testIsWriteType($expected, $sql): void { $query = new Query($this->db); @@ -598,11 +596,10 @@ public static function provideHighlightQueryKeywords(): iterable } /** - * @dataProvider provideHighlightQueryKeywords - * * @param mixed $expected * @param mixed $sql */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideHighlightQueryKeywords')] public function testHighlightQueryKeywords($expected, $sql): void { $query = new Query($this->db); diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php index 3e4c88ec9af5..5b5303d3c0d2 100644 --- a/tests/system/Database/Builder/AliasTest.php +++ b/tests/system/Database/Builder/AliasTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class AliasTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php index bcb4bcfb8822..90901597728b 100644 --- a/tests/system/Database/Builder/BaseTest.php +++ b/tests/system/Database/Builder/BaseTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php index 0ba9ac7832e2..2bdf3ea3e63e 100644 --- a/tests/system/Database/Builder/CountTest.php +++ b/tests/system/Database/Builder/CountTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CountTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php index 87cbdf0366fe..9a83941a4806 100644 --- a/tests/system/Database/Builder/DeleteTest.php +++ b/tests/system/Database/Builder/DeleteTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DeleteTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php index 7000a001cde0..5b91f9b90ded 100644 --- a/tests/system/Database/Builder/DistinctTest.php +++ b/tests/system/Database/Builder/DistinctTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DistinctTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php index 176fc8738251..2b2b1c0089ee 100644 --- a/tests/system/Database/Builder/EmptyTest.php +++ b/tests/system/Database/Builder/EmptyTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EmptyTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index e003353c12f8..92f87d6b6571 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FromTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php index 3daf4a6831d6..b483bd4cdf3b 100644 --- a/tests/system/Database/Builder/GetTest.php +++ b/tests/system/Database/Builder/GetTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GetTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php index c6f2b24667b0..e8ddb0d1e2b8 100644 --- a/tests/system/Database/Builder/GroupTest.php +++ b/tests/system/Database/Builder/GroupTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GroupTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index 55faceaa5657..d5f23af92111 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class InsertTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php index 83c7ea4f3ab9..900e43fa45ec 100644 --- a/tests/system/Database/Builder/JoinTest.php +++ b/tests/system/Database/Builder/JoinTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class JoinTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php index 5cdae0729d70..5051b8d1275d 100644 --- a/tests/system/Database/Builder/LikeTest.php +++ b/tests/system/Database/Builder/LikeTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class LikeTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php index 04d4668ec356..14a8523f69f1 100644 --- a/tests/system/Database/Builder/LimitTest.php +++ b/tests/system/Database/Builder/LimitTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class LimitTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php index 1dc4ba4052ae..59a16caecf8b 100644 --- a/tests/system/Database/Builder/OrderTest.php +++ b/tests/system/Database/Builder/OrderTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class OrderTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php index 5ff7ccb720a1..88f6269df230 100644 --- a/tests/system/Database/Builder/PrefixTest.php +++ b/tests/system/Database/Builder/PrefixTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PrefixTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php index 24a68cffff8e..a5ecdbb6ce47 100644 --- a/tests/system/Database/Builder/ReplaceTest.php +++ b/tests/system/Database/Builder/ReplaceTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ReplaceTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php index 6a9c32183afc..48521d299901 100644 --- a/tests/system/Database/Builder/SelectTest.php +++ b/tests/system/Database/Builder/SelectTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SelectTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php index 4cf6d05d1ed9..43ad872188cd 100644 --- a/tests/system/Database/Builder/TruncateTest.php +++ b/tests/system/Database/Builder/TruncateTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TruncateTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/UnionTest.php b/tests/system/Database/Builder/UnionTest.php index d0487259445c..8baad8174399 100644 --- a/tests/system/Database/Builder/UnionTest.php +++ b/tests/system/Database/Builder/UnionTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class UnionTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php index de338111c4a9..2df5a28842d9 100644 --- a/tests/system/Database/Builder/UpdateTest.php +++ b/tests/system/Database/Builder/UpdateTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class UpdateTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/WhenTest.php b/tests/system/Database/Builder/WhenTest.php index b70a8e82e7b9..7d2b07e428a3 100644 --- a/tests/system/Database/Builder/WhenTest.php +++ b/tests/system/Database/Builder/WhenTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class WhenTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index e48f0c6711a9..3afc27932ccc 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class WhereTest extends CIUnitTestCase { /** @@ -403,10 +402,9 @@ public static function provideWhereInvalidKeyThrowInvalidArgumentException(): it } /** - * @dataProvider provideWhereInvalidKeyThrowInvalidArgumentException - * * @param mixed $key */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideWhereInvalidKeyThrowInvalidArgumentException')] public function testWhereInvalidKeyThrowInvalidArgumentException($key): void { $this->expectException('InvalidArgumentException'); @@ -425,10 +423,9 @@ public static function provideWhereInEmptyValuesThrowInvalidArgumentException(): } /** - * @dataProvider provideWhereInEmptyValuesThrowInvalidArgumentException - * * @param mixed $values */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideWhereInEmptyValuesThrowInvalidArgumentException')] public function testWhereInEmptyValuesThrowInvalidArgumentException($values): void { $this->expectException('InvalidArgumentException'); diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php index c35b0f60f202..74ac4a141fdb 100644 --- a/tests/system/Database/ConfigTest.php +++ b/tests/system/Database/ConfigTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ConfigTest extends CIUnitTestCase { use ReflectionHelper; @@ -194,10 +193,9 @@ public function testConnectionGroupWithDSNPostgreNative(): void } /** - * @dataProvider provideConvertDSN - * * @see https://github.com/codeigniter4/CodeIgniter4/issues/7550 */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDSN')] public function testConvertDSN(string $input, string $expected): void { // @TODO This format is for PDO_PGSQL. diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php index 5d0258c57dc2..895d5fc5f6e0 100644 --- a/tests/system/Database/DatabaseSeederTest.php +++ b/tests/system/Database/DatabaseSeederTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DatabaseSeederTest extends CIUnitTestCase { public function testInstantiateNoSeedPath(): void diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php index 597e66aaf967..07affb5e5082 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php @@ -22,10 +22,9 @@ * DatabaseTestCaseMigrationOnce1Test and DatabaseTestCaseMigrationOnce2Test * show $migrateOnce applies per test case file. * - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php index 17def3edec19..c20033eaf980 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php @@ -22,10 +22,9 @@ * DatabaseTestCaseMigrationOnce1Test and DatabaseTestCaseMigrationOnce2Test * show $migrateOnce applies per test case file. * - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php index 3224efe054ce..533a31a5bece 100644 --- a/tests/system/Database/DatabaseTestCaseTest.php +++ b/tests/system/Database/DatabaseTestCaseTest.php @@ -21,10 +21,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseTestCaseTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php index 1e52d348a04b..7ee4f40bd0f8 100644 --- a/tests/system/Database/Forge/CreateTableTest.php +++ b/tests/system/Database/Forge/CreateTableTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CreateTableTest extends CIUnitTestCase { public function testCreateTableWithDefaultRawSql(): void diff --git a/tests/system/Database/Forge/DropForeignKeyTest.php b/tests/system/Database/Forge/DropForeignKeyTest.php index 98acf337b7fb..b788d25247d0 100644 --- a/tests/system/Database/Forge/DropForeignKeyTest.php +++ b/tests/system/Database/Forge/DropForeignKeyTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DropForeignKeyTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php index c55e08a0345e..1abaef6a29fd 100644 --- a/tests/system/Database/Live/AliasTest.php +++ b/tests/system/Database/Live/AliasTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class AliasTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php index c07963cf2b61..b2da47b1fcfe 100644 --- a/tests/system/Database/Live/BadQueryTest.php +++ b/tests/system/Database/Live/BadQueryTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class BadQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php index 777c074ad136..b04cf2fe2e3d 100644 --- a/tests/system/Database/Live/ConnectTest.php +++ b/tests/system/Database/Live/ConnectTest.php @@ -20,10 +20,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ConnectTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php index 0df9132e808a..d475e961f2bc 100644 --- a/tests/system/Database/Live/CountTest.php +++ b/tests/system/Database/Live/CountTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class CountTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php index 8c4c2d4ab4bc..4c1467bc48d2 100644 --- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php +++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseTestTraitCaseTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DbDebugTest.php b/tests/system/Database/Live/DbDebugTest.php index 5939ff0df127..1c878578026a 100644 --- a/tests/system/Database/Live/DbDebugTest.php +++ b/tests/system/Database/Live/DbDebugTest.php @@ -18,10 +18,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DbDebugTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php index ac1aa660cbf4..039ebd926911 100644 --- a/tests/system/Database/Live/DbUtilsTest.php +++ b/tests/system/Database/Live/DbUtilsTest.php @@ -20,10 +20,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DbUtilsTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php index 3a8d10b03020..5ed001c5eb42 100644 --- a/tests/system/Database/Live/DeleteTest.php +++ b/tests/system/Database/Live/DeleteTest.php @@ -21,10 +21,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DeleteTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php index 4790addd9650..88305c57d7ae 100644 --- a/tests/system/Database/Live/EmptyTest.php +++ b/tests/system/Database/Live/EmptyTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class EmptyTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php index 0f931cdbe85c..9f0a76184af1 100644 --- a/tests/system/Database/Live/EscapeTest.php +++ b/tests/system/Database/Live/EscapeTest.php @@ -19,10 +19,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class EscapeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php index 9b161778b0e0..19770bea6a83 100644 --- a/tests/system/Database/Live/FabricatorLiveTest.php +++ b/tests/system/Database/Live/FabricatorLiveTest.php @@ -21,10 +21,9 @@ use Tests\Support\Models\ValidModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class FabricatorLiveTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 8061e80d7241..0fa79a255f5f 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -24,10 +24,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ForgeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php index ee7a429c1f22..312fd5e30416 100644 --- a/tests/system/Database/Live/FromTest.php +++ b/tests/system/Database/Live/FromTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class FromTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php index cea8ef4b0e49..1f2ba9ddcb67 100644 --- a/tests/system/Database/Live/GetNumRowsTest.php +++ b/tests/system/Database/Live/GetNumRowsTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetNumRowsTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php index f666d3aa629d..ce4cfce4a9d2 100644 --- a/tests/system/Database/Live/GetTest.php +++ b/tests/system/Database/Live/GetTest.php @@ -20,10 +20,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetVersionTest.php b/tests/system/Database/Live/GetVersionTest.php index 65cca3e21df9..d6a60f039a9c 100644 --- a/tests/system/Database/Live/GetVersionTest.php +++ b/tests/system/Database/Live/GetVersionTest.php @@ -17,10 +17,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetVersionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php index a242546ebcd0..dda699ba5bf6 100644 --- a/tests/system/Database/Live/GroupTest.php +++ b/tests/system/Database/Live/GroupTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GroupTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php index e6bd52a3b96d..314897454ed9 100644 --- a/tests/system/Database/Live/IncrementTest.php +++ b/tests/system/Database/Live/IncrementTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class IncrementTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php index 265c0b407246..1e6720225a76 100644 --- a/tests/system/Database/Live/InsertTest.php +++ b/tests/system/Database/Live/InsertTest.php @@ -21,10 +21,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class InsertTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php index 046270c5fd5b..979a516e2030 100644 --- a/tests/system/Database/Live/JoinTest.php +++ b/tests/system/Database/Live/JoinTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class JoinTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php index 3b79598e3613..d74544387e09 100644 --- a/tests/system/Database/Live/LikeTest.php +++ b/tests/system/Database/Live/LikeTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class LikeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php index 546096eb9be5..b0f1df6ee6ab 100644 --- a/tests/system/Database/Live/LimitTest.php +++ b/tests/system/Database/Live/LimitTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class LimitTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php index 4d6927f2d800..2e2182fa835a 100644 --- a/tests/system/Database/Live/MetadataTest.php +++ b/tests/system/Database/Live/MetadataTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MetadataTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php index 5b9bc3b16701..478fded783d4 100644 --- a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php @@ -17,10 +17,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/MySQLi/NumberNativeTest.php b/tests/system/Database/Live/MySQLi/NumberNativeTest.php index 5ba37eaf804e..051e64cfad71 100644 --- a/tests/system/Database/Live/MySQLi/NumberNativeTest.php +++ b/tests/system/Database/Live/MySQLi/NumberNativeTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class NumberNativeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MySQLi/RawSqlTest.php b/tests/system/Database/Live/MySQLi/RawSqlTest.php index 84949848b5f3..77aeddfd4ab4 100644 --- a/tests/system/Database/Live/MySQLi/RawSqlTest.php +++ b/tests/system/Database/Live/MySQLi/RawSqlTest.php @@ -20,10 +20,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class RawSqlTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php index c2f2b377387e..8ce809c29af8 100644 --- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php +++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php @@ -17,10 +17,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class CallStoredProcedureTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php index 809a58e30264..074b77d4e8bc 100644 --- a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php @@ -19,10 +19,9 @@ use stdClass; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php index eef3be40bc85..9b6e46ebc713 100644 --- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php +++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class LastInsertIDTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php index 9109c88f066a..9057fb172032 100644 --- a/tests/system/Database/Live/OrderTest.php +++ b/tests/system/Database/Live/OrderTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class OrderTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php index 04adeb0bda53..ea80dbb6d5f4 100644 --- a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php @@ -17,10 +17,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php index cf9bf4d24d67..0cd0c23d597e 100644 --- a/tests/system/Database/Live/PreparedQueryTest.php +++ b/tests/system/Database/Live/PreparedQueryTest.php @@ -23,10 +23,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class PreparedQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php index e915cd7ff567..f6cb14fc9467 100644 --- a/tests/system/Database/Live/PretendTest.php +++ b/tests/system/Database/Live/PretendTest.php @@ -18,10 +18,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class PretendTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php index 05f77981cff0..2c074bd57d4d 100644 --- a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php @@ -17,10 +17,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/SQLite3/AlterTableTest.php b/tests/system/Database/Live/SQLite3/AlterTableTest.php index 1c47fb607c4a..0d01d4f4c51a 100644 --- a/tests/system/Database/Live/SQLite3/AlterTableTest.php +++ b/tests/system/Database/Live/SQLite3/AlterTableTest.php @@ -21,12 +21,10 @@ use Config\Database; /** - * @group DatabaseLive - * - * @requires extension sqlite3 - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('sqlite3')] final class AlterTableTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php index cf14c0070119..aa7da330a2e8 100644 --- a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php +++ b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php @@ -18,10 +18,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ForgeModifyColumnTest extends CIUnitTestCase { private Forge $forge; diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php index 164845a8f9d8..cd463186c4dc 100644 --- a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php @@ -17,10 +17,9 @@ use Config\Database; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php index 72662be16d1d..8352fdcb8b31 100644 --- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php @@ -20,10 +20,9 @@ use stdClass; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class GetIndexDataTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php index b66b26fbe960..7afbcbf7fdd8 100644 --- a/tests/system/Database/Live/SelectTest.php +++ b/tests/system/Database/Live/SelectTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class SelectTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/TransactionDBDebugFalseTest.php b/tests/system/Database/Live/TransactionDBDebugFalseTest.php index 5bf0f288e2f9..326dedbe9983 100644 --- a/tests/system/Database/Live/TransactionDBDebugFalseTest.php +++ b/tests/system/Database/Live/TransactionDBDebugFalseTest.php @@ -14,10 +14,9 @@ namespace CodeIgniter\Database\Live; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class TransactionDBDebugFalseTest extends TransactionDBDebugTrueTest { protected function setUp(): void diff --git a/tests/system/Database/Live/TransactionDBDebugTrueTest.php b/tests/system/Database/Live/TransactionDBDebugTrueTest.php index e9a39847b939..33131c5540f0 100644 --- a/tests/system/Database/Live/TransactionDBDebugTrueTest.php +++ b/tests/system/Database/Live/TransactionDBDebugTrueTest.php @@ -20,12 +20,11 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal * * @no-final */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] class TransactionDBDebugTrueTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/TransactionTest.php b/tests/system/Database/Live/TransactionTest.php index 06a0abf886c2..578664d26afe 100644 --- a/tests/system/Database/Live/TransactionTest.php +++ b/tests/system/Database/Live/TransactionTest.php @@ -20,10 +20,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class TransactionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/UnionTest.php b/tests/system/Database/Live/UnionTest.php index f30625ee3187..98bcc1bbd427 100644 --- a/tests/system/Database/Live/UnionTest.php +++ b/tests/system/Database/Live/UnionTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class UnionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php index 12f94503d793..5b020d511bf1 100644 --- a/tests/system/Database/Live/UpdateTest.php +++ b/tests/system/Database/Live/UpdateTest.php @@ -22,10 +22,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class UpdateTest extends CIUnitTestCase { use DatabaseTestTrait; @@ -113,9 +112,7 @@ public function testUpdateWithWhereAndLimit(): void } } - /** - * @dataProvider provideUpdateBatch - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUpdateBatch')] public function testUpdateBatch(string $constraints, array $data, array $expected): void { $table = 'type_test'; diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php index 76329a432843..b3f2d7f9ba97 100644 --- a/tests/system/Database/Live/UpsertTest.php +++ b/tests/system/Database/Live/UpsertTest.php @@ -23,10 +23,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class UpsertTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php index 8742cfee6bf9..8acc190bfb1c 100644 --- a/tests/system/Database/Live/WhereTest.php +++ b/tests/system/Database/Live/WhereTest.php @@ -18,10 +18,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class WhereTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php index 56b700e76fbc..44bd4e99f10e 100644 --- a/tests/system/Database/Live/WriteTypeQueryTest.php +++ b/tests/system/Database/Live/WriteTypeQueryTest.php @@ -19,10 +19,9 @@ use Tests\Support\Database\Seeds\CITestSeeder; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class WriteTypeQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index be40e676c529..0c979a3b2afc 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -28,10 +28,9 @@ use Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MigrationRunnerTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php index 21c08fd303cc..83873992c411 100644 --- a/tests/system/Database/Migrations/MigrationTest.php +++ b/tests/system/Database/Migrations/MigrationTest.php @@ -18,10 +18,9 @@ use CodeIgniter\Test\DatabaseTestTrait; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MigrationTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php index 4915752ed389..6c58c2ad96f5 100644 --- a/tests/system/Database/RawSqlTest.php +++ b/tests/system/Database/RawSqlTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RawSqlTest extends CIUnitTestCase { public function testCanConvertToString(): void diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php index 6516eff34c4e..551298ebdd3d 100644 --- a/tests/system/Debug/ExceptionHandlerTest.php +++ b/tests/system/Debug/ExceptionHandlerTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ExceptionHandlerTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index c71cb0be936f..087639a2611c 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ExceptionsTest extends CIUnitTestCase { use ReflectionHelper; @@ -54,9 +53,7 @@ protected function setUp(): void $this->exception = new Exceptions(new ExceptionsConfig()); } - /** - * @requires PHP >= 8.1 - */ + #[\PHPUnit\Framework\Attributes\RequiresPhp('>= 8.1')] public function testDeprecationsOnPhp81DoNotThrow(): void { $config = new ExceptionsConfig(); diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index f93374a32246..68848d51bf24 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TimerTest extends CIUnitTestCase { /** diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php index 8da3c5e6115d..c48632a929a9 100644 --- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php +++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DatabaseTest extends CIUnitTestCase { public function testDisplay(): void diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php index 94297c6d1c63..38a6ca8e2bb6 100644 --- a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php +++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HistoryTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php index 776bad36c9b5..b610b687569b 100644 --- a/tests/system/DebugTraceableTraitTest.php +++ b/tests/system/DebugTraceableTraitTest.php @@ -19,11 +19,9 @@ /** * @internal - * - * @group Others - * - * @covers \CodeIgniter\Exceptions\DebugTraceableTrait */ +#[\PHPUnit\Framework\Attributes\Group('Others')] +#[\PHPUnit\Framework\Attributes\CoversClass(DebugTraceableTrait::class)] final class DebugTraceableTraitTest extends CIUnitTestCase { public function testFactoryInstanceReturnsWhereItIsRaised(): void diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php index 1950fbbf6328..c0f431690194 100644 --- a/tests/system/Email/EmailTest.php +++ b/tests/system/Email/EmailTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EmailTest extends CIUnitTestCase { public function testEmailValidation(): void @@ -43,10 +42,9 @@ public static function provideEmailSendWithClearance(): iterable } /** - * @dataProvider provideEmailSendWithClearance - * * @param mixed $autoClear */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEmailSendWithClearance')] public function testEmailSendWithClearance($autoClear): void { $email = $this->createMockEmail(); diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index c92af195657d..10e6d7f1a041 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EncryptionTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php index bec040d45ba0..ef194273d9ec 100644 --- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php +++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class OpenSSLHandlerTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php index 8c6c9299fbf3..1657451d36c1 100644 --- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php +++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SodiumHandlerTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 37e65c497e57..158aea67a958 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -29,9 +29,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class EntityTest extends CIUnitTestCase { use ReflectionHelper; diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index 289f4f2c0676..385c9f8d9582 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class EventsTest extends CIUnitTestCase { /** @@ -47,10 +46,8 @@ protected function tearDown(): void Events::simulate(false); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testInitialize(): void { /** diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php index 8aa2e8098c2b..334ba739c00f 100644 --- a/tests/system/Files/FileCollectionTest.php +++ b/tests/system/Files/FileCollectionTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileCollectionTest extends CIUnitTestCase { /** diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php index 384f94073857..658a7f7c8f3b 100644 --- a/tests/system/Files/FileTest.php +++ b/tests/system/Files/FileTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileTest extends CIUnitTestCase { public function testNewGoodChecked(): void diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php index eb23d51b5831..8482dfcd9bbb 100644 --- a/tests/system/Files/FileWithVfsTest.php +++ b/tests/system/Files/FileWithVfsTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileWithVfsTest extends CIUnitTestCase { // For VFS stuff diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php index 873ff05b8740..824cc6f1fdb9 100644 --- a/tests/system/Filters/CSRFTest.php +++ b/tests/system/Filters/CSRFTest.php @@ -20,12 +20,10 @@ use CodeIgniter\Test\CIUnitTestCase; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CSRFTest extends CIUnitTestCase { private \Config\Filters $config; diff --git a/tests/system/Filters/CorsTest.php b/tests/system/Filters/CorsTest.php index a628bccfd162..c27a754cf90b 100644 --- a/tests/system/Filters/CorsTest.php +++ b/tests/system/Filters/CorsTest.php @@ -30,9 +30,8 @@ * https://github.com/asm89/stack-cors/blob/b6920bd8996449400ac976e083b55fb45f035467/tests/CorsTest.php * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CorsTest extends CIUnitTestCase { private Cors $cors; diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php index f293eb1def25..3a50e689c184 100644 --- a/tests/system/Filters/DebugToolbarTest.php +++ b/tests/system/Filters/DebugToolbarTest.php @@ -21,12 +21,10 @@ use Config\Filters as FilterConfig; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DebugToolbarTest extends CIUnitTestCase { /** diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index 9ce2c1b28985..0c772cf65ce2 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -42,12 +42,10 @@ require_once __DIR__ . '/fixtures/Role.php'; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FiltersTest extends CIUnitTestCase { use ConfigFromArrayTrait; @@ -230,10 +228,9 @@ public static function provideProcessMethodProcessGlobalsWithExcept(): iterable } /** - * @dataProvider provideProcessMethodProcessGlobalsWithExcept - * * @param array|string $except */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideProcessMethodProcessGlobalsWithExcept')] public function testProcessMethodProcessGlobalsWithExcept($except): void { $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -584,10 +581,9 @@ public function testOtherResult(): void } /** - * @dataProvider provideBeforeExcept - * * @param array|string $except */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideBeforeExcept')] public function testBeforeExcept(string $uri, $except, array $expected): void { $_SERVER['REQUEST_METHOD'] = 'GET'; diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php index cb2d804d4cbc..2735b9b67dd1 100644 --- a/tests/system/Filters/HoneypotTest.php +++ b/tests/system/Filters/HoneypotTest.php @@ -22,12 +22,10 @@ use Config\Honeypot; /** - * @backupGlobals enabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class HoneypotTest extends CIUnitTestCase { private \Config\Filters $config; @@ -92,10 +90,8 @@ public function testBeforeClean(): void $this->assertSame($expected, $request); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testAfter(): void { $this->config->globals = [ @@ -114,10 +110,8 @@ public function testAfter(): void $this->assertStringContainsString($this->honey->name, $this->response->getBody()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testAfterNotApplicable(): void { $this->config->globals = [ diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php index db2eb6a5b0fa..b7fcf154178b 100644 --- a/tests/system/Filters/InvalidCharsTest.php +++ b/tests/system/Filters/InvalidCharsTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class InvalidCharsTest extends CIUnitTestCase { private InvalidChars $invalidChars; @@ -66,9 +65,7 @@ private function createRequest(): IncomingRequest return $request; } - /** - * @doesNotPerformAssertions - */ + #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] public function testBeforeDoNothingWhenCLIRequest(): void { $cliRequest = new CLIRequest(new MockAppConfig()); @@ -76,9 +73,7 @@ public function testBeforeDoNothingWhenCLIRequest(): void $this->invalidChars->before($cliRequest); } - /** - * @doesNotPerformAssertions - */ + #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] public function testBeforeValidString(): void { $_POST['val'] = [ @@ -114,11 +109,8 @@ public function testBeforeInvalidControlCharCausesException(): void $this->invalidChars->before($this->request); } - /** - * @doesNotPerformAssertions - * - * @dataProvider provideCheckControlStringWithLineBreakAndTabReturnsTheString - */ + #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] + #[\PHPUnit\Framework\Attributes\DataProvider('provideCheckControlStringWithLineBreakAndTabReturnsTheString')] public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string $input): void { $_GET['val'] = $input; @@ -137,9 +129,7 @@ public static function provideCheckControlStringWithLineBreakAndTabReturnsTheStr ]; } - /** - * @dataProvider provideCheckControlStringWithControlCharsCausesException - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCheckControlStringWithControlCharsCausesException')] public function testCheckControlStringWithControlCharsCausesException(string $input): void { $this->expectException(SecurityException::class); diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php index 89dbf126e2a8..6958663426d2 100644 --- a/tests/system/Filters/SecureHeadersTest.php +++ b/tests/system/Filters/SecureHeadersTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SecureHeadersTest extends CIUnitTestCase { public function testAfter(): void diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php index 6abda45fbb6f..e580d19ae85d 100644 --- a/tests/system/Format/FormatTest.php +++ b/tests/system/Format/FormatTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FormatTest extends CIUnitTestCase { private Format $format; diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php index 18f7ef7d3daa..025b6b2a7593 100644 --- a/tests/system/Format/JSONFormatterTest.php +++ b/tests/system/Format/JSONFormatterTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class JSONFormatterTest extends CIUnitTestCase { private JSONFormatter $jsonFormatter; diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php index c9601020eaa8..be118820237b 100644 --- a/tests/system/Format/XMLFormatterTest.php +++ b/tests/system/Format/XMLFormatterTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class XMLFormatterTest extends CIUnitTestCase { private XMLFormatter $xmlFormatter; @@ -103,9 +102,7 @@ public function testValidatingXmlTags(): void $this->assertSame($expected, $this->xmlFormatter->format($data)); } - /** - * @dataProvider provideValidatingInvalidTags - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidatingInvalidTags')] public function testValidatingInvalidTags(string $expected, array $input): void { $expectedXML = <<assertSame('apple', $request->header('fruit')->getValue()); } - /** - * @backupGlobals enabled - */ + #[\PHPUnit\Framework\Attributes\BackupGlobals(true)] public function testOptionsHeadersNotUsingPopulate(): void { $_SERVER['HTTP_HOST'] = 'site1.com'; @@ -248,9 +245,7 @@ public function testHeaderContentLengthNotSharedBetweenRequests(): void $this->assertNull($request->header('Content-Length')); } - /** - * @backupGlobals enabled - */ + #[\PHPUnit\Framework\Attributes\BackupGlobals(true)] public function testHeaderContentLengthNotSharedBetweenClients(): void { $_SERVER['HTTP_CONTENT_LENGTH'] = '10'; diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 6502579eadf4..86baa46626a2 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -25,9 +25,8 @@ * See https://cspvalidator.org/ * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ContentSecurityPolicyTest extends CIUnitTestCase { private ?Response $response = null; @@ -70,10 +69,8 @@ protected function work(string $parm = 'Hello') return $buffer; } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testExistence(): void { $this->prepare(); @@ -82,10 +79,8 @@ public function testExistence(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testReportOnly(): void { $this->prepare(); @@ -95,10 +90,8 @@ public function testReportOnly(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testDefaults(): void { $this->prepare(); @@ -114,10 +107,8 @@ public function testDefaults(): void $this->assertStringContainsString("style-src 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testChildSrc(): void { $this->prepare(); @@ -131,10 +122,8 @@ public function testChildSrc(): void $this->assertStringContainsString("child-src 'self' good.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testConnectSrc(): void { $this->prepare(); @@ -147,10 +136,8 @@ public function testConnectSrc(): void $this->assertStringContainsString("connect-src 'self' iffy.com maybe.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testFontSrc(): void { $this->prepare(); @@ -165,10 +152,8 @@ public function testFontSrc(): void $this->assertStringContainsString('font-src fontsrus.com;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testFormAction(): void { $this->prepare(); @@ -183,10 +168,8 @@ public function testFormAction(): void $this->assertStringNotContainsString("form-action 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testFrameAncestor(): void { $this->prepare(); @@ -200,10 +183,8 @@ public function testFrameAncestor(): void $this->assertStringContainsString("frame-ancestors 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testFrameSrc(): void { $this->prepare(); @@ -217,10 +198,8 @@ public function testFrameSrc(): void $this->assertStringContainsString("frame-src 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testImageSrc(): void { $this->prepare(); @@ -234,10 +213,8 @@ public function testImageSrc(): void $this->assertStringContainsString("img-src 'self' cdn.cloudy.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testMediaSrc(): void { $this->prepare(); @@ -251,10 +228,8 @@ public function testMediaSrc(): void $this->assertStringContainsString("media-src 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testManifestSrc(): void { $this->prepare(); @@ -268,10 +243,8 @@ public function testManifestSrc(): void $this->assertStringContainsString('manifest-src cdn.cloudy.com;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testPluginType(): void { $this->prepare(); @@ -285,10 +258,8 @@ public function testPluginType(): void $this->assertStringContainsString("plugin-types 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testPluginArray(): void { $this->prepare(); @@ -300,10 +271,8 @@ public function testPluginArray(): void $this->assertStringContainsString('plugin-types application/x-shockwave-flash application/wacky-hacky;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testObjectSrc(): void { $this->prepare(); @@ -317,10 +286,8 @@ public function testObjectSrc(): void $this->assertStringContainsString("object-src 'self' cdn.cloudy.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testScriptSrc(): void { $this->prepare(); @@ -334,10 +301,8 @@ public function testScriptSrc(): void $this->assertStringContainsString("script-src 'self' cdn.cloudy.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testStyleSrc(): void { $this->prepare(); @@ -351,10 +316,8 @@ public function testStyleSrc(): void $this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBaseURIDefault(): void { $this->prepare(); @@ -364,10 +327,8 @@ public function testBaseURIDefault(): void $this->assertStringContainsString("base-uri 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBaseURI(): void { $this->prepare(); @@ -378,10 +339,8 @@ public function testBaseURI(): void $this->assertStringContainsString('base-uri example.com;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBaseURIRich(): void { $this->prepare(); @@ -392,10 +351,8 @@ public function testBaseURIRich(): void $this->assertStringContainsString("base-uri 'self' example.com;", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testDefaultSrc(): void { $this->prepare(); @@ -408,10 +365,8 @@ public function testDefaultSrc(): void $this->assertStringContainsString('default-src iffy.com;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testReportURI(): void { $this->prepare(); @@ -423,10 +378,8 @@ public function testReportURI(): void $this->assertStringContainsString('report-uri http://example.com/csptracker;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSandboxFlags(): void { $this->prepare(); @@ -439,10 +392,8 @@ public function testSandboxFlags(): void $this->assertStringContainsString('sandbox allow-popups allow-top-navigation;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testUpgradeInsecureRequests(): void { $this->prepare(); @@ -453,10 +404,8 @@ public function testUpgradeInsecureRequests(): void $this->assertStringContainsString('upgrade-insecure-requests;', $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBodyEmpty(): void { $this->prepare(); @@ -466,10 +415,8 @@ public function testBodyEmpty(): void $this->assertSame($body, $this->response->getBody()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBodyScriptNonce(): void { $this->prepare(); @@ -543,10 +490,8 @@ public function testBodyStyleNonceDisableAutoNonce(): void $result->assertHeader('Content-Security-Policy'); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testBodyStyleNonce(): void { $this->prepare(); @@ -582,10 +527,8 @@ public function testBodyStyleNonceCustomStyleTag(): void $this->assertStringContainsString('nonce=', $response->getBody()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeaderWrongCaseNotFound(): void { $this->prepare(); @@ -595,10 +538,8 @@ public function testHeaderWrongCaseNotFound(): void $this->assertNull($result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeaderIgnoreCase(): void { $this->prepare(); @@ -608,10 +549,8 @@ public function testHeaderIgnoreCase(): void $this->assertStringContainsString("base-uri 'self';", $result); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testCSPDisabled(): void { $this->prepare(false); @@ -639,10 +578,8 @@ public function testGetStyleNonce(): void $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled(): void { $this->prepare(); diff --git a/tests/system/HTTP/CorsTest.php b/tests/system/HTTP/CorsTest.php index 8b15fb8d4c83..dac9aaa000af 100644 --- a/tests/system/HTTP/CorsTest.php +++ b/tests/system/HTTP/CorsTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CorsTest extends CIUnitTestCase { /** diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index b1071e39dc01..1ee24ed58692 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class DownloadResponseTest extends CIUnitTestCase { protected function setUp(): void @@ -317,10 +316,8 @@ public function testPretendOutput(): void $this->assertSame(file_get_contents(__FILE__), $actual); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRealOutput(): void { $response = new DownloadResponse('unit-test.php', false); diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php index 3b565156aa6b..b2e026ac2374 100644 --- a/tests/system/HTTP/Files/FileCollectionTest.php +++ b/tests/system/HTTP/Files/FileCollectionTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileCollectionTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php index df79faa1a15f..1eb476e67222 100644 --- a/tests/system/HTTP/Files/FileMovingTest.php +++ b/tests/system/HTTP/Files/FileMovingTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileMovingTest extends CIUnitTestCase { private ?vfsStreamDirectory $root; diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php index 910c04923566..f07ce98ca49f 100644 --- a/tests/system/HTTP/HeaderTest.php +++ b/tests/system/HTTP/HeaderTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HeaderTest extends CIUnitTestCase { public function testHeaderStoresBasics(): void diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index 6f52bcc1baf4..85e948a8240f 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -17,12 +17,10 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class IncomingRequestDetectingTest extends CIUnitTestCase { private IncomingRequest $request; diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index e0d827523405..da4e55d4ca5f 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -24,12 +24,10 @@ use TypeError; /** - * @backupGlobals enabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class IncomingRequestTest extends CIUnitTestCase { private Request $request; @@ -144,10 +142,9 @@ public function testCanGetOldInputArrayWithSESSION(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 - * - * @runInSeparateProcess - * @preserveGlobalState disabled */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testCanGetOldInputArrayWithSessionService(): void { $locations = [ @@ -659,14 +656,13 @@ public static function provideCanGrabGetRawInputVar(): iterable } /** - * @dataProvider provideCanGrabGetRawInputVar - * * @param string $rawstring * @param mixed $var * @param mixed $expected * @param mixed $filter * @param mixed $flag */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCanGrabGetRawInputVar')] public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $flag): void { $config = new App(); @@ -677,9 +673,7 @@ public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $this->assertSame($expected, $request->getRawInputVar($var, $filter, $flag)); } - /** - * @dataProvider provideIsHTTPMethods - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIsHTTPMethods')] public function testIsHTTPMethodLowerCase(string $value): void { $request = $this->request->withMethod($value); @@ -700,9 +694,7 @@ public static function provideIsHTTPMethods(): iterable ]; } - /** - * @dataProvider provideIsHTTPMethods - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIsHTTPMethods')] public function testIsHTTPMethodUpperCase(string $value): void { $request = $this->request->withMethod($value); @@ -922,11 +914,10 @@ public static function provideExtensionPHP(): iterable } /** - * @dataProvider provideExtensionPHP - * * @param mixed $path * @param mixed $detectPath */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideExtensionPHP')] public function testExtensionPHP($path, $detectPath): void { $config = new App(); diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index c91b8ab9255f..2359f5cf8c68 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class MessageTest extends CIUnitTestCase { private ?Message $message; @@ -208,10 +207,9 @@ public static function provideArrayHeaderValue(): iterable } /** - * @dataProvider provideArrayHeaderValue - * * @param array $arrayHeaderValue */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayHeaderValue')] public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); @@ -221,10 +219,9 @@ public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHead } /** - * @dataProvider provideArrayHeaderValue - * * @param array $arrayHeaderValue */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayHeaderValue')] public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php index 8ace30f86aaa..ed7ee482c369 100644 --- a/tests/system/HTTP/NegotiateTest.php +++ b/tests/system/HTTP/NegotiateTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class NegotiateTest extends CIUnitTestCase { private ?IncomingRequest $request; diff --git a/tests/system/HTTP/OutgoingRequestTest.php b/tests/system/HTTP/OutgoingRequestTest.php index 123f4acc706b..bc1e8b58f13e 100644 --- a/tests/system/HTTP/OutgoingRequestTest.php +++ b/tests/system/HTTP/OutgoingRequestTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class OutgoingRequestTest extends CIUnitTestCase { public function testCreateWithHeader(): void diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index e7e01f539650..afa7ca278a5d 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RedirectExceptionTest extends TestCase { protected function setUp(): void diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index 4abc965d59da..c31295415abb 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -26,9 +26,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class RedirectResponseTest extends CIUnitTestCase { /** @@ -129,10 +128,8 @@ public function testRedirectRelativeConvertsToFullURI(): void $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testWithInput(): void { $_SESSION = []; @@ -149,10 +146,8 @@ public function testWithInput(): void $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testWithValidationErrors(): void { $_SESSION = []; @@ -169,10 +164,8 @@ public function testWithValidationErrors(): void $this->assertArrayHasKey('_ci_validation_errors', $_SESSION); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testWith(): void { $_SESSION = []; @@ -185,10 +178,8 @@ public function testWith(): void $this->assertArrayHasKey('foo', $_SESSION); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRedirectBack(): void { $_SERVER['HTTP_REFERER'] = 'http://somewhere.com'; @@ -202,10 +193,8 @@ public function testRedirectBack(): void $this->assertSame('http://somewhere.com', $returned->header('location')->getValue()); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRedirectBackMissing(): void { $_SESSION = []; @@ -218,11 +207,10 @@ public function testRedirectBackMissing(): void } /** - * @runInSeparateProcess - * @preserveGlobalState disabled - * * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119 */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRedirectRouteBaseUrl(): void { $config = new App(); @@ -258,10 +246,8 @@ public function testWithCookies(): void $this->assertTrue($response->hasCookie('foo', 'bar')); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testWithCookiesWithEmptyCookies(): void { $_SESSION = []; diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index aea3f56b140f..f0298aaa30e2 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -18,12 +18,10 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RequestTest extends CIUnitTestCase { private Request $request; diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php index 6f5f039a1983..a220e3678395 100644 --- a/tests/system/HTTP/ResponseCookieTest.php +++ b/tests/system/HTTP/ResponseCookieTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ResponseCookieTest extends CIUnitTestCase { private array $defaults; diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php index 6159ee1140ba..beee6886371c 100644 --- a/tests/system/HTTP/ResponseSendTest.php +++ b/tests/system/HTTP/ResponseSendTest.php @@ -25,9 +25,8 @@ * test cases need to be run as separate processes. * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ResponseSendTest extends CIUnitTestCase { /** @@ -43,11 +42,8 @@ final class ResponseSendTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeadersMissingDate(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -81,10 +77,9 @@ public function testHeadersMissingDate(): void /** * This test does not test that CSP is handled properly - * it makes sure that sending gives CSP a chance to do its thing. - * - * @runInSeparateProcess - * @preserveGlobalState disabled */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeadersWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -121,10 +116,9 @@ public function testHeadersWithCSP(): void * Make sure cookies are set by RedirectResponse this way * * @see https://github.com/codeigniter4/CodeIgniter4/issues/1393 - * - * @runInSeparateProcess - * @preserveGlobalState disabled */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testRedirectResponseCookies(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index f8de63d1f1b0..bba85116f12c 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ResponseTest extends CIUnitTestCase { private array $server; @@ -270,9 +269,7 @@ public function testRedirectSetsDefaultCodeAndLocationHeader(): void $this->assertSame(302, $response->getStatusCode()); } - /** - * @dataProvider provideRedirect - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirect')] public function testRedirect( string $server, string $protocol, @@ -316,9 +313,7 @@ public static function provideRedirect(): iterable ]; } - /** - * @dataProvider provideRedirectWithIIS - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirectWithIIS')] public function testRedirectWithIIS( string $protocol, string $method, diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php index f6386b858165..3f84409d3dcf 100644 --- a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -18,12 +18,10 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SiteURIFactoryDetectRoutePathTest extends CIUnitTestCase { protected function setUp(): void @@ -280,11 +278,10 @@ public function testPathInfoSubfolder(): void } /** - * @dataProvider provideExtensionPHP - * * @param string $path * @param string $detectPath */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideExtensionPHP')] public function testExtensionPHP($path, $detectPath): void { $config = new App(); diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index 9b0a55d20b5f..2203e3453b09 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -18,12 +18,10 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SiteURIFactoryTest extends CIUnitTestCase { protected function setUp(): void @@ -87,9 +85,7 @@ public function testCreateFromGlobalsAllowedHost(): void $this->assertSame('woot', $uri->getRoutePath()); } - /** - * @dataProvider provideCreateFromStringWithIndexPage - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCreateFromStringWithIndexPage')] public function testCreateFromStringWithIndexPage( string $uriString, string $expectUriString, @@ -130,9 +126,7 @@ public static function provideCreateFromStringWithIndexPage(): iterable ]; } - /** - * @dataProvider provideCreateFromStringWithoutIndexPage - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCreateFromStringWithoutIndexPage')] public function testCreateFromStringWithoutIndexPage( string $uriString, string $expectUriString, diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 80deeddc2879..b8cac4d7058f 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -20,17 +20,13 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SiteURITest extends CIUnitTestCase { - /** - * @dataProvider provideConstructor - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideConstructor')] public function testConstructor( string $baseURL, string $indexPage, @@ -327,9 +323,7 @@ public function testConstructorInvalidBaseURL(): void new SiteURI($config); } - /** - * @dataProvider provideSetPath - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSetPath')] public function testSetPath( string $baseURL, string $indexPage, diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 0211d6d2e1f9..9b5f7ba1d32f 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -20,12 +20,10 @@ use Config\App; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class URITest extends CIUnitTestCase { public function testConstructorSetsAllParts(): void @@ -127,9 +125,7 @@ public function testCanCastAsString(): void $this->assertSame($expected, (string) $uri); } - /** - * @dataProvider provideSimpleUri - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSimpleUri')] public function testSimpleUri(string $url, string $expectedURL, string $expectedPath): void { $uri = new URI($url); @@ -401,9 +397,7 @@ public function testSetPathSetsValue(): void $this->assertSame($expected, (string) $uri); } - /** - * @dataProvider provideSetPath - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSetPath')] public function testSetPath(string $path, string $expectedURL, string $expectedPath): void { $url = 'http://example.com/'; @@ -514,11 +508,10 @@ public static function providePathGetsFiltered(): iterable } /** - * @dataProvider providePathGetsFiltered - * * @param string $path * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('providePathGetsFiltered')] public function testPathGetsFiltered($path, $expected): void { $uri = new URI(); @@ -630,11 +623,10 @@ public static function provideAuthorityReturnsExceptedValues(): iterable } /** - * @dataProvider provideAuthorityReturnsExceptedValues - * * @param string $url * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAuthorityReturnsExceptedValues')] public function testAuthorityReturnsExceptedValues($url, $expected): void { $uri = new URI($url); @@ -657,11 +649,10 @@ public static function provideAuthorityRemovesDefaultPorts(): iterable } /** - * @dataProvider provideAuthorityRemovesDefaultPorts - * * @param string $scheme * @param int $port */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAuthorityRemovesDefaultPorts')] public function testAuthorityRemovesDefaultPorts($scheme, $port): void { $url = "{$scheme}://example.com:{$port}/path"; @@ -780,11 +771,10 @@ public static function provideRemoveDotSegments(): iterable } /** - * @dataProvider provideRemoveDotSegments - * * @param string $path * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRemoveDotSegments')] public function testRemoveDotSegments($path, $expected): void { $this->assertSame($expected, URI::removeDotSegments($path)); @@ -821,11 +811,10 @@ public static function defaultResolutions(): iterable } /** - * @dataProvider defaultResolutions - * * @param string $rel * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('defaultResolutions')] public function testResolveRelativeURI($rel, $expected): void { $base = 'http://a/b/c/d'; @@ -837,11 +826,10 @@ public function testResolveRelativeURI($rel, $expected): void } /** - * @dataProvider defaultResolutions - * * @param string $rel * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('defaultResolutions')] public function testResolveRelativeURIHTTPS($rel, $expected): void { $base = 'https://a/b/c/d'; diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php index 30d175b7ff55..2d03f8cae933 100644 --- a/tests/system/HTTP/UserAgentTest.php +++ b/tests/system/HTTP/UserAgentTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class UserAgentTest extends CIUnitTestCase { private string $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27'; diff --git a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php index 602c4d0209d8..9332bcccf5b4 100644 --- a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php +++ b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php @@ -17,10 +17,9 @@ use InvalidArgumentException; /** - * @group Others - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ArrayHelperDotKeyExistsTest extends CIUnitTestCase { private array $array = [ diff --git a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php index 7fed620641df..5d8c9fa3d42c 100644 --- a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php +++ b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php @@ -16,10 +16,9 @@ use CodeIgniter\Test\CIUnitTestCase; /** - * @group Others - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ArrayHelperRecursiveDiffTest extends CIUnitTestCase { private array $compareWith; diff --git a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php index 861d6ede713f..314d406671ea 100644 --- a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php +++ b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php @@ -16,10 +16,9 @@ use CodeIgniter\Test\CIUnitTestCase; /** - * @group Others - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ArrayHelperSortValuesByNaturalTest extends CIUnitTestCase { private array $arrayWithStringValues = [ diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php index c7beb0e405b4..5cb240c57fad 100644 --- a/tests/system/Helpers/ArrayHelperTest.php +++ b/tests/system/Helpers/ArrayHelperTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ArrayHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -210,11 +209,10 @@ public function testArrayDotIgnoresLastWildcard(): void } /** - * @dataProvider provideArrayDeepSearch - * * @param int|string $key * @param array|string|null $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayDeepSearch')] public function testArrayDeepSearch($key, $expected): void { $data = [ @@ -248,9 +246,7 @@ public function testArrayDeepSearchReturnNullEmptyArray(): void $this->assertNull(array_deep_search('key644', $data)); } - /** - * @dataProvider provideSortByMultipleKeys - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysWithArray(array $data, array $sortColumns, array $expected): void { $success = array_sort_by_multiple_keys($data, $sortColumns); @@ -259,9 +255,7 @@ public function testArraySortByMultipleKeysWithArray(array $data, array $sortCol $this->assertSame($expected, array_column($data, 'name')); } - /** - * @dataProvider provideSortByMultipleKeys - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysWithObjects(array $data, array $sortColumns, array $expected): void { // Morph to objects @@ -275,9 +269,7 @@ public function testArraySortByMultipleKeysWithObjects(array $data, array $sortC $this->assertSame($expected, array_column((array) $data, 'name')); } - /** - * @dataProvider provideSortByMultipleKeys - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, array $sortColumns, array $expected): void { // Both filled @@ -298,10 +290,9 @@ public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, arra } /** - * @dataProvider provideSortByMultipleKeys - * * @param mixed $data */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data): void { $this->expectException(ValueError::class); @@ -394,9 +385,7 @@ public static function provideSortByMultipleKeys(): iterable ]; } - /** - * @dataProvider provideArrayFlattening - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayFlattening')] public function testArrayFlattening(array $input, array $expected): void { $this->assertSame($expected, array_flatten_with_dots($input)); @@ -494,9 +483,7 @@ public static function provideArrayFlattening(): iterable ]; } - /** - * @dataProvider provideArrayGroupByIncludeEmpty - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayGroupByIncludeEmpty')] public function testArrayGroupByIncludeEmpty(array $indexes, array $data, array $expected): void { $actual = array_group_by($data, $indexes, true); @@ -504,9 +491,7 @@ public function testArrayGroupByIncludeEmpty(array $indexes, array $data, array $this->assertSame($expected, $actual, 'array including empty not the same'); } - /** - * @dataProvider provideArrayGroupByExcludeEmpty - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayGroupByExcludeEmpty')] public function testArrayGroupByExcludeEmpty(array $indexes, array $data, array $expected): void { $actual = array_group_by($data, $indexes, false); diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php index 8325104ca73a..40e02a808b1a 100755 --- a/tests/system/Helpers/CookieHelperTest.php +++ b/tests/system/Helpers/CookieHelperTest.php @@ -28,9 +28,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CookieHelperTest extends CIUnitTestCase { private IncomingRequest $request; diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php index ef0d2afa939e..3ac268fbf264 100644 --- a/tests/system/Helpers/DateHelperTest.php +++ b/tests/system/Helpers/DateHelperTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DateHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index 619f22f08938..4e7cbe7e1045 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilesystemHelperTest extends CIUnitTestCase { /** diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index b623068943fe..cc9e16edb155 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class FormHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -953,10 +952,8 @@ public function testSetCheckboxWithUnchecked(): void ); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSetRadioFromSessionOldInput(): void { $_SESSION = [ @@ -973,10 +970,8 @@ public function testSetRadioFromSessionOldInput(): void unset($_SESSION['_ci_old_input']); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSetRadioFromPost(): void { $_POST['bar'] = 'baz'; @@ -986,10 +981,8 @@ public function testSetRadioFromPost(): void $this->assertSame('', set_radio('bar', 'boop', true)); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testSetRadioFromPostWithValueZero(): void { $_POST['bar'] = '0'; diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php index ecce00af6783..c66e4b3d0ff8 100755 --- a/tests/system/Helpers/HTMLHelperTest.php +++ b/tests/system/Helpers/HTMLHelperTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HTMLHelperTest extends CIUnitTestCase { private array $tracks; diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php index d6f07f59c4f0..a20d39f26f59 100755 --- a/tests/system/Helpers/InflectorHelperTest.php +++ b/tests/system/Helpers/InflectorHelperTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class InflectorHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -261,9 +260,7 @@ public static function provideOrdinal(): iterable ]; } - /** - * @dataProvider provideOrdinal - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideOrdinal')] public function testOrdinal(string $suffix, int $number): void { $this->assertSame($suffix, ordinal($number)); diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php index 8e410e121679..0a2f112dc9e2 100755 --- a/tests/system/Helpers/NumberHelperTest.php +++ b/tests/system/Helpers/NumberHelperTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class NumberHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php index 7a237b34fe1a..7d0821e7a572 100644 --- a/tests/system/Helpers/SecurityHelperTest.php +++ b/tests/system/Helpers/SecurityHelperTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SecurityHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php index 1cc4def05869..e32a8b2c0a8a 100755 --- a/tests/system/Helpers/TextHelperTest.php +++ b/tests/system/Helpers/TextHelperTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TextHelperTest extends CIUnitTestCase { private string $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.'; diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php index ab5c5c381f49..77c6d85ae3c5 100644 --- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php +++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php @@ -28,12 +28,10 @@ * that rely on the "current" URL. * Includes: current_url, uri_string, uri_is * - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CurrentUrlTest extends CIUnitTestCase { private App $config; @@ -282,9 +280,7 @@ public static function provideUrlIs(): iterable ]; } - /** - * @dataProvider provideUrlIs - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] public function testUrlIs(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -295,9 +291,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected) $this->assertSame($expected, url_is($testPath)); } - /** - * @dataProvider provideUrlIs - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -310,9 +304,7 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex $this->assertSame($expected, url_is($testPath)); } - /** - * @dataProvider provideUrlIs - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index 1a15bb4c1fac..4f3c47803ea4 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -25,12 +25,10 @@ use InvalidArgumentException; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class MiscUrlTest extends CIUnitTestCase { private App $config; @@ -55,12 +53,9 @@ protected function tearDown(): void $_SERVER = []; } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - * - * @group SeparateProcess - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] public function testPreviousURLUsesSessionFirst(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -93,12 +88,9 @@ private function createRequest(string $uri): void Factories::injectMock('config', 'App', $this->config); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - * - * @group SeparateProcess - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] public function testPreviousURLUsesRefererIfNeeded(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -183,13 +175,12 @@ public static function provideAnchor(): iterable } /** - * @dataProvider provideAnchor - * * @param mixed $expected * @param mixed $uri * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchor')] public function testAnchor($expected = '', $uri = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -248,13 +239,12 @@ public static function provideAnchorNoindex(): iterable } /** - * @dataProvider provideAnchorNoindex - * * @param mixed $expected * @param mixed $uri * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorNoindex')] public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = ''): void { $this->config->indexPage = ''; @@ -305,13 +295,12 @@ public static function provideAnchorTargetted(): iterable } /** - * @dataProvider provideAnchorTargetted - * * @param mixed $expected * @param mixed $uri * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorTargetted')] public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = ''): void { $this->config->indexPage = ''; @@ -351,13 +340,12 @@ public static function provideAnchorExamples(): iterable } /** - * @dataProvider provideAnchorExamples - * * @param mixed $expected * @param mixed $uri * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorExamples')] public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -409,13 +397,12 @@ public static function provideAnchorPopup(): iterable } /** - * @dataProvider provideAnchorPopup - * * @param mixed $expected * @param mixed $uri * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorPopup')] public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false): void { $uriString = 'http://example.com/'; @@ -448,13 +435,12 @@ public static function provideMailto(): iterable } /** - * @dataProvider provideMailto - * * @param mixed $expected * @param mixed $email * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMailto')] public function testMailto($expected = '', $email = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -487,13 +473,12 @@ public static function provideSafeMailto(): iterable } /** - * @dataProvider provideSafeMailto - * * @param mixed $expected * @param mixed $email * @param mixed $title * @param mixed $attributes */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSafeMailto')] public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -553,11 +538,10 @@ public static function provideAutoLinkUrl(): iterable } /** - * @dataProvider provideAutoLinkUrl - * * @param mixed $in * @param mixed $out */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkUrl')] public function testAutoLinkUrl($in, $out): void { $this->assertSame($out, auto_link($in, 'url')); @@ -602,11 +586,10 @@ public static function provideAutoLinkEmail(): iterable } /** - * @dataProvider provideAutoLinkEmail - * * @param mixed $in * @param mixed $out */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkEmail')] public function testAutoLinkEmail($in, $out): void { $this->assertSame($out, auto_link($in, 'email')); @@ -651,11 +634,10 @@ public static function provideAutolinkBoth(): iterable } /** - * @dataProvider provideAutolinkBoth - * * @param mixed $in * @param mixed $out */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAutolinkBoth')] public function testAutolinkBoth($in, $out): void { $this->assertSame($out, auto_link($in)); @@ -700,11 +682,10 @@ public static function provideAutoLinkPopup(): iterable } /** - * @dataProvider provideAutoLinkPopup - * * @param mixed $in * @param mixed $out */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkPopup')] public function testAutoLinkPopup($in, $out): void { $this->assertSame($out, auto_link($in, 'url', true)); @@ -789,9 +770,7 @@ public static function providePrepUrl(): iterable ]; } - /** - * @dataProvider providePrepUrl - */ + #[\PHPUnit\Framework\Attributes\DataProvider('providePrepUrl')] public function testPrepUrl(string $input, string $expected, bool $secure): void { $this->assertSame($expected, prep_url($input, $secure)); @@ -855,9 +834,7 @@ public function testMbUrlTitleExtraDashes(): void } } - /** - * @dataProvider provideUrlTo - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlTo')] public function testUrlTo(string $expected, string $input, ...$args): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -871,9 +848,7 @@ public function testUrlTo(string $expected, string $input, ...$args): void $this->assertSame($expected, url_to($input, ...$args)); } - /** - * @dataProvider provideUrlToThrowsOnEmptyOrMissingRoute - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlToThrowsOnEmptyOrMissingRoute')] public function testUrlToThrowsOnEmptyOrMissingRoute(string $route): void { $this->expectException(RouterException::class); diff --git a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php index 526d2250f2c7..0bd9a0d5f720 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php @@ -24,12 +24,10 @@ * site_url() these functions are tested * simultaneously. * - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SiteUrlCliTest extends CIUnitTestCase { private App $config; @@ -71,9 +69,8 @@ private function createRequest(?App $config = null): void * @param string $path * @param string $expectedSiteUrl * @param string $expectedBaseUrl - * - * @dataProvider provideUrls */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrls')] public function testUrls( $baseURL, $indexPage, diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 41c1cfc7974b..8bf26f67d7e0 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -27,12 +27,10 @@ * site_url() these functions are tested * simultaneously. * - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SiteUrlTest extends CIUnitTestCase { private App $config; @@ -81,9 +79,8 @@ private function createRequest(?App $config = null, $body = null, ?string $path * @param string $path * @param string $expectedSiteUrl * @param string $expectedBaseUrl - * - * @dataProvider provideUrls */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUrls')] public function testUrls( $baseURL, $indexPage, diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php index c508c9f95905..af1852a32b12 100644 --- a/tests/system/Helpers/XMLHelperTest.php +++ b/tests/system/Helpers/XMLHelperTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class XMLHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php index b620335f2cca..4347beb2ca8f 100644 --- a/tests/system/HomeTest.php +++ b/tests/system/HomeTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HomeTest extends CIUnitTestCase { use FeatureTestTrait; diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index c243645d905b..30128b8d03f7 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -25,12 +25,10 @@ use Config\Honeypot as HoneypotConfig; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class HoneypotTest extends CIUnitTestCase { private HoneypotConfig $config; diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index 4df7e69fd924..31d65a819376 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DirectoryHasherTest extends CIUnitTestCase { private DirectoryHasher $hasher; diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php index e1b242fc72c5..bb45a2388b9a 100644 --- a/tests/system/I18n/TimeDifferenceTest.php +++ b/tests/system/I18n/TimeDifferenceTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TimeDifferenceTest extends CIUnitTestCase { private string $currentLocale; diff --git a/tests/system/I18n/TimeLegacyTest.php b/tests/system/I18n/TimeLegacyTest.php index f966e3750ce9..20857cd633cf 100644 --- a/tests/system/I18n/TimeLegacyTest.php +++ b/tests/system/I18n/TimeLegacyTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TimeLegacyTest extends CIUnitTestCase { private string $currentLocale; @@ -1152,9 +1151,7 @@ public function testSetTestNowWithFaLocale(): void $this->assertSame('2017-03-10T12:00:00+09:00', $now); } - /** - * @dataProvider provideToStringDoesNotDependOnLocale - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideToStringDoesNotDependOnLocale')] public function testToStringDoesNotDependOnLocale(string $locale): void { Locale::setDefault($locale); diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index 8e85e8cff3e3..d4bdaba8f349 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TimeTest extends CIUnitTestCase { private string $currentLocale; @@ -1168,9 +1167,7 @@ public function testSetTestNowWithFaLocale(): void $this->assertSame('2017-03-10T12:00:00+09:00', $now); } - /** - * @dataProvider provideToStringDoesNotDependOnLocale - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideToStringDoesNotDependOnLocale')] public function testToStringDoesNotDependOnLocale(string $locale): void { Locale::setDefault($locale); diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php index bcaf035ed30e..b6fe8c0b4ac7 100644 --- a/tests/system/Images/BaseHandlerTest.php +++ b/tests/system/Images/BaseHandlerTest.php @@ -30,9 +30,8 @@ * testing saving only. * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BaseHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php index 5d39a3c93fd2..15df5d13bc1e 100644 --- a/tests/system/Images/GDHandlerTest.php +++ b/tests/system/Images/GDHandlerTest.php @@ -30,9 +30,8 @@ * Was unable to test fontPath & related logic. * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GDHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php index 2edc1c60e714..e9a04d2eafc5 100644 --- a/tests/system/Images/ImageMagickHandlerTest.php +++ b/tests/system/Images/ImageMagickHandlerTest.php @@ -31,11 +31,9 @@ * Was unable to test fontPath & related logic. * * @internal - * - * @group Others - * - * @requires extension imagick */ +#[\PHPUnit\Framework\Attributes\Group('Others')] +#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] final class ImageMagickHandlerTest extends CIUnitTestCase { private string $root; @@ -80,9 +78,7 @@ protected function setUp(): void $this->handler = Services::image('imagick', $config, false); } - /** - * @dataProvider provideNonexistentLibraryPathTerminatesProcessing - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideNonexistentLibraryPathTerminatesProcessing')] public function testNonexistentLibraryPathTerminatesProcessing(string $path, string $invalidPath): void { $this->expectException(ImageException::class); diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php index c3c4b119a6fb..d9b4418e3bd0 100644 --- a/tests/system/Images/ImageTest.php +++ b/tests/system/Images/ImageTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ImageTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index b318d28fc19a..1dbb239f662b 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class LanguageTest extends CIUnitTestCase { private Language $lang; @@ -266,10 +265,9 @@ public static function provideBundleUniqueKeys(): iterable * There's not a whole lot that can be done with message bundles, * but we can at least try loading them ... more accurate code coverage? * - * @dataProvider provideBundleUniqueKeys - * * @param mixed $bundle */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideBundleUniqueKeys')] public function testBundleUniqueKeys($bundle): void { $messages = require SYSTEMPATH . 'Language/en/' . $bundle . '.php'; diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php index 228e358e3ba1..c3f37654a55b 100644 --- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ChromeLoggerHandlerTest extends CIUnitTestCase { public function testCanHandleLogLevel(): void diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php index cde1c2e983c8..052aeabb2611 100644 --- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php +++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ErrorlogHandlerTest extends CIUnitTestCase { public function testHandlerThrowsOnInvalidMessageType(): void diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php index 3b3ee9c53b56..25c323d9332e 100644 --- a/tests/system/Log/Handlers/FileHandlerTest.php +++ b/tests/system/Log/Handlers/FileHandlerTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index e76e60cbd4c3..0611fe532649 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -24,9 +24,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class LoggerTest extends CIUnitTestCase { protected function tearDown(): void diff --git a/tests/system/Models/AffectedRowsTest.php b/tests/system/Models/AffectedRowsTest.php index 9c7d60267ebc..07da816981a0 100644 --- a/tests/system/Models/AffectedRowsTest.php +++ b/tests/system/Models/AffectedRowsTest.php @@ -16,10 +16,9 @@ use Tests\Support\Models\UserModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class AffectedRowsTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php index 836a6e08a13f..8a3a3af617ca 100644 --- a/tests/system/Models/CountAllModelTest.php +++ b/tests/system/Models/CountAllModelTest.php @@ -16,10 +16,9 @@ use Tests\Support\Models\UserModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class CountAllModelTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/DataConverterModelTest.php b/tests/system/Models/DataConverterModelTest.php index c22fa39b5050..ce404ab21e02 100644 --- a/tests/system/Models/DataConverterModelTest.php +++ b/tests/system/Models/DataConverterModelTest.php @@ -19,10 +19,9 @@ use Tests\Support\Models\UserCastsTimestampModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DataConverterModelTest extends LiveModelTestCase { protected $migrate = true; diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php index bd2af1f4ad0d..a8e36ee1bb08 100644 --- a/tests/system/Models/DeleteModelTest.php +++ b/tests/system/Models/DeleteModelTest.php @@ -20,10 +20,9 @@ use Tests\Support\Models\UserModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DeleteModelTest extends LiveModelTestCase { public function testDeleteBasics(): void @@ -154,10 +153,9 @@ public function testOnlyDeleted(): void * When executing a soft delete * Then an exception should not be thrown * - * @dataProvider emptyPkValues - * * @param int|string|null $emptyValue */ + #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void { $this->createModel(UserModel::class); @@ -168,10 +166,9 @@ public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue } /** - * @dataProvider emptyPkValues - * * @param int|string|null $emptyValue */ + #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): void { $this->expectException(DatabaseException::class); @@ -183,10 +180,9 @@ public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): } /** - * @dataProvider emptyPkValues - * * @param int|string|null $emptyValue */ + #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void { $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]); @@ -243,10 +239,9 @@ public function testPurgeDeletedWithSoftDeleteFalse(): void } /** - * @dataProvider emptyPkValues - * * @param int|string|null $id */ + #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] public function testDeleteThrowDatabaseExceptionWithoutWhereClause($id): void { // BaseBuilder throws Exception. @@ -262,10 +257,9 @@ public function testDeleteThrowDatabaseExceptionWithoutWhereClause($id): void } /** - * @dataProvider emptyPkValues - * * @param int|string|null $id */ + #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] public function testDeleteWithSoftDeleteThrowDatabaseExceptionWithoutWhereClause($id): void { // Model throws Exception. diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php index 52130f73f9f8..2ec66e73228f 100644 --- a/tests/system/Models/EventsModelTest.php +++ b/tests/system/Models/EventsModelTest.php @@ -17,10 +17,9 @@ use Tests\Support\Models\EventModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class EventsModelTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php index b0b835bc1067..6ec8452ac95f 100644 --- a/tests/system/Models/FindModelTest.php +++ b/tests/system/Models/FindModelTest.php @@ -22,10 +22,9 @@ use Tests\Support\Models\UserModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class FindModelTest extends LiveModelTestCase { public function testFindReturnsRow(): void @@ -179,11 +178,10 @@ public function testFirst(): void } /** - * @dataProvider provideFirstAggregate - * * @param mixed $groupBy * @param mixed $total */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideFirstAggregate')] public function testFirstAggregate($groupBy, $total): void { $this->createModel(UserModel::class); @@ -215,11 +213,10 @@ public static function provideFirstAggregate(): iterable } /** - * @dataProvider provideAggregateAndGroupBy - * * @param mixed $aggregate * @param mixed $groupBy */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAggregateAndGroupBy')] public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void { $this->db->table('user') @@ -261,11 +258,10 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void } /** - * @dataProvider provideAggregateAndGroupBy - * * @param mixed $aggregate * @param mixed $groupBy */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAggregateAndGroupBy')] public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void { $this->createModel(UserModel::class); diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php index b119e6f1550b..7f04b7add02a 100644 --- a/tests/system/Models/GeneralModelTest.php +++ b/tests/system/Models/GeneralModelTest.php @@ -25,9 +25,8 @@ * features without requiring a database connection. * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GeneralModelTest extends CIUnitTestCase { /** diff --git a/tests/system/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php index fd12cc880065..c495ba75b55b 100644 --- a/tests/system/Models/GetCompiledModelTest.php +++ b/tests/system/Models/GetCompiledModelTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class GetCompiledModelTest extends CIUnitTestCase { private ?object $model = null; diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php index 25e844dd5cb0..6b00ba1260a1 100644 --- a/tests/system/Models/InsertModelTest.php +++ b/tests/system/Models/InsertModelTest.php @@ -26,10 +26,9 @@ use Tests\Support\Models\WithoutAutoIncrementModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class InsertModelTest extends LiveModelTestCase { public function testSetWorksWithInsert(): void diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php index 83b72cd13d78..4388e691463a 100644 --- a/tests/system/Models/MiscellaneousModelTest.php +++ b/tests/system/Models/MiscellaneousModelTest.php @@ -22,10 +22,9 @@ use Tests\Support\Models\ValidModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MiscellaneousModelTest extends LiveModelTestCase { public function testChunk(): void diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php index 570a53b5792a..b6fa8e27e845 100644 --- a/tests/system/Models/PaginateModelTest.php +++ b/tests/system/Models/PaginateModelTest.php @@ -17,10 +17,9 @@ use Tests\Support\Models\ValidModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class PaginateModelTest extends LiveModelTestCase { public function testPaginate(): void diff --git a/tests/system/Models/ReplaceModelTest.php b/tests/system/Models/ReplaceModelTest.php index 59780cce3eef..35ae1b207da7 100644 --- a/tests/system/Models/ReplaceModelTest.php +++ b/tests/system/Models/ReplaceModelTest.php @@ -16,10 +16,9 @@ use Tests\Support\Models\UserModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ReplaceModelTest extends LiveModelTestCase { public function testReplaceRespectsUseTimestamps(): void diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php index e4a012803067..a3186a470f74 100644 --- a/tests/system/Models/SaveModelTest.php +++ b/tests/system/Models/SaveModelTest.php @@ -26,10 +26,9 @@ use Tests\Support\Models\WithoutAutoIncrementModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class SaveModelTest extends LiveModelTestCase { public function testSaveNewRecordObject(): void diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php index 7d27d18800d5..d99ab50bfc9c 100644 --- a/tests/system/Models/TimestampModelTest.php +++ b/tests/system/Models/TimestampModelTest.php @@ -18,10 +18,9 @@ use Tests\Support\Models\UserTimestampModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class TimestampModelTest extends LiveModelTestCase { protected $migrate = true; diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php index 866fc4b8661e..3296a2a211ef 100644 --- a/tests/system/Models/UpdateModelTest.php +++ b/tests/system/Models/UpdateModelTest.php @@ -31,10 +31,9 @@ use Tests\Support\Models\WithoutAutoIncrementModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class UpdateModelTest extends LiveModelTestCase { public function testSetWorksWithUpdate(): void @@ -552,10 +551,9 @@ public function testUpdateWithSetAndEscape(): void } /** - * @dataProvider provideUpdateThrowDatabaseExceptionWithoutWhereClause - * * @param false|null $id */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideUpdateThrowDatabaseExceptionWithoutWhereClause')] public function testUpdateThrowDatabaseExceptionWithoutWhereClause($id, string $exception, string $exceptionMessage): void { $this->expectException($exception); diff --git a/tests/system/Models/ValidationModelRuleGroupTest.php b/tests/system/Models/ValidationModelRuleGroupTest.php index e1de82841832..2a7a7b75258d 100644 --- a/tests/system/Models/ValidationModelRuleGroupTest.php +++ b/tests/system/Models/ValidationModelRuleGroupTest.php @@ -24,10 +24,9 @@ use Tests\Support\Models\ValidModelRuleGroup; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ValidationModelRuleGroupTest extends LiveModelTestCase { protected function setUp(): void diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php index 99780faeba73..753c437250cd 100644 --- a/tests/system/Models/ValidationModelTest.php +++ b/tests/system/Models/ValidationModelTest.php @@ -23,10 +23,9 @@ use Tests\Support\Models\ValidModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class ValidationModelTest extends LiveModelTestCase { protected function setUp(): void diff --git a/tests/system/Models/WhenWhenNotModelTest.php b/tests/system/Models/WhenWhenNotModelTest.php index 3039fc0b57b5..61bf3f375216 100644 --- a/tests/system/Models/WhenWhenNotModelTest.php +++ b/tests/system/Models/WhenWhenNotModelTest.php @@ -16,10 +16,9 @@ use Tests\Support\Models\SecondaryModel; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class WhenWhenNotModelTest extends LiveModelTestCase { public function testWhenWithTrueCondition(): void diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php index f35f30a361d2..795401ecb71d 100644 --- a/tests/system/Pager/PagerRendererTest.php +++ b/tests/system/Pager/PagerRendererTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PagerRendererTest extends CIUnitTestCase { private string $expect; diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php index b7f9866579ab..6da74a9bce2d 100644 --- a/tests/system/Pager/PagerTest.php +++ b/tests/system/Pager/PagerTest.php @@ -25,12 +25,10 @@ use Config\Services; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PagerTest extends CIUnitTestCase { private ?Pager $pager = null; diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php index 758075f1fc7f..2c7f5db96685 100644 --- a/tests/system/Publisher/ContentReplacerTest.php +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ContentReplacerTest extends CIUnitTestCase { public function testReplace(): void diff --git a/tests/system/Publisher/PublisherContentReplaceTest.php b/tests/system/Publisher/PublisherContentReplaceTest.php index ca3cc8fbef1e..4549ed662d5b 100644 --- a/tests/system/Publisher/PublisherContentReplaceTest.php +++ b/tests/system/Publisher/PublisherContentReplaceTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublisherContentReplaceTest extends CIUnitTestCase { private string $file; diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php index af6f3323969d..d3fcc9fe436b 100644 --- a/tests/system/Publisher/PublisherInputTest.php +++ b/tests/system/Publisher/PublisherInputTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublisherInputTest extends CIUnitTestCase { /** diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php index 816f045d2b21..6c4670c282ec 100644 --- a/tests/system/Publisher/PublisherOutputTest.php +++ b/tests/system/Publisher/PublisherOutputTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublisherOutputTest extends CIUnitTestCase { /** diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php index ac4dce6b52fa..952c3c4608ca 100644 --- a/tests/system/Publisher/PublisherRestrictionsTest.php +++ b/tests/system/Publisher/PublisherRestrictionsTest.php @@ -23,9 +23,8 @@ * file properly prevent disallowed actions. * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublisherRestrictionsTest extends CIUnitTestCase { /** @@ -48,9 +47,7 @@ public function testImmutableRestrictions(): void $this->assertArrayNotHasKey(SUPPORTPATH, $restrictions); } - /** - * @dataProvider provideDefaultPublicRestrictions - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDefaultPublicRestrictions')] public function testDefaultPublicRestrictions(string $path): void { $publisher = new Publisher(ROOTPATH, FCPATH); @@ -80,9 +77,7 @@ public static function provideDefaultPublicRestrictions(): iterable ]; } - /** - * @dataProvider provideDestinations - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDestinations')] public function testDestinations(string $destination, bool $allowed): void { config('Publisher')->restrictions = [ diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php index e62ed76a48dd..2dd26c2c7a9f 100644 --- a/tests/system/Publisher/PublisherSupportTest.php +++ b/tests/system/Publisher/PublisherSupportTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class PublisherSupportTest extends CIUnitTestCase { /** diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php index 471ae58157c5..22fd3a0e10f8 100644 --- a/tests/system/RESTful/ResourceControllerTest.php +++ b/tests/system/RESTful/ResourceControllerTest.php @@ -37,14 +37,11 @@ * so we need to make sure that the methods routed to * return correct responses. * - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ResourceControllerTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php index 975f0d2b9e0c..f2d37b1c9ce9 100644 --- a/tests/system/RESTful/ResourcePresenterTest.php +++ b/tests/system/RESTful/ResourcePresenterTest.php @@ -31,14 +31,11 @@ * so we need to make sure that the methods routed to * return correct responses. * - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ResourcePresenterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php index 6c531db06a8b..f476cb2aa27b 100644 --- a/tests/system/Router/AutoRouterImprovedTest.php +++ b/tests/system/Router/AutoRouterImprovedTest.php @@ -28,9 +28,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class AutoRouterImprovedTest extends CIUnitTestCase { private RouteCollection $collection; @@ -458,9 +457,7 @@ public function testDoesNotTranslateDashInParam(): void $this->assertSame(['a-b'], $params); } - /** - * @dataProvider provideTranslateUriToCamelCase - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideTranslateUriToCamelCase')] public function testTranslateUriToCamelCase( string $uri, ?string $expDirectory, @@ -532,9 +529,7 @@ public static function provideTranslateUriToCamelCase(): iterable ]; } - /** - * @dataProvider provideRejectTranslateUriToCamelCase - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRejectTranslateUriToCamelCase')] public function testRejectTranslateUriToCamelCase(string $uri, string $expMsg): void { $this->expectException(PageNotFoundException::class); diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php index 779639204ded..8707a6bceafd 100644 --- a/tests/system/Router/DefinedRouteCollectorTest.php +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DefinedRouteCollectorTest extends CIUnitTestCase { private function createRouteCollection(array $config = [], $moduleConfig = null): RouteCollection diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php index cbde8a16a118..701d79f7bdc1 100644 --- a/tests/system/Router/RouteCollectionReverseRouteTest.php +++ b/tests/system/Router/RouteCollectionReverseRouteTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RouteCollectionReverseRouteTest extends CIUnitTestCase { protected function setUp(): void @@ -143,9 +142,7 @@ public static function provideReverseRoutingDefaultNamespaceAppController(): ite ]; } - /** - * @dataProvider provideReverseRoutingDefaultNamespaceAppController - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideReverseRoutingDefaultNamespaceAppController')] public function testReverseRoutingDefaultNamespaceAppController(string $controller): void { $routes = $this->getCollector(); diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 400f9a99ca29..0911b486d7a1 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -25,9 +25,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RouteCollectionTest extends CIUnitTestCase { protected function setUp(): void @@ -485,9 +484,7 @@ static function ($routes): void { $this->assertSame($expected, $routes->getRoutes()); } - /** - * @dataProvider provideNestedGroupingWorksWithRootPrefix - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideNestedGroupingWorksWithRootPrefix')] public function testNestedGroupingWorksWithRootPrefix( string $group, string $subgroup, @@ -1323,9 +1320,7 @@ static function (): void {}, $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']); } - /** - * @dataProvider provideRoutesOptionsWithSameFromTwoRoutes - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRoutesOptionsWithSameFromTwoRoutes')] public function testRoutesOptionsWithSameFromTwoRoutes(array $options1, array $options2): void { $routes = $this->getCollector(); @@ -1772,10 +1767,9 @@ public static function provideRouteDefaultNamespace(): iterable } /** - * @dataProvider provideRouteDefaultNamespace - * * @param mixed $namespace */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRouteDefaultNamespace')] public function testAutoRoutesControllerNameReturnsFQCN($namespace): void { $routes = $this->getCollector(); @@ -1793,10 +1787,9 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace): void } /** - * @dataProvider provideRouteDefaultNamespace - * * @param mixed $namespace */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRouteDefaultNamespace')] public function testRoutesControllerNameReturnsFQCN($namespace): void { Services::request()->setMethod(Method::GET); diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index fb71568e8af3..09f710978d42 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -29,9 +29,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RouterTest extends CIUnitTestCase { private RouteCollection $collection; @@ -913,9 +912,7 @@ public function testSetDirectoryInvalid(): void $this->assertSame('', $router->directory()); } - /** - * @dataProvider provideRedirectRoute - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirectRoute')] public function testRedirectRoute( string $route, string $redirectFrom, diff --git a/tests/system/Security/CheckPhpIniTest.php b/tests/system/Security/CheckPhpIniTest.php index 9028a676ca90..08c49c3094fb 100644 --- a/tests/system/Security/CheckPhpIniTest.php +++ b/tests/system/Security/CheckPhpIniTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CheckPhpIniTest extends CIUnitTestCase { public function testCheckIni(): void diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php index 6ea63b694ddc..dd4cd16847aa 100644 --- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php @@ -25,9 +25,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SecurityCSRFCookieRandomizeTokenTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index c2d11db26a05..3d6386d70036 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -35,14 +35,11 @@ use PHPUnit\Framework\Attributes\WithoutErrorHandler; /** - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index 397932889182..90bb0e49c014 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -33,14 +33,11 @@ use Config\Session as SessionConfig; /** - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class SecurityCSRFSessionTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index e8b93cf7ab05..d449e6b2dec4 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -26,12 +26,10 @@ use Config\Services; /** - * @backupGlobals enabled - * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SecurityTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php index f7f9f855895a..f239402acc08 100644 --- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php +++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php @@ -17,10 +17,9 @@ use Config\Session as SessionConfig; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class MySQLiHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php index deae7988c04c..58dd19ab50e8 100644 --- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php +++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php @@ -17,10 +17,9 @@ use Config\Session as SessionConfig; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class PostgreHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index 8d5a76c9be14..aa03d39e6c7f 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -18,12 +18,10 @@ use Config\Session as SessionConfig; /** - * @group DatabaseLive - * - * @requires extension redis - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('redis')] final class RedisHandlerTest extends CIUnitTestCase { private string $sessionDriver = RedisHandler::class; @@ -136,9 +134,7 @@ public function testSecondaryReadAfterClose(): void $handler->close(); } - /** - * @dataProvider provideSetSavePath - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSetSavePath')] public function testSetSavePath(string $savePath, array $expected): void { $option = ['savePath' => $savePath]; diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php index 63009e5230a0..26b4a02558e4 100644 --- a/tests/system/Session/SessionTest.php +++ b/tests/system/Session/SessionTest.php @@ -24,14 +24,11 @@ use Config\Session as SessionConfig; /** - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class SessionTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php index 17a6be99c891..66f8a3dc3809 100644 --- a/tests/system/SparkTest.php +++ b/tests/system/SparkTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SparkTest extends CIUnitTestCase { public function testCanUseOption(): void diff --git a/tests/system/SuperglobalsTest.php b/tests/system/SuperglobalsTest.php index 54ab69958ec4..fa61bc8f30f8 100644 --- a/tests/system/SuperglobalsTest.php +++ b/tests/system/SuperglobalsTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class SuperglobalsTest extends CIUnitTestCase { public function testSetGet(): void diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php index 9a6976a8b516..7f664b5bb183 100644 --- a/tests/system/Test/BootstrapFCPATHTest.php +++ b/tests/system/Test/BootstrapFCPATHTest.php @@ -24,9 +24,8 @@ * from correctFCPATH(); * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class BootstrapFCPATHTest extends CIUnitTestCase { private string $currentDir = __DIR__; diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index 94146215bc13..b5f2bdd516be 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -27,14 +27,11 @@ /** * Exercise our Controller class. * - * @runTestsInSeparateProcesses - * - * @preserveGlobalState disabled - * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] +#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class ControllerTestTraitTest extends CIUnitTestCase { use ControllerTestTrait; diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php index 73d38a0e809d..1d086db48c37 100644 --- a/tests/system/Test/DOMParserTest.php +++ b/tests/system/Test/DOMParserTest.php @@ -15,9 +15,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DOMParserTest extends CIUnitTestCase { protected function setUp(): void @@ -91,10 +90,9 @@ public static function provideText(): iterable } /** - * @dataProvider provideText - * * @param string $text */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideText')] public function testSeeText($text): void { $dom = new DOMParser(); @@ -139,10 +137,9 @@ public function testSeeFail(): void } /** - * @dataProvider provideText - * * @param string $text */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideText')] public function testSeeElement($text): void { $dom = new DOMParser(); diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php index f00cf6f5f81a..236b6ab126a8 100644 --- a/tests/system/Test/FabricatorTest.php +++ b/tests/system/Test/FabricatorTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FabricatorTest extends CIUnitTestCase { /** diff --git a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php index 568bbb25d05f..9b1f451c6565 100644 --- a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php +++ b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php @@ -18,10 +18,9 @@ use Config\Services; /** - * @group Others - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FeatureTestAutoRoutingImprovedTest extends CIUnitTestCase { use FeatureTestTrait; diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index bd746c7a9c57..b259448f2e90 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -24,10 +24,9 @@ use Config\Services; /** - * @group DatabaseLive - * * @internal */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class FeatureTestTraitTest extends CIUnitTestCase { use FeatureTestTrait; @@ -359,12 +358,11 @@ public static function provideOpenCliRoutesFromHttpGot404(): iterable } /** - * @dataProvider provideOpenCliRoutesFromHttpGot404 - * * @param mixed $from * @param mixed $to * @param mixed $httpGet */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideOpenCliRoutesFromHttpGot404')] public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet): void { $this->expectException(PageNotFoundException::class); diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php index 911a03740f18..e8ed466e6dff 100644 --- a/tests/system/Test/FilterTestTraitTest.php +++ b/tests/system/Test/FilterTestTraitTest.php @@ -27,9 +27,8 @@ * - class: \Tests\Support\Filters\Customfilter::class * * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FilterTestTraitTest extends CIUnitTestCase { use FilterTestTrait; diff --git a/tests/system/Test/IniTestTraitTest.php b/tests/system/Test/IniTestTraitTest.php index d577a23deb56..70c78f2f1c79 100644 --- a/tests/system/Test/IniTestTraitTest.php +++ b/tests/system/Test/IniTestTraitTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class IniTestTraitTest extends CIUnitTestCase { use IniTestTrait; diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php index 324a56c7f285..caa7aa41fe1e 100644 --- a/tests/system/Test/ReflectionHelperTest.php +++ b/tests/system/Test/ReflectionHelperTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ReflectionHelperTest extends CIUnitTestCase { public function testGetPrivatePropertyWithObject(): void diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php index 26d7ee7898d3..22c2844f29ca 100644 --- a/tests/system/Test/TestCaseEmissionsTest.php +++ b/tests/system/Test/TestCaseEmissionsTest.php @@ -23,9 +23,8 @@ * test cases need to be run as separate processes. * * @internal - * - * @group SeparateProcess */ +#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] final class TestCaseEmissionsTest extends CIUnitTestCase { /** @@ -41,11 +40,8 @@ final class TestCaseEmissionsTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeadersEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -74,10 +70,8 @@ public function testHeadersEmitted(): void $this->assertHeaderEmitted('set-cookie: FOO=bar', true); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] public function testHeadersNotEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php index 6521029636d3..f939b055ac20 100644 --- a/tests/system/Test/TestCaseTest.php +++ b/tests/system/Test/TestCaseTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TestCaseTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Test/TestLoggerTest.php b/tests/system/Test/TestLoggerTest.php index facf492c83b6..5ea2003942d3 100644 --- a/tests/system/Test/TestLoggerTest.php +++ b/tests/system/Test/TestLoggerTest.php @@ -17,14 +17,11 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TestLoggerTest extends CIUnitTestCase { - /** - * @dataProvider provideDidLogMethod - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDidLogMethod')] public function testDidLogMethod(bool $expected, string $level, string $message, bool $exact): void { (new TestLogger(new Logger()))->log('error', 'Some variable did not contain a value.'); diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php index 3157a31b18d5..6794d222d68d 100644 --- a/tests/system/Test/TestResponseTest.php +++ b/tests/system/Test/TestResponseTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TestResponseTest extends CIUnitTestCase { private ?TestResponse $testResponse = null; @@ -34,9 +33,7 @@ protected function setUp(): void parent::setUp(); } - /** - * @dataProvider provideHttpStatusCodes - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideHttpStatusCodes')] public function testIsOK(int $code, bool $isOk): void { $this->getTestResponse('Hello World'); @@ -224,9 +221,7 @@ public function testAssertStatus(): void $this->testResponse->assertStatus(201); } - /** - * @dataProvider provideHttpStatusCodes - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideHttpStatusCodes')] public function testAssertIsOK(int $code, bool $isOk): void { $this->getTestResponse('

        Hello World

        ', ['statusCode' => $code]); diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 683d1ad50145..0b8bfdb726b5 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ThrottleTest extends CIUnitTestCase { private CacheInterface $cache; @@ -190,9 +189,7 @@ public function testFlooding(): void $this->assertEqualsWithDelta(10.0, round($this->cache->get('throttler_127.0.0.1')), PHP_FLOAT_EPSILON); } - /** - * @dataProvider provideTokenTimeCalculationUCs - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideTokenTimeCalculationUCs')] public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void { $key = 'testkey'; diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php index 23547a6e0a0e..9774c6f19b61 100644 --- a/tests/system/Typography/TypographyTest.php +++ b/tests/system/Typography/TypographyTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TypographyTest extends CIUnitTestCase { private Typography $typography; diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php index 911365538e57..496a5e3c835e 100644 --- a/tests/system/Validation/CreditCardRulesTest.php +++ b/tests/system/Validation/CreditCardRulesTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CreditCardRulesTest extends CIUnitTestCase { private Validation $validation; @@ -50,9 +49,7 @@ protected function setUp(): void $this->validation->reset(); } - /** - * @dataProvider provideValidCCNumber - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidCCNumber')] public function testValidCCNumber(string $type, ?string $number, bool $expected): void { $data = ['cc' => $number]; diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php index d8795fac46c4..af811eddb4bc 100644 --- a/tests/system/Validation/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/DatabaseRelatedRulesTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group DatabaseLive */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest { protected array $config = [ diff --git a/tests/system/Validation/DotArrayFilterTest.php b/tests/system/Validation/DotArrayFilterTest.php index 67274860ed35..c1b2ac7fc523 100644 --- a/tests/system/Validation/DotArrayFilterTest.php +++ b/tests/system/Validation/DotArrayFilterTest.php @@ -17,9 +17,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DotArrayFilterTest extends CIUnitTestCase { public function testRunReturnEmptyArray(): void diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php index a29c95c18add..8083d95939e1 100644 --- a/tests/system/Validation/FileRulesTest.php +++ b/tests/system/Validation/FileRulesTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileRulesTest extends CIUnitTestCase { private Validation $validation; diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php index 75d0cc968135..62c8ce257b31 100644 --- a/tests/system/Validation/FormatRulesTest.php +++ b/tests/system/Validation/FormatRulesTest.php @@ -21,10 +21,9 @@ /** * @internal * - * @group Others - * * @no-final */ +#[\PHPUnit\Framework\Attributes\Group('Others')] class FormatRulesTest extends CIUnitTestCase { public const ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ'; @@ -86,9 +85,7 @@ public function testRegexMatchFalse(): void $this->assertFalse($this->validation->run($data)); } - /** - * @dataProvider provideValidUrl - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidUrl')] public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void { $data = [ @@ -102,9 +99,7 @@ public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void $this->assertSame($isLoose, $this->validation->run($data)); } - /** - * @dataProvider provideValidUrl - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidUrl')] public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict): void { $data = [ @@ -230,9 +225,7 @@ public static function provideValidUrl(): iterable ]; } - /** - * @dataProvider provideValidEmail - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidEmail')] public function testValidEmail(?string $email, bool $expected): void { $data = [ @@ -246,9 +239,7 @@ public function testValidEmail(?string $email, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - /** - * @dataProvider provideValidEmails - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidEmails')] public function testValidEmails(?string $email, bool $expected): void { $data = [ @@ -310,9 +301,7 @@ public static function provideValidEmails(): iterable ]; } - /** - * @dataProvider provideValidIP - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidIP')] public function testValidIP(?string $ip, ?string $which, bool $expected): void { $data = [ @@ -378,10 +367,9 @@ public static function provideValidIP(): iterable } /** - * @dataProvider provideString - * * @param int|string $str */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideString')] public function testString($str, bool $expected): void { $data = [ @@ -413,9 +401,7 @@ public static function provideString(): iterable ]; } - /** - * @dataProvider provideAlpha - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAlpha')] public function testAlpha(?string $str, bool $expected): void { $data = [ @@ -455,9 +441,7 @@ public static function provideAlpha(): iterable ]; } - /** - * @dataProvider provideAlphaSpace - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaSpace')] public function testAlphaSpace(?string $value, bool $expected): void { $data = [ @@ -501,9 +485,7 @@ public static function provideAlphaSpace(): iterable ]; } - /** - * @dataProvider alphaNumericProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('alphaNumericProvider')] public function testAlphaNumeric(?string $str, bool $expected): void { $data = [ @@ -539,9 +521,7 @@ public static function alphaNumericProvider(): iterable ]; } - /** - * @dataProvider provideAlphaNumericPunct - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaNumericPunct')] public function testAlphaNumericPunct(?string $str, bool $expected): void { $data = [ @@ -633,9 +613,7 @@ public static function provideAlphaNumericPunct(): iterable ]; } - /** - * @dataProvider alphaNumericProvider - */ + #[\PHPUnit\Framework\Attributes\DataProvider('alphaNumericProvider')] public function testAlphaNumericSpace(?string $str, bool $expected): void { $data = [ @@ -671,9 +649,7 @@ public function alphaNumericSpaceProvider(): Generator ]; } - /** - * @dataProvider provideAlphaDash - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaDash')] public function testAlphaDash(?string $str, bool $expected): void { $data = [ @@ -709,9 +685,7 @@ public static function provideAlphaDash(): iterable ]; } - /** - * @dataProvider provideHex - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideHex')] public function testHex(?string $str, bool $expected): void { $data = [ @@ -747,9 +721,7 @@ public static function provideHex(): iterable ]; } - /** - * @dataProvider provideNumeric - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideNumeric')] public function testNumeric(?string $str, bool $expected): void { $data = [ @@ -804,10 +776,9 @@ public static function provideNumeric(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374 * - * @dataProvider provideInvalidIntegerType - * * @param mixed $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidIntegerType')] public function testIntegerWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules([ @@ -823,10 +794,9 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374 * - * @dataProvider provideInvalidIntegerType - * * @param mixed $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidIntegerType')] public function testNumericWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules([ @@ -869,9 +839,7 @@ public static function provideInvalidIntegerType(): iterable ]; } - /** - * @dataProvider provideInteger - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInteger')] public function testInteger(?string $str, bool $expected): void { $data = [ @@ -923,9 +891,7 @@ public static function provideInteger(): iterable ]; } - /** - * @dataProvider provideDecimal - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDecimal')] public function testDecimal(?string $str, bool $expected): void { $data = [ @@ -981,9 +947,7 @@ public static function provideDecimal(): iterable ]; } - /** - * @dataProvider provideNatural - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideNatural')] public function testNatural(?string $str, bool $expected): void { $data = [ @@ -1023,9 +987,7 @@ public static function provideNatural(): iterable ]; } - /** - * @dataProvider provideNaturalNoZero - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideNaturalNoZero')] public function testNaturalNoZero(?string $str, bool $expected): void { $data = [ @@ -1065,9 +1027,7 @@ public static function provideNaturalNoZero(): iterable ]; } - /** - * @dataProvider provideBase64 - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideBase64')] public function testBase64(?string $str, bool $expected): void { $data = [ @@ -1099,9 +1059,7 @@ public static function provideBase64(): iterable ]; } - /** - * @dataProvider provideJson - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideJson')] public function testJson(?string $str, bool $expected): void { $data = [ @@ -1157,9 +1115,7 @@ public static function provideJson(): iterable ]; } - /** - * @dataProvider provideTimeZone - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideTimeZone')] public function testTimeZone(?string $str, bool $expected): void { $data = [ @@ -1195,9 +1151,7 @@ public static function provideTimeZone(): iterable ]; } - /** - * @dataProvider provideValidDate - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidDate')] public function testValidDate(?string $str, ?string $format, bool $expected): void { $data = [ diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php index 54b0756c094c..6ea38beea074 100644 --- a/tests/system/Validation/RulesTest.php +++ b/tests/system/Validation/RulesTest.php @@ -21,10 +21,9 @@ /** * @internal * - * @group Others - * * @no-final */ +#[\PHPUnit\Framework\Attributes\Group('Others')] class RulesTest extends CIUnitTestCase { protected Validation $validation; @@ -54,9 +53,7 @@ protected function setUp(): void $this->validation->reset(); } - /** - * @dataProvider provideRequired - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequired')] public function testRequired(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'required']); @@ -76,9 +73,7 @@ public static function provideRequired(): iterable ]; } - /** - * @dataProvider provideIfExist - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIfExist')] public function testIfExist(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -129,9 +124,7 @@ public static function provideIfExist(): iterable ]; } - /** - * @dataProvider providePermitEmpty - */ + #[\PHPUnit\Framework\Attributes\DataProvider('providePermitEmpty')] public function testPermitEmpty(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -298,9 +291,7 @@ public static function providePermitEmpty(): iterable ]; } - /** - * @dataProvider provideMatches - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMatches')] public function testMatches(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'matches[bar]']); @@ -322,9 +313,7 @@ public static function provideMatches(): iterable ]; } - /** - * @dataProvider provideMatchesNestedCases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMatchesNestedCases')] public function testMatchesNested(array $data, bool $expected): void { $this->validation->setRules(['nested.foo' => 'matches[nested.bar]']); @@ -339,9 +328,7 @@ public static function provideMatchesNestedCases(): iterable ]; } - /** - * @dataProvider provideDiffers - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDiffers')] public function testDiffers(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'differs[bar]']); @@ -363,18 +350,14 @@ public static function provideDiffers(): iterable ]; } - /** - * @dataProvider provideMatchesNestedCases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMatchesNestedCases')] public function testDiffersNested(array $data, bool $expected): void { $this->validation->setRules(['nested.foo' => 'differs[nested.bar]']); $this->assertSame(! $expected, $this->validation->run($data)); } - /** - * @dataProvider provideEquals - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEquals')] public function testEquals(array $data, string $param, bool $expected): void { $this->validation->setRules(['foo' => "equals[{$param}]"]); @@ -392,9 +375,7 @@ public static function provideEquals(): iterable ]; } - /** - * @dataProvider provideMinLengthCases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMinLengthCases')] public function testMinLength(?string $data, string $length, bool $expected): void { $this->validation->setRules(['foo' => "min_length[{$length}]"]); @@ -411,9 +392,7 @@ public static function provideMinLengthCases(): iterable ]; } - /** - * @dataProvider provideMinLengthCases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMinLengthCases')] public function testMaxLength(?string $data, string $length, bool $expected): void { $this->validation->setRules(['foo' => "max_length[{$length}]"]); @@ -427,10 +406,9 @@ public function testMaxLengthReturnsFalseWithNonNumericVal(): void } /** - * @dataProvider provideExactLength - * * @param int|string|null $data */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideExactLength')] public function testExactLength($data, bool $expected): void { $this->validation->setRules(['foo' => 'exact_length[3]']); @@ -457,9 +435,7 @@ public function testExactLengthDetectsBadLength(): void $this->assertFalse($this->validation->run($data)); } - /** - * @dataProvider provideGreaterThan - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThan')] public function testGreaterThan(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -482,9 +458,7 @@ public static function provideGreaterThan(): iterable ]; } - /** - * @dataProvider provideGreaterThanEqual - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanEqual')] public function testGreaterThanEqual(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -508,9 +482,7 @@ public static function provideGreaterThanEqual(): iterable ]; } - /** - * @dataProvider provideLessThan - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThan')] public function testLessThan(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -534,9 +506,7 @@ public static function provideLessThan(): iterable ]; } - /** - * @dataProvider provideLessThanEqual - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThanEqual')] public function testLessThanEqual(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -560,9 +530,7 @@ public static function provideLessThanEqual(): iterable ]; } - /** - * @dataProvider provideInList - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInList')] public function testInList(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -570,9 +538,7 @@ public function testInList(?string $first, ?string $second, bool $expected): voi $this->assertSame($expected, $this->validation->run($data)); } - /** - * @dataProvider provideInList - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideInList')] public function testNotInList(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -595,9 +561,7 @@ public static function provideInList(): iterable ]; } - /** - * @dataProvider provideRequiredWith - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWith')] public function testRequiredWith(?string $field, ?string $check, bool $expected): void { $data = [ @@ -650,9 +614,8 @@ public static function provideRequiredWith(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/7557 - * - * @dataProvider provideRequiredWithAndOtherRules */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithAndOtherRules')] public function testRequiredWithAndOtherRules(bool $expected, array $data): void { $this->validation->setRules([ @@ -686,9 +649,7 @@ public static function provideRequiredWithAndOtherRules(): iterable ]; } - /** - * @dataProvider provideRequiredWithAndOtherRuleWithValueZero - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithAndOtherRuleWithValueZero')] public function testRequiredWithAndOtherRuleWithValueZero(bool $expected, array $data): void { $this->validation->setRules([ @@ -710,9 +671,7 @@ public static function provideRequiredWithAndOtherRuleWithValueZero(): iterable ]; } - /** - * @dataProvider provideRequiredWithout - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithout')] public function testRequiredWithout(?string $field, ?string $check, bool $expected): void { $data = [ @@ -762,9 +721,7 @@ public static function provideRequiredWithout(): iterable ]; } - /** - * @dataProvider provideRequiredWithoutMultiple - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithoutMultiple')] public function testRequiredWithoutMultiple(string $foo, string $bar, string $baz, bool $result): void { $this->validation->setRules(['foo' => 'required_without[bar,baz]']); @@ -813,9 +770,7 @@ public static function provideRequiredWithoutMultiple(): iterable ]; } - /** - * @dataProvider provideRequiredWithoutMultipleWithoutFields - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithoutMultipleWithoutFields')] public function testRequiredWithoutMultipleWithoutFields(array $data, bool $result): void { $this->validation->setRules(['foo' => 'required_without[bar,baz]']); @@ -855,9 +810,7 @@ public static function provideRequiredWithoutMultipleWithoutFields(): iterable ]; } - /** - * @dataProvider provideFieldExists - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideFieldExists')] public function testFieldExists(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php index 754de75a67e6..8903ab073c5b 100644 --- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php +++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CreditCardRulesTest extends CIUnitTestCase { private Validation $validation; @@ -51,9 +50,7 @@ protected function setUp(): void $this->validation->reset(); } - /** - * @dataProvider provideValidCCNumber - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidCCNumber')] public function testValidCCNumber(string $type, ?string $number, bool $expected): void { $data = ['cc' => $number]; diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php index c584b572266d..208d0cb3f79e 100644 --- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php @@ -26,9 +26,8 @@ * @internal * * @no-final - * - * @group DatabaseLive */ +#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] class DatabaseRelatedRulesTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php index d6c20dfaef6c..9a8a9f68c010 100644 --- a/tests/system/Validation/StrictRules/FileRulesTest.php +++ b/tests/system/Validation/StrictRules/FileRulesTest.php @@ -21,9 +21,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FileRulesTest extends CIUnitTestCase { private Validation $validation; diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php index b6bc2d55bed4..8b08a4d300bd 100644 --- a/tests/system/Validation/StrictRules/FormatRulesTest.php +++ b/tests/system/Validation/StrictRules/FormatRulesTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class FormatRulesTest extends TraditionalFormatRulesTest { protected array $config = [ diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php index e4a767421054..5db01491bde3 100644 --- a/tests/system/Validation/StrictRules/RulesTest.php +++ b/tests/system/Validation/StrictRules/RulesTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class RulesTest extends TraditionalRulesTest { protected Validation $validation; @@ -43,9 +42,7 @@ final class RulesTest extends TraditionalRulesTest ], ]; - /** - * @dataProvider providePermitEmptyStrict - */ + #[\PHPUnit\Framework\Attributes\DataProvider('providePermitEmptyStrict')] public function testPermitEmptyStrict(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -100,10 +97,9 @@ public static function providePermitEmptyStrict(): iterable } /** - * @dataProvider provideGreaterThanEqualStrict - * * @param int $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanEqualStrict')] public function testGreaterThanEqualStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "greater_than_equal_to[{$param}]"]); @@ -126,10 +122,9 @@ public static function provideGreaterThanEqualStrict(): iterable } /** - * @dataProvider provideGreaterThanStrict - * * @param int $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanStrict')] public function testGreaterThanStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "greater_than[{$param}]"]); @@ -153,10 +148,9 @@ public static function provideGreaterThanStrict(): iterable } /** - * @dataProvider provideLessThanStrict - * * @param int $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThanStrict')] public function testLessThanStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "less_than[{$param}]"]); @@ -181,10 +175,9 @@ public static function provideLessThanStrict(): iterable } /** - * @dataProvider provideLessEqualThanStrict - * * @param int $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideLessEqualThanStrict')] public function testLessEqualThanStrict($value, ?string $param, bool $expected): void { $this->validation->setRules(['foo' => "less_than_equal_to[{$param}]"]); @@ -206,9 +199,7 @@ public static function provideLessEqualThanStrict(): iterable ]; } - /** - * @dataProvider provideMatches - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideMatches')] public function testMatches(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'matches[bar]']); @@ -230,9 +221,7 @@ public static function provideMatches(): iterable ]; } - /** - * @dataProvider provideDiffers - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideDiffers')] public function testDiffers(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'differs[bar]']); diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php index 3e6a1d0b5a1e..82a6944a7931 100644 --- a/tests/system/Validation/StrictRules/ValidationTest.php +++ b/tests/system/Validation/StrictRules/ValidationTest.php @@ -18,9 +18,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ValidationTest extends TraditionalValidationTest { protected static array $config = [ diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index f47e62b0f319..861e6b681d6b 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -29,10 +29,9 @@ /** * @internal * - * @group Others - * * @no-final */ +#[\PHPUnit\Framework\Attributes\Group('Others')] class ValidationTest extends CIUnitTestCase { protected Validation $validation; @@ -190,10 +189,9 @@ public function testSetRuleOverwritesRuleReverse(): void } /** - * @dataProvider provideSetRuleRulesFormat - * * @param mixed $rules */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSetRuleRulesFormat')] public function testSetRuleRulesFormat(bool $expected, $rules): void { if (! $expected) { @@ -445,10 +443,9 @@ public function testCallableRuleWithLabel(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5368 * - * @dataProvider provideCanValidatetArrayData - * * @param mixed $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideCanValidatetArrayData')] public function testCanValidatetArrayData($value, bool $expected): void { $data = []; @@ -498,10 +495,9 @@ public static function provideCanValidatetArrayData(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374 * - * @dataProvider provideIsIntWithInvalidTypeData - * * @param mixed $value */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIsIntWithInvalidTypeData')] public function testIsIntWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules(['foo' => 'is_int']); @@ -735,11 +731,10 @@ public function testRunWithCustomErrorsAndAsteriskField(): void } /** - * @dataProvider provideRulesSetup - * * @param list|string $rules * @param string $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRulesSetup')] public function testRulesSetup($rules, $expected, array $errors = []): void { $data = ['foo' => '']; @@ -1132,9 +1127,7 @@ public function testRulesForObjectField(): void ], $this->validation->getErrors()); } - /** - * @dataProvider provideRulesForArrayField - */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideRulesForArrayField')] public function testRulesForArrayField(array $body, array $rules, array $results): void { $config = new App(); @@ -1373,10 +1366,9 @@ public function testTranslatedLabelTagReplacement(): void } /** - * @dataProvider provideIfExistRuleWithAsterisk - * * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521 */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideIfExistRuleWithAsterisk')] public function testIfExistRuleWithAsterisk(bool $expected, array $rules, array $data): void { $actual = $this->validation->setRules($rules)->run($data); @@ -1443,10 +1435,9 @@ public static function provideIfExistRuleWithAsterisk(): iterable } /** - * @dataProvider provideValidationOfArrayData - * * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510 */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideValidationOfArrayData')] public function testValidationOfArrayData(bool $expected, array $rules, array $data): void { $actual = $this->validation->setRules($rules)->run($data); @@ -1499,10 +1490,9 @@ public static function provideValidationOfArrayData(): iterable } /** - * @dataProvider provideSplittingOfComplexStringRules - * * @see https://github.com/codeigniter4/CodeIgniter4/issues/4929 */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideSplittingOfComplexStringRules')] public function testSplittingOfComplexStringRules(string $input, array $expected): void { $splitter = $this->getPrivateMethodInvoker($this->validation, 'splitRules'); diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php index dd400e4ef7e8..145a2303327b 100644 --- a/tests/system/View/CellTest.php +++ b/tests/system/View/CellTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class CellTest extends CIUnitTestCase { private MockCache $cache; diff --git a/tests/system/View/ControlledCellTest.php b/tests/system/View/ControlledCellTest.php index 9da6d1162b85..542fc733c812 100644 --- a/tests/system/View/ControlledCellTest.php +++ b/tests/system/View/ControlledCellTest.php @@ -29,9 +29,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ControlledCellTest extends CIUnitTestCase { public function testCellRendersDefaultValues(): void diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php index 225b10d18462..bf8eecfb43ab 100644 --- a/tests/system/View/DecoratorsTest.php +++ b/tests/system/View/DecoratorsTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class DecoratorsTest extends CIUnitTestCase { private FileLocator $loader; diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php index 497dab64455e..1411eacc83a6 100644 --- a/tests/system/View/ParserFilterTest.php +++ b/tests/system/View/ParserFilterTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ParserFilterTest extends CIUnitTestCase { private FileLocator $loader; diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php index 9d6b97dec716..c24b2bdb3f97 100644 --- a/tests/system/View/ParserPluginTest.php +++ b/tests/system/View/ParserPluginTest.php @@ -19,9 +19,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ParserPluginTest extends CIUnitTestCase { private Parser $parser; @@ -44,12 +43,9 @@ public function testCurrentURL(): void $this->assertSame(current_url(), $this->parser->renderString($template)); } - /** - * @runInSeparateProcess - * @preserveGlobalState disabled - * - * @group SeparateProcess - */ + #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] + #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] public function testPreviousURL(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index e724edc1d4eb..177377c85dd3 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -23,9 +23,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ParserTest extends CIUnitTestCase { private FileLocator $loader; @@ -477,11 +476,10 @@ public static function provideEscHandling(): iterable } /** - * @dataProvider provideEscHandling - * * @param mixed $value * @param mixed|null $expected */ + #[\PHPUnit\Framework\Attributes\DataProvider('provideEscHandling')] public function testEscHandling($value, $expected = null): void { if ($expected === null) { diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php index 2dfe08cae3a5..d8582f4d0e0e 100644 --- a/tests/system/View/TableTest.php +++ b/tests/system/View/TableTest.php @@ -20,9 +20,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class TableTest extends CIUnitTestCase { private Table $table; @@ -58,9 +57,7 @@ public function testSetCaption(): void $this->assertSame('awesome cap', $this->table->caption); } - /** - * @depends testPrepArgs - */ + #[\PHPUnit\Framework\Attributes\Depends('testPrepArgs')] public function testSetHeading(): void { // uses _prep_args internally, so we'll just do a quick @@ -150,9 +147,7 @@ public function testSetFootingWithStyle(): void ); } - /** - * @depends testPrepArgs - */ + #[\PHPUnit\Framework\Attributes\Depends('testPrepArgs')] public function testAddRow(): void { // uses _prep_args internally, so we'll just do a quick @@ -783,9 +778,7 @@ public function testInvalidCallback(): void $this->assertStringContainsString('
        ', $generated); } - /** - * @dataProvider orderedColumnUsecases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('orderedColumnUsecases')] public function testAddRowAndGenerateOrderedColumns(array $heading, array $row, string $expectContainsString): void { $this->table->setHeading($heading); @@ -797,9 +790,7 @@ public function testAddRowAndGenerateOrderedColumns(array $heading, array $row, $this->assertStringContainsString($expectContainsString, $generated); } - /** - * @dataProvider orderedColumnUsecases - */ + #[\PHPUnit\Framework\Attributes\DataProvider('orderedColumnUsecases')] public function testGenerateOrderedColumns(array $heading, array $row, string $expectContainsString): void { $this->table->setHeading($heading); diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index 996db86be92a..9a51d9b2eab7 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -22,9 +22,8 @@ /** * @internal - * - * @group Others */ +#[\PHPUnit\Framework\Attributes\Group('Others')] final class ViewTest extends CIUnitTestCase { private FileLocator $loader; From add2bbd2a8b00ab610e9b9feb03cdad64475e772 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 23 Apr 2024 00:41:49 +0800 Subject: [PATCH 6841/8282] Adapt FrameworkCodeTest to recognize group attributes --- tests/system/AutoReview/FrameworkCodeTest.php | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php index 346be42e736e..4fbc18e20c90 100644 --- a/tests/system/AutoReview/FrameworkCodeTest.php +++ b/tests/system/AutoReview/FrameworkCodeTest.php @@ -14,16 +14,18 @@ namespace CodeIgniter\AutoReview; use FilesystemIterator; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; +use ReflectionAttribute; use ReflectionClass; use SplFileInfo; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('AutoReview')] +#[Group('AutoReview')] final class FrameworkCodeTest extends TestCase { /** @@ -31,7 +33,7 @@ final class FrameworkCodeTest extends TestCase */ private static array $testClasses = []; - private static array $recognizedGroupAnnotations = [ + private static array $recognizedGroupAttributeNames = [ 'AutoReview', 'CacheLive', 'DatabaseLive', @@ -42,8 +44,8 @@ final class FrameworkCodeTest extends TestCase /** * @param class-string $class */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideEachTestClassHasCorrectGroupAnnotation')] - public function testEachTestClassHasCorrectGroupAnnotation(string $class): void + #[\PHPUnit\Framework\Attributes\DataProvider('provideEachTestClassHasCorrectGroupAttributeName')] + public function testEachTestClassHasCorrectGroupAttributeName(string $class): void { $reflection = new ReflectionClass($class); @@ -53,27 +55,31 @@ public function testEachTestClassHasCorrectGroupAnnotation(string $class): void return; } - $docComment = (string) $reflection->getDocComment(); - $this->assertNotEmpty($docComment, sprintf('[%s] Test class is missing a class-level PHPDoc.', $class)); + $attributes = $reflection->getAttributes(Group::class); + $this->assertNotEmpty($attributes, sprintf('[%s] Test class is missing a #[Group] attribute.', $class)); - preg_match_all('/@group (\S+)/', $docComment, $matches); - array_shift($matches); - $this->assertNotEmpty($matches[0], sprintf('[%s] Test class is missing a @group annotation.', $class)); + $unrecognizedGroups = array_diff( + array_map(static function (ReflectionAttribute $attribute): string { + $groupAttribute = $attribute->newInstance(); + assert($groupAttribute instanceof Group); - $unrecognizedGroups = array_diff($matches[0], self::$recognizedGroupAnnotations); + return $groupAttribute->name(); + }, $attributes), + self::$recognizedGroupAttributeNames + ); $this->assertEmpty($unrecognizedGroups, sprintf( - "[%s] Unexpected @group annotation%s:\n%s\nExpected annotations to be in \"%s\".", + "[%s] Unexpected #[Group] attribute%s:\n%s\nExpected group names to be in \"%s\".", $class, count($unrecognizedGroups) > 1 ? 's' : '', implode("\n", array_map( - static fn (string $group): string => sprintf(' * @group %s', $group), + static fn (string $group): string => sprintf(' * #[Group(\'%s\')]', $group), $unrecognizedGroups )), - implode(', ', self::$recognizedGroupAnnotations) + implode(', ', self::$recognizedGroupAttributeNames) )); } - public static function provideEachTestClassHasCorrectGroupAnnotation(): iterable + public static function provideEachTestClassHasCorrectGroupAttributeName(): iterable { foreach (self::getTestClasses() as $class) { yield $class => [$class]; From c841fb8343c9fbdd1070cf2c9c0815fbffb14181 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 23 Apr 2024 01:29:05 +0800 Subject: [PATCH 6842/8282] Run rector --- tests/system/API/ResponseTraitTest.php | 3 +- tests/system/AutoReview/ComposerJsonTest.php | 6 +- tests/system/AutoReview/FrameworkCodeTest.php | 3 +- tests/system/Autoloader/AutoloaderTest.php | 9 +- .../Autoloader/FileLocatorCachedTest.php | 3 +- tests/system/Autoloader/FileLocatorTest.php | 3 +- tests/system/CLI/CLITest.php | 6 +- tests/system/CLI/ConsoleTest.php | 3 +- tests/system/Cache/CacheFactoryTest.php | 3 +- tests/system/Cache/CacheMockTest.php | 3 +- .../Cache/FactoriesCacheFileHandlerTest.php | 3 +- ...FactoriesCacheFileVarExportHandlerTest.php | 3 +- .../system/Cache/Handlers/BaseHandlerTest.php | 6 +- .../Cache/Handlers/DummyHandlerTest.php | 3 +- .../system/Cache/Handlers/FileHandlerTest.php | 13 +- .../Cache/Handlers/MemcachedHandlerTest.php | 3 +- .../Cache/Handlers/PredisHandlerTest.php | 3 +- .../Cache/Handlers/RedisHandlerTest.php | 3 +- tests/system/Cache/ResponseCacheTest.php | 6 +- tests/system/CodeIgniterTest.php | 12 +- tests/system/Commands/BaseCommandTest.php | 3 +- tests/system/Commands/CellGeneratorTest.php | 3 +- tests/system/Commands/ClearCacheTest.php | 3 +- tests/system/Commands/ClearDebugbarTest.php | 3 +- tests/system/Commands/ClearLogsTest.php | 3 +- .../system/Commands/CommandGeneratorTest.php | 3 +- tests/system/Commands/CommandTest.php | 6 +- tests/system/Commands/ConfigGeneratorTest.php | 3 +- .../Commands/ConfigurableSortImportsTest.php | 3 +- .../Commands/ControllerGeneratorTest.php | 3 +- tests/system/Commands/CreateDatabaseTest.php | 3 +- .../Commands/Database/MigrateStatusTest.php | 3 +- .../Database/ShowTableInfoMockIOTest.php | 3 +- .../Commands/Database/ShowTableInfoTest.php | 3 +- .../system/Commands/DatabaseCommandsTest.php | 3 +- tests/system/Commands/EntityGeneratorTest.php | 3 +- .../Commands/EnvironmentCommandTest.php | 3 +- tests/system/Commands/FilterCheckTest.php | 3 +- tests/system/Commands/FilterGeneratorTest.php | 3 +- tests/system/Commands/GenerateKeyTest.php | 9 +- tests/system/Commands/GeneratorsTest.php | 3 +- tests/system/Commands/HelpCommandTest.php | 3 +- tests/system/Commands/InfoCacheTest.php | 3 +- .../Commands/MigrationGeneratorTest.php | 3 +- .../Commands/MigrationIntegrationTest.php | 3 +- tests/system/Commands/ModelGeneratorTest.php | 3 +- tests/system/Commands/PublishCommandTest.php | 3 +- tests/system/Commands/RoutesTest.php | 3 +- .../system/Commands/ScaffoldGeneratorTest.php | 3 +- tests/system/Commands/SeederGeneratorTest.php | 3 +- tests/system/Commands/TestGeneratorTest.php | 3 +- .../Translation/LocalizationFinderTest.php | 3 +- .../Commands/Utilities/ConfigCheckTest.php | 3 +- .../Commands/Utilities/NamespacesTest.php | 3 +- .../Routes/AutoRouteCollectorTest.php | 3 +- .../AutoRouteCollectorTest.php | 3 +- .../ControllerMethodReaderTest.php | 3 +- .../Utilities/Routes/ControllerFinderTest.php | 3 +- .../Routes/ControllerMethodReaderTest.php | 3 +- .../Utilities/Routes/FilterCollectorTest.php | 3 +- .../Utilities/Routes/FilterFinderTest.php | 3 +- .../Routes/SampleURIGeneratorTest.php | 6 +- .../Commands/ValidationGeneratorTest.php | 3 +- tests/system/CommonFunctionsSendTest.php | 9 +- tests/system/CommonFunctionsTest.php | 47 ++++--- tests/system/CommonHelperTest.php | 6 +- tests/system/CommonSingleServiceTest.php | 8 +- tests/system/Config/BaseConfigTest.php | 17 ++- tests/system/Config/DotEnvTest.php | 19 ++- tests/system/Config/FactoriesTest.php | 8 +- tests/system/Config/MimesTest.php | 8 +- tests/system/Config/ServicesTest.php | 33 +++-- tests/system/ControllerTest.php | 6 +- tests/system/Cookie/CookieStoreTest.php | 3 +- tests/system/Cookie/CookieTest.php | 10 +- .../DataConverter/DataConverterTest.php | 8 +- tests/system/Database/BaseConnectionTest.php | 10 +- tests/system/Database/BaseQueryTest.php | 8 +- tests/system/Database/Builder/AliasTest.php | 3 +- tests/system/Database/Builder/BaseTest.php | 3 +- tests/system/Database/Builder/CountTest.php | 3 +- tests/system/Database/Builder/DeleteTest.php | 3 +- .../system/Database/Builder/DistinctTest.php | 3 +- tests/system/Database/Builder/EmptyTest.php | 3 +- tests/system/Database/Builder/FromTest.php | 3 +- tests/system/Database/Builder/GetTest.php | 3 +- tests/system/Database/Builder/GroupTest.php | 3 +- tests/system/Database/Builder/InsertTest.php | 3 +- tests/system/Database/Builder/JoinTest.php | 3 +- tests/system/Database/Builder/LikeTest.php | 3 +- tests/system/Database/Builder/LimitTest.php | 3 +- tests/system/Database/Builder/OrderTest.php | 3 +- tests/system/Database/Builder/PrefixTest.php | 3 +- tests/system/Database/Builder/ReplaceTest.php | 3 +- tests/system/Database/Builder/SelectTest.php | 3 +- .../system/Database/Builder/TruncateTest.php | 3 +- tests/system/Database/Builder/UnionTest.php | 3 +- tests/system/Database/Builder/UpdateTest.php | 3 +- tests/system/Database/Builder/WhenTest.php | 3 +- tests/system/Database/Builder/WhereTest.php | 8 +- tests/system/Database/ConfigTest.php | 6 +- tests/system/Database/DatabaseSeederTest.php | 3 +- .../DatabaseTestCaseMigrationOnce1Test.php | 3 +- .../DatabaseTestCaseMigrationOnce2Test.php | 3 +- .../system/Database/DatabaseTestCaseTest.php | 3 +- .../system/Database/Forge/CreateTableTest.php | 3 +- .../Database/Forge/DropForeignKeyTest.php | 3 +- tests/system/Database/Live/AliasTest.php | 3 +- tests/system/Database/Live/BadQueryTest.php | 3 +- tests/system/Database/Live/ConnectTest.php | 3 +- tests/system/Database/Live/CountTest.php | 3 +- .../Live/DatabaseTestTraitCaseTest.php | 3 +- tests/system/Database/Live/DbDebugTest.php | 3 +- tests/system/Database/Live/DbUtilsTest.php | 3 +- tests/system/Database/Live/DeleteTest.php | 3 +- tests/system/Database/Live/EmptyTest.php | 3 +- tests/system/Database/Live/EscapeTest.php | 3 +- .../Database/Live/FabricatorLiveTest.php | 3 +- tests/system/Database/Live/ForgeTest.php | 3 +- tests/system/Database/Live/FromTest.php | 3 +- tests/system/Database/Live/GetNumRowsTest.php | 3 +- tests/system/Database/Live/GetTest.php | 3 +- tests/system/Database/Live/GetVersionTest.php | 3 +- tests/system/Database/Live/GroupTest.php | 3 +- tests/system/Database/Live/IncrementTest.php | 3 +- tests/system/Database/Live/InsertTest.php | 3 +- tests/system/Database/Live/JoinTest.php | 3 +- tests/system/Database/Live/LikeTest.php | 15 +- tests/system/Database/Live/LimitTest.php | 3 +- tests/system/Database/Live/MetadataTest.php | 3 +- .../Live/MySQLi/GetFieldDataTestCase.php | 3 +- .../Database/Live/MySQLi/NumberNativeTest.php | 3 +- .../Database/Live/MySQLi/RawSqlTest.php | 3 +- .../Live/OCI8/CallStoredProcedureTest.php | 3 +- .../Live/OCI8/GetFieldDataTestCase.php | 3 +- .../Database/Live/OCI8/LastInsertIDTest.php | 3 +- tests/system/Database/Live/OrderTest.php | 3 +- .../Live/Postgre/GetFieldDataTestCase.php | 3 +- .../Database/Live/PreparedQueryTest.php | 3 +- tests/system/Database/Live/PretendTest.php | 3 +- .../Live/SQLSRV/GetFieldDataTestCase.php | 3 +- .../Database/Live/SQLite3/AlterTableTest.php | 6 +- .../Live/SQLite3/ForgeModifyColumnTest.php | 3 +- .../Live/SQLite3/GetFieldDataTestCase.php | 3 +- .../Live/SQLite3/GetIndexDataTest.php | 3 +- tests/system/Database/Live/SelectTest.php | 3 +- .../Live/TransactionDBDebugFalseTest.php | 3 +- .../Live/TransactionDBDebugTrueTest.php | 3 +- .../system/Database/Live/TransactionTest.php | 3 +- tests/system/Database/Live/UnionTest.php | 3 +- tests/system/Database/Live/UpdateTest.php | 6 +- tests/system/Database/Live/UpsertTest.php | 3 +- tests/system/Database/Live/WhereTest.php | 3 +- .../Database/Live/WriteTypeQueryTest.php | 3 +- .../Migrations/MigrationRunnerTest.php | 3 +- .../Database/Migrations/MigrationTest.php | 3 +- tests/system/Database/RawSqlTest.php | 3 +- tests/system/Debug/ExceptionHandlerTest.php | 3 +- tests/system/Debug/ExceptionsTest.php | 6 +- tests/system/Debug/TimerTest.php | 3 +- .../Debug/Toolbar/Collectors/DatabaseTest.php | 3 +- .../Debug/Toolbar/Collectors/HistoryTest.php | 3 +- tests/system/DebugTraceableTraitTest.php | 6 +- tests/system/Email/EmailTest.php | 6 +- tests/system/Encryption/EncryptionTest.php | 3 +- .../Handlers/OpenSSLHandlerTest.php | 3 +- .../Encryption/Handlers/SodiumHandlerTest.php | 3 +- tests/system/Entity/EntityTest.php | 3 +- tests/system/Events/EventsTest.php | 9 +- tests/system/Files/FileCollectionTest.php | 3 +- tests/system/Files/FileTest.php | 3 +- tests/system/Files/FileWithVfsTest.php | 3 +- tests/system/Filters/CSRFTest.php | 6 +- tests/system/Filters/CorsTest.php | 3 +- tests/system/Filters/DebugToolbarTest.php | 6 +- tests/system/Filters/FiltersTest.php | 11 +- tests/system/Filters/HoneypotTest.php | 16 ++- tests/system/Filters/InvalidCharsTest.php | 15 +- tests/system/Filters/SecureHeadersTest.php | 3 +- tests/system/Format/FormatTest.php | 3 +- tests/system/Format/JSONFormatterTest.php | 3 +- tests/system/Format/XMLFormatterTest.php | 6 +- tests/system/HTTP/CLIRequestTest.php | 6 +- .../HTTP/CURLRequestShareOptionsTest.php | 3 +- tests/system/HTTP/CURLRequestTest.php | 8 +- .../system/HTTP/ContentSecurityPolicyTest.php | 129 +++++++++--------- tests/system/HTTP/CorsTest.php | 3 +- tests/system/HTTP/DownloadResponseTest.php | 9 +- .../system/HTTP/Files/FileCollectionTest.php | 3 +- tests/system/HTTP/Files/FileMovingTest.php | 3 +- tests/system/HTTP/HeaderTest.php | 3 +- .../HTTP/IncomingRequestDetectingTest.php | 6 +- tests/system/HTTP/IncomingRequestTest.php | 21 +-- tests/system/HTTP/MessageTest.php | 8 +- tests/system/HTTP/NegotiateTest.php | 3 +- tests/system/HTTP/OutgoingRequestTest.php | 3 +- tests/system/HTTP/RedirectExceptionTest.php | 3 +- tests/system/HTTP/RedirectResponseTest.php | 33 +++-- tests/system/HTTP/RequestTest.php | 6 +- tests/system/HTTP/ResponseCookieTest.php | 3 +- tests/system/HTTP/ResponseSendTest.php | 17 ++- tests/system/HTTP/ResponseTest.php | 8 +- .../SiteURIFactoryDetectRoutePathTest.php | 9 +- tests/system/HTTP/SiteURIFactoryTest.php | 11 +- tests/system/HTTP/SiteURITest.php | 11 +- tests/system/HTTP/URITest.php | 23 ++-- tests/system/HTTP/UserAgentTest.php | 3 +- .../Array/ArrayHelperDotKeyExistsTest.php | 3 +- .../Array/ArrayHelperRecursiveDiffTest.php | 3 +- .../ArrayHelperSortValuesByNaturalTest.php | 3 +- tests/system/Helpers/ArrayHelperTest.php | 20 +-- tests/system/Helpers/CookieHelperTest.php | 3 +- tests/system/Helpers/DateHelperTest.php | 3 +- tests/system/Helpers/FilesystemHelperTest.php | 3 +- tests/system/Helpers/FormHelperTest.php | 17 ++- tests/system/Helpers/HTMLHelperTest.php | 3 +- tests/system/Helpers/InflectorHelperTest.php | 6 +- tests/system/Helpers/NumberHelperTest.php | 3 +- tests/system/Helpers/SecurityHelperTest.php | 3 +- tests/system/Helpers/TextHelperTest.php | 3 +- .../Helpers/URLHelper/CurrentUrlTest.php | 13 +- .../system/Helpers/URLHelper/MiscUrlTest.php | 49 ++++--- .../Helpers/URLHelper/SiteUrlCliTest.php | 9 +- .../system/Helpers/URLHelper/SiteUrlTest.php | 9 +- tests/system/Helpers/XMLHelperTest.php | 3 +- tests/system/HomeTest.php | 3 +- tests/system/Honeypot/HoneypotTest.php | 6 +- .../HotReloader/DirectoryHasherTest.php | 3 +- tests/system/I18n/TimeDifferenceTest.php | 3 +- tests/system/I18n/TimeLegacyTest.php | 6 +- tests/system/I18n/TimeTest.php | 6 +- tests/system/Images/BaseHandlerTest.php | 3 +- tests/system/Images/GDHandlerTest.php | 3 +- .../system/Images/ImageMagickHandlerTest.php | 9 +- tests/system/Images/ImageTest.php | 3 +- tests/system/Language/LanguageTest.php | 6 +- .../Log/Handlers/ChromeLoggerHandlerTest.php | 3 +- .../Log/Handlers/ErrorlogHandlerTest.php | 3 +- tests/system/Log/Handlers/FileHandlerTest.php | 3 +- tests/system/Log/LoggerTest.php | 3 +- tests/system/Models/AffectedRowsTest.php | 3 +- tests/system/Models/CountAllModelTest.php | 3 +- .../system/Models/DataConverterModelTest.php | 3 +- tests/system/Models/DeleteModelTest.php | 14 +- tests/system/Models/EventsModelTest.php | 3 +- tests/system/Models/FindModelTest.php | 10 +- tests/system/Models/GeneralModelTest.php | 3 +- tests/system/Models/GetCompiledModelTest.php | 3 +- tests/system/Models/InsertModelTest.php | 3 +- .../system/Models/MiscellaneousModelTest.php | 3 +- tests/system/Models/PaginateModelTest.php | 3 +- tests/system/Models/ReplaceModelTest.php | 3 +- tests/system/Models/SaveModelTest.php | 3 +- tests/system/Models/TimestampModelTest.php | 3 +- tests/system/Models/UpdateModelTest.php | 6 +- .../Models/ValidationModelRuleGroupTest.php | 3 +- tests/system/Models/ValidationModelTest.php | 3 +- tests/system/Models/WhenWhenNotModelTest.php | 3 +- tests/system/Pager/PagerRendererTest.php | 3 +- tests/system/Pager/PagerTest.php | 6 +- .../system/Publisher/ContentReplacerTest.php | 3 +- .../Publisher/PublisherContentReplaceTest.php | 3 +- tests/system/Publisher/PublisherInputTest.php | 3 +- .../system/Publisher/PublisherOutputTest.php | 3 +- .../Publisher/PublisherRestrictionsTest.php | 8 +- .../system/Publisher/PublisherSupportTest.php | 3 +- .../system/RESTful/ResourceControllerTest.php | 9 +- .../system/RESTful/ResourcePresenterTest.php | 9 +- .../system/Router/AutoRouterImprovedTest.php | 8 +- .../Router/DefinedRouteCollectorTest.php | 3 +- .../RouteCollectionReverseRouteTest.php | 6 +- tests/system/Router/RouteCollectionTest.php | 12 +- tests/system/Router/RouterTest.php | 6 +- tests/system/Security/CheckPhpIniTest.php | 3 +- .../SecurityCSRFCookieRandomizeTokenTest.php | 3 +- .../SecurityCSRFSessionRandomizeTokenTest.php | 9 +- .../Security/SecurityCSRFSessionTest.php | 9 +- tests/system/Security/SecurityTest.php | 6 +- .../Handlers/Database/MySQLiHandlerTest.php | 3 +- .../Handlers/Database/PostgreHandlerTest.php | 3 +- .../Handlers/Database/RedisHandlerTest.php | 9 +- tests/system/Session/SessionTest.php | 9 +- tests/system/SparkTest.php | 3 +- tests/system/SuperglobalsTest.php | 3 +- tests/system/Test/BootstrapFCPATHTest.php | 3 +- tests/system/Test/ControllerTestTraitTest.php | 9 +- tests/system/Test/DOMParserTest.php | 8 +- tests/system/Test/FabricatorTest.php | 3 +- .../FeatureTestAutoRoutingImprovedTest.php | 3 +- tests/system/Test/FeatureTestTraitTest.php | 6 +- tests/system/Test/FilterTestTraitTest.php | 3 +- tests/system/Test/IniTestTraitTest.php | 3 +- tests/system/Test/ReflectionHelperTest.php | 3 +- tests/system/Test/TestCaseEmissionsTest.php | 13 +- tests/system/Test/TestCaseTest.php | 3 +- tests/system/Test/TestLoggerTest.php | 6 +- tests/system/Test/TestResponseTest.php | 8 +- tests/system/Throttle/ThrottleTest.php | 6 +- tests/system/Typography/TypographyTest.php | 3 +- .../system/Validation/CreditCardRulesTest.php | 6 +- .../Validation/DatabaseRelatedRulesTest.php | 3 +- .../system/Validation/DotArrayFilterTest.php | 3 +- tests/system/Validation/FileRulesTest.php | 3 +- tests/system/Validation/FormatRulesTest.php | 52 +++---- tests/system/Validation/RulesTest.php | 52 +++---- .../StrictRules/CreditCardRulesTest.php | 6 +- .../StrictRules/DatabaseRelatedRulesTest.php | 3 +- .../Validation/StrictRules/FileRulesTest.php | 3 +- .../StrictRules/FormatRulesTest.php | 3 +- .../Validation/StrictRules/RulesTest.php | 18 +-- .../Validation/StrictRules/ValidationTest.php | 3 +- tests/system/Validation/ValidationTest.php | 20 +-- tests/system/View/CellTest.php | 3 +- tests/system/View/ControlledCellTest.php | 3 +- tests/system/View/DecoratorsTest.php | 3 +- tests/system/View/ParserFilterTest.php | 3 +- tests/system/View/ParserPluginTest.php | 11 +- tests/system/View/ParserTest.php | 6 +- tests/system/View/TableTest.php | 13 +- tests/system/View/ViewTest.php | 3 +- 320 files changed, 1182 insertions(+), 725 deletions(-) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index 357acf1ad0ef..fc2c4dea2467 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\API; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Format\FormatterInterface; use CodeIgniter\Format\JSONFormatter; @@ -29,7 +30,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ResponseTraitTest extends CIUnitTestCase { private ?MockIncomingRequest $request = null; diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 83f49e499beb..89f4dcdeec29 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\AutoReview; +use PHPUnit\Framework\Attributes\CoversNothing; +use PHPUnit\Framework\Attributes\Group; use InvalidArgumentException; use JsonException; use PHPUnit\Framework\TestCase; @@ -20,8 +22,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\CoversNothing] -#[\PHPUnit\Framework\Attributes\Group('AutoReview')] +#[CoversNothing] +#[Group('AutoReview')] final class ComposerJsonTest extends TestCase { private array $devComposer; diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php index 4fbc18e20c90..fcbd5851dbc1 100644 --- a/tests/system/AutoReview/FrameworkCodeTest.php +++ b/tests/system/AutoReview/FrameworkCodeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\AutoReview; +use PHPUnit\Framework\Attributes\DataProvider; use FilesystemIterator; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; @@ -44,7 +45,7 @@ final class FrameworkCodeTest extends TestCase /** * @param class-string $class */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideEachTestClassHasCorrectGroupAttributeName')] + #[DataProvider('provideEachTestClassHasCorrectGroupAttributeName')] public function testEachTestClassHasCorrectGroupAttributeName(string $class): void { $reflection = new ReflectionClass($class); diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 08432101eb3b..74d3a4cace3b 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Autoloader; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use App\Controllers\Home; use Closure; use CodeIgniter\Exceptions\ConfigException; @@ -28,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class AutoloaderTest extends CIUnitTestCase { use ReflectionHelper; @@ -389,8 +392,8 @@ public function testAutoloaderLoadsNonClassFiles(): void $loader->unregister(); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testLoadHelpers(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/Autoloader/FileLocatorCachedTest.php b/tests/system/Autoloader/FileLocatorCachedTest.php index 5348207f9aa7..68bb9245dfdd 100644 --- a/tests/system/Autoloader/FileLocatorCachedTest.php +++ b/tests/system/Autoloader/FileLocatorCachedTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Autoloader; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\FactoriesCache\FileVarExportHandler; use Config\Autoload; use Config\Modules; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileLocatorCachedTest extends FileLocatorTest { private FileVarExportHandler $handler; diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php index 38d2eb98f751..8c185bbae6ea 100644 --- a/tests/system/Autoloader/FileLocatorTest.php +++ b/tests/system/Autoloader/FileLocatorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Autoloader; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Header; use CodeIgniter\Test\CIUnitTestCase; use Config\Autoload; @@ -23,7 +24,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] class FileLocatorTest extends CIUnitTestCase { protected FileLocatorInterface $locator; diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 062ffda752da..063f4dace051 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\CLI; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\PhpStreamWrapper; use CodeIgniter\Test\StreamFilterTrait; @@ -22,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CLITest extends CIUnitTestCase { use StreamFilterTrait; @@ -455,7 +457,7 @@ public function testWindow(): void * @param array $thead * @param array $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideTable')] + #[DataProvider('provideTable')] public function testTable($tbody, $thead, $expected): void { CLI::table($tbody, $thead); diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php index b0100693344c..116e480f5563 100644 --- a/tests/system/CLI/ConsoleTest.php +++ b/tests/system/CLI/ConsoleTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\CLI; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\DotEnv; use CodeIgniter\Events\Events; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ConsoleTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php index 4694dd98fb20..2a2150509001 100644 --- a/tests/system/Cache/CacheFactoryTest.php +++ b/tests/system/Cache/CacheFactoryTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\Exceptions\CacheException; use CodeIgniter\Cache\Handlers\DummyHandler; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CacheFactoryTest extends CIUnitTestCase { private static string $directory = 'CacheFactory'; diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php index 4275bc16bffd..6a1361d1b972 100644 --- a/tests/system/Cache/CacheMockTest.php +++ b/tests/system/Cache/CacheMockTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\Handlers\BaseHandler; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CacheMockTest extends CIUnitTestCase { public function testMockReturnsMockCacheClass(): void diff --git a/tests/system/Cache/FactoriesCacheFileHandlerTest.php b/tests/system/Cache/FactoriesCacheFileHandlerTest.php index 9cd3e1f182e6..769bfd2cb2db 100644 --- a/tests/system/Cache/FactoriesCacheFileHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileHandlerTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Cache; +use PHPUnit\Framework\Attributes\Group; use Config\Cache as CacheConfig; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FactoriesCacheFileHandlerTest extends FactoriesCacheFileVarExportHandlerTest { /** diff --git a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php index 0d1fe0b4446b..690674ccf810 100644 --- a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\FactoriesCache\FileVarExportHandler; use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ * @internal * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] class FactoriesCacheFileVarExportHandlerTest extends CIUnitTestCase { protected FactoriesCache $cache; diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php index 02e6c9907c1b..55b51abcc7cd 100644 --- a/tests/system/Cache/Handlers/BaseHandlerTest.php +++ b/tests/system/Cache/Handlers/BaseHandlerTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use stdClass; use Tests\Support\Cache\RestrictiveHandler; @@ -20,13 +22,13 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseHandlerTest extends CIUnitTestCase { /** * @param mixed $input */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidateKeyInvalidType')] + #[DataProvider('provideValidateKeyInvalidType')] public function testValidateKeyInvalidType($input): void { $this->expectException('InvalidArgumentException'); diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php index 363882bfb818..09782e3a699b 100644 --- a/tests/system/Cache/Handlers/DummyHandlerTest.php +++ b/tests/system/Cache/Handlers/DummyHandlerTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DummyHandlerTest extends CIUnitTestCase { private DummyHandler $handler; diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index 927c2a912fc3..4cd0f638893c 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresOperatingSystem; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cache\Exceptions\CacheException; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; @@ -21,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileHandlerTest extends AbstractHandlerTestCase { private static string $directory = 'FileHandler'; @@ -86,7 +89,7 @@ public function testNew(): void /** * chmod('path', 0444) does not work on Windows */ - #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] + #[RequiresOperatingSystem('Linux|Darwin')] public function testNewWithNonWritablePath(): void { $this->expectException(CacheException::class); @@ -144,7 +147,7 @@ public function testRemember(): void /** * chmod('path', 0444) does not work on Windows */ - #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] + #[RequiresOperatingSystem('Linux|Darwin')] public function testSave(): void { $this->assertTrue($this->handler->save(self::$key1, 'value')); @@ -306,8 +309,8 @@ public function testIsSupported(): void $this->assertTrue($this->handler->isSupported()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSaveMode')] - #[\PHPUnit\Framework\Attributes\RequiresOperatingSystem('Linux|Darwin')] + #[DataProvider('provideSaveMode')] + #[RequiresOperatingSystem('Linux|Darwin')] public function testSaveMode(int $int, string $string): void { // Initialize mode diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index a5aca356aa90..16990f5c87e3 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('CacheLive')] +#[Group('CacheLive')] final class MemcachedHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php index 209c7ea45509..341ea6dcc62d 100644 --- a/tests/system/Cache/Handlers/PredisHandlerTest.php +++ b/tests/system/Cache/Handlers/PredisHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('CacheLive')] +#[Group('CacheLive')] final class PredisHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php index 39e194a82bf1..67ba3c5ebde0 100644 --- a/tests/system/Cache/Handlers/RedisHandlerTest.php +++ b/tests/system/Cache/Handlers/RedisHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('CacheLive')] +#[Group('CacheLive')] final class RedisHandlerTest extends AbstractHandlerTestCase { private Cache $config; diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index 5acdc756d24b..8ba6d85c8d62 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Cache; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; @@ -28,8 +30,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class ResponseCacheTest extends CIUnitTestCase { private AppConfig $appConfig; diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index f0680cec2a85..33368fb5cb73 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -13,6 +13,10 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use App\Controllers\Home; use CodeIgniter\Config\Services; use CodeIgniter\Debug\Timer; @@ -36,9 +40,9 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[RunTestsInSeparateProcesses] +#[BackupGlobals(true)] +#[Group('Others')] final class CodeIgniterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; @@ -838,7 +842,7 @@ public function testPageCacheSendSecureHeaders(): void * * @see https://github.com/codeigniter4/CodeIgniter4/pull/6410 */ - #[\PHPUnit\Framework\Attributes\DataProvider('providePageCacheWithCacheQueryString')] + #[DataProvider('providePageCacheWithCacheQueryString')] public function testPageCacheWithCacheQueryString( $cacheQueryStringValue, int $expectedPagesInCache, diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php index 2ca2138a6b9a..b9a05d51eae5 100644 --- a/tests/system/Commands/BaseCommandTest.php +++ b/tests/system/Commands/BaseCommandTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Log\Logger; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseCommandTest extends CIUnitTestCase { private Logger $logger; diff --git a/tests/system/Commands/CellGeneratorTest.php b/tests/system/Commands/CellGeneratorTest.php index e13fa624f5c2..a8f4bdb460b9 100644 --- a/tests/system/Commands/CellGeneratorTest.php +++ b/tests/system/Commands/CellGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CellGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php index 0f68a8229a6b..7221edc43b63 100644 --- a/tests/system/Commands/ClearCacheTest.php +++ b/tests/system/Commands/ClearCacheTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ClearCacheTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php index 6c17d5c28a3c..51635e5f0307 100644 --- a/tests/system/Commands/ClearDebugbarTest.php +++ b/tests/system/Commands/ClearDebugbarTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ClearDebugbarTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php index 247b3fe1f6f3..4a559300ed95 100644 --- a/tests/system/Commands/ClearLogsTest.php +++ b/tests/system/Commands/ClearLogsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ClearLogsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php index 0efb8b80352f..a8d9d93de14b 100644 --- a/tests/system/Commands/CommandGeneratorTest.php +++ b/tests/system/Commands/CommandGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CommandGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php index 02bcd465c542..a687474cb87e 100644 --- a/tests/system/Commands/CommandTest.php +++ b/tests/system/Commands/CommandTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\CLI\Commands; use CodeIgniter\Log\Logger; use CodeIgniter\Test\CIUnitTestCase; @@ -23,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CommandTest extends CIUnitTestCase { use StreamFilterTrait; @@ -128,7 +130,7 @@ public function testInexistentCommandsButWithManyAlternatives(): void $this->assertStringContainsString(':clear', $this->getBuffer()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideCommandParsesArgsCorrectly')] + #[DataProvider('provideCommandParsesArgsCorrectly')] public function testCommandParsesArgsCorrectly(string $input, array $expected): void { ParamsReveal::$args = null; diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php index 145b7e7af1cc..45068084da30 100644 --- a/tests/system/Commands/ConfigGeneratorTest.php +++ b/tests/system/Commands/ConfigGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ConfigGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php index 23b6b6424732..bd0df985dd76 100644 --- a/tests/system/Commands/ConfigurableSortImportsTest.php +++ b/tests/system/Commands/ConfigurableSortImportsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ConfigurableSortImportsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php index 5e86a0bbb337..d41c34535b55 100644 --- a/tests/system/Commands/ControllerGeneratorTest.php +++ b/tests/system/Commands/ControllerGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ControllerGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php index 8bc4489533e9..e6bdfc2f3b51 100644 --- a/tests/system/Commands/CreateDatabaseTest.php +++ b/tests/system/Commands/CreateDatabaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\Database as DatabaseFactory; use CodeIgniter\Database\OCI8\Connection as OCI8Connection; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class CreateDatabaseTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Database/MigrateStatusTest.php b/tests/system/Commands/Database/MigrateStatusTest.php index 9fc3cd370b6b..9e4324cf725c 100644 --- a/tests/system/Commands/Database/MigrateStatusTest.php +++ b/tests/system/Commands/Database/MigrateStatusTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MigrateStatusTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php index 44130bd6b6d4..ac9a20f84d75 100644 --- a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php +++ b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ShowTableInfoMockIOTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php index 97dbc26b5bf5..da845f7a1710 100644 --- a/tests/system/Commands/Database/ShowTableInfoTest.php +++ b/tests/system/Commands/Database/ShowTableInfoTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ShowTableInfoTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php index 5df1e5ba761d..4e90d52e7dfd 100644 --- a/tests/system/Commands/DatabaseCommandsTest.php +++ b/tests/system/Commands/DatabaseCommandsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseCommandsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php index b5c35c809adb..e694cd74819e 100644 --- a/tests/system/Commands/EntityGeneratorTest.php +++ b/tests/system/Commands/EntityGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EntityGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php index 54a6fe2fae00..eff814707356 100644 --- a/tests/system/Commands/EnvironmentCommandTest.php +++ b/tests/system/Commands/EnvironmentCommandTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EnvironmentCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php index 52bf0edae044..b63e4b774cdc 100644 --- a/tests/system/Commands/FilterCheckTest.php +++ b/tests/system/Commands/FilterCheckTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilterCheckTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php index 80a7bbb6a981..8a00ed717e0b 100644 --- a/tests/system/Commands/FilterGeneratorTest.php +++ b/tests/system/Commands/FilterGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilterGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php index 42d27c7604c9..d6d36cfbfaa7 100644 --- a/tests/system/Commands/GenerateKeyTest.php +++ b/tests/system/Commands/GenerateKeyTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Filters\CITestStreamFilter; use CodeIgniter\Test\StreamFilterTrait; @@ -20,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class GenerateKeyTest extends CIUnitTestCase { use StreamFilterTrait; @@ -85,8 +88,8 @@ public function testGenerateKeyShowsEncodedKey(): void $this->assertStringContainsString('hex2bin:', $this->getBuffer()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testGenerateKeyCreatesNewKey(): void { command('key:generate'); diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php index 5677c5daba73..99d7ceb51281 100644 --- a/tests/system/Commands/GeneratorsTest.php +++ b/tests/system/Commands/GeneratorsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GeneratorsTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php index 3370f14f0f92..a05b5ebca0fa 100644 --- a/tests/system/Commands/HelpCommandTest.php +++ b/tests/system/Commands/HelpCommandTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class HelpCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php index c894d0ce24e0..c157bd9e8a4a 100644 --- a/tests/system/Commands/InfoCacheTest.php +++ b/tests/system/Commands/InfoCacheTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class InfoCacheTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php index 302fdafc544e..d6cb31dbc28f 100644 --- a/tests/system/Commands/MigrationGeneratorTest.php +++ b/tests/system/Commands/MigrationGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class MigrationGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php index 75c5cc00ea44..90f7c1b01166 100644 --- a/tests/system/Commands/MigrationIntegrationTest.php +++ b/tests/system/Commands/MigrationIntegrationTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MigrationIntegrationTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php index c78f29a41010..3108be0c1971 100644 --- a/tests/system/Commands/ModelGeneratorTest.php +++ b/tests/system/Commands/ModelGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ModelGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php index c44f7bb6cbad..4494f8418be0 100644 --- a/tests/system/Commands/PublishCommandTest.php +++ b/tests/system/Commands/PublishCommandTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Tests\Support\Publishers\TestPublisher; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublishCommandTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 4260d6885208..2d25b178bec4 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Router\RouteCollection; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RoutesTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php index 28682b5c53a4..7e9f7ce91184 100644 --- a/tests/system/Commands/ScaffoldGeneratorTest.php +++ b/tests/system/Commands/ScaffoldGeneratorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Autoload; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ScaffoldGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php index 278244217640..a0f678e67715 100644 --- a/tests/system/Commands/SeederGeneratorTest.php +++ b/tests/system/Commands/SeederGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SeederGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/TestGeneratorTest.php b/tests/system/Commands/TestGeneratorTest.php index 5a8936d7dee6..5641a9a62c53 100644 --- a/tests/system/Commands/TestGeneratorTest.php +++ b/tests/system/Commands/TestGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TestGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Translation/LocalizationFinderTest.php b/tests/system/Commands/Translation/LocalizationFinderTest.php index 60046829b801..88224ceb4f33 100644 --- a/tests/system/Commands/Translation/LocalizationFinderTest.php +++ b/tests/system/Commands/Translation/LocalizationFinderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Translation; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\App; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class LocalizationFinderTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/ConfigCheckTest.php b/tests/system/Commands/Utilities/ConfigCheckTest.php index d5fcf9b20498..4bc2bf4dce3d 100644 --- a/tests/system/Commands/Utilities/ConfigCheckTest.php +++ b/tests/system/Commands/Utilities/ConfigCheckTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\App; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ConfigCheckTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index 198a1a710c7e..efb95c58d3ac 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands\Utilities; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class NamespacesTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 25fd288bd5e1..77381e83617f 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class AutoRouteCollectorTest extends CIUnitTestCase { public function testGet(): void diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index cf1e9e0a5e61..78636caeaee0 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; use Config\Filters; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class AutoRouteCollectorTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php index ee9e339283ad..44c2a69e8662 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder\Dash_controller; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Home; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\SubDir\BlogController; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ControllerMethodReaderTest extends CIUnitTestCase { private function createControllerMethodReader( diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php index ee74ca9dcdce..acfe87d82bc9 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Tests\Support\Controllers\Hello; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ControllerFinderTest extends CIUnitTestCase { public function testFind(): void diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php index d48e470e8dd6..2a44d79756fe 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Tests\Support\Controllers\Popcorn; use Tests\Support\Controllers\Remap; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ControllerMethodReaderTest extends CIUnitTestCase { public function testRead(): void diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php index d213c2eb5b50..07d7f0dc76e8 100644 --- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilterCollectorTest extends CIUnitTestCase { public function testGet(): void diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php index 492686122e80..387da092b697 100644 --- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Filters\CSRF; use CodeIgniter\Filters\DebugToolbar; @@ -33,7 +34,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilterFinderTest extends CIUnitTestCase { use ConfigFromArrayTrait; diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php index ddae1636396f..eef413ebe73a 100644 --- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php +++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php @@ -13,16 +13,18 @@ namespace CodeIgniter\Commands\Utilities\Routes; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SampleURIGeneratorTest extends CIUnitTestCase { - #[\PHPUnit\Framework\Attributes\DataProvider('provideGet')] + #[DataProvider('provideGet')] public function testGet(string $routeKey, string $expected): void { $generator = new SampleURIGenerator(); diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php index 7fd20feeaa6d..6fdaddd55b28 100644 --- a/tests/system/Commands/ValidationGeneratorTest.php +++ b/tests/system/Commands/ValidationGeneratorTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Commands; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ValidationGeneratorTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php index 6e0b8b342451..f389efb2366a 100644 --- a/tests/system/CommonFunctionsSendTest.php +++ b/tests/system/CommonFunctionsSendTest.php @@ -13,12 +13,15 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class CommonFunctionsSendTest extends CIUnitTestCase { protected function setUp(): void @@ -36,8 +39,8 @@ protected function setUp(): void * Make sure cookies are set by RedirectResponse this way * See https://github.com/codeigniter4/CodeIgniter4/issues/1393 */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRedirectResponseCookiesSent(): void { $loginTime = time(); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index b57458414fa7..308d45d5dec2 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -13,6 +13,11 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\BaseService; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\CLIRequest; @@ -48,8 +53,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[BackupGlobals(true)] +#[Group('SeparateProcess')] final class CommonFunctionsTest extends CIUnitTestCase { private ?App $config = null; @@ -267,8 +272,8 @@ public function testEscapeRecursiveArrayRaw(): void $this->assertSame($data, esc($data, 'raw')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSessionInstance(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -280,8 +285,8 @@ public function testSessionInstance(): void $this->assertInstanceOf(Session::class, session()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSessionVariable(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -295,8 +300,8 @@ public function testSessionVariable(): void $this->assertSame('Hi there', session('notbogus')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSessionVariableNotThere(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -421,8 +426,8 @@ public function testModelExistsAbsoluteClassname(): void $this->assertInstanceOf(JobModel::class, model(JobModel::class)); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testOldInput(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -458,8 +463,8 @@ public function testOldInput(): void $this->assertSame('fritz', old('zibble')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testOldInputSerializeData(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -496,8 +501,8 @@ public function testOldInputSerializeData(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testOldInputArray(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -615,8 +620,8 @@ public function testRedirectResponseCookies1(): void $this->assertTrue($answer1->hasCookie('login_time')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testTrace(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -640,8 +645,8 @@ public function testViewNotSaveData(): void $this->assertStringContainsString('

        is_not

        ', view('\Tests\Support\View\Views\simples')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testForceHttpsNullRequestAndResponse(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -695,7 +700,7 @@ public function testForceHttpsWithBaseUrlSubFolder(): void * @param mixed $input * @param mixed $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideCleanPathActuallyCleaningThePaths')] + #[DataProvider('provideCleanPathActuallyCleaningThePaths')] public function testCleanPathActuallyCleaningThePaths($input, $expected): void { $this->assertSame($expected, clean_path($input)); @@ -756,8 +761,8 @@ public function testDWithCSP(): void Kint::$cli_detection = $cliDetection; } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testTraceWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php index e0d51327a525..29b60dc472a3 100644 --- a/tests/system/CommonHelperTest.php +++ b/tests/system/CommonHelperTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\CoversFunction; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; @@ -23,8 +25,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] -#[\PHPUnit\Framework\Attributes\CoversFunction('helper')] +#[Group('Others')] +#[CoversFunction('helper')] final class CommonHelperTest extends CIUnitTestCase { private array $dummyHelpers = [ diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php index f85d8101a0c6..59c07c7f4ff1 100644 --- a/tests/system/CommonSingleServiceTest.php +++ b/tests/system/CommonSingleServiceTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; @@ -24,10 +26,10 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CommonSingleServiceTest extends CIUnitTestCase { - #[\PHPUnit\Framework\Attributes\DataProvider('provideServiceNames')] + #[DataProvider('provideServiceNames')] public function testSingleServiceWithNoParamsSupplied(string $service): void { Services::injectMock('security', new MockSecurity(new SecurityConfig())); @@ -41,7 +43,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void $this->assertNotSame($service1, $service2); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideServiceNames')] + #[DataProvider('provideServiceNames')] public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void { if ($service === 'commands') { diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index f17dc71fb6c5..89ecfdabff8c 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Config; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; @@ -27,7 +30,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class BaseConfigTest extends CIUnitTestCase { private string $fixturesFolder; @@ -98,8 +101,8 @@ public function testUseDefaultValueTypeStringValue(): void $this->assertSame('123456', $config->password); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testServerValues(): void { $_SERVER = [ @@ -192,8 +195,8 @@ public function testSetsDefaultValues(): void $this->assertSame('bar', $config->second); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -205,8 +208,8 @@ public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void $this->assertSame('OpenSSL', $config->driver); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSetDefaultValuesEncryptionUsingBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php index 9e47578206ed..218940a46e01 100644 --- a/tests/system/Config/DotEnvTest.php +++ b/tests/system/Config/DotEnvTest.php @@ -13,6 +13,11 @@ namespace CodeIgniter\Config; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; @@ -21,8 +26,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[BackupGlobals(true)] +#[Group('SeparateProcess')] final class DotEnvTest extends CIUnitTestCase { private ?vfsStreamDirectory $root; @@ -60,7 +65,7 @@ public function testReturnsFalseIfCannotFindFile(): void $this->assertFalse($dotenv->load()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideLoadsVars')] + #[DataProvider('provideLoadsVars')] public function testLoadsVars(string $expected, string $varname): void { $dotenv = new DotEnv($this->fixturesFolder); @@ -84,8 +89,8 @@ public static function provideLoadsVars(): iterable ]; } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testLoadsHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -96,8 +101,8 @@ public function testLoadsHex2Bin(): void $this->assertSame('OpenSSL', getenv('encryption.driver')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testLoadsBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index dbb2aec291da..73c7c0363947 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Config; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\Depends; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Database; @@ -29,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FactoriesTest extends CIUnitTestCase { protected function setUp(): void @@ -437,7 +439,7 @@ public function testGetComponentInstances() return $data; } - #[\PHPUnit\Framework\Attributes\Depends('testGetComponentInstances')] + #[Depends('testGetComponentInstances')] public function testSetComponentInstances(array $data) { $before = Factories::getComponentInstances('config'); @@ -454,7 +456,7 @@ public function testSetComponentInstances(array $data) return $data; } - #[\PHPUnit\Framework\Attributes\Depends('testSetComponentInstances')] + #[Depends('testSetComponentInstances')] public function testIsUpdated(array $data): void { Factories::reset(); diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php index daa377ff9e34..25b3f9a50011 100644 --- a/tests/system/Config/MimesTest.php +++ b/tests/system/Config/MimesTest.php @@ -13,13 +13,15 @@ namespace CodeIgniter\Config; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Mimes; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class MimesTest extends CIUnitTestCase { public static function provideGuessExtensionFromType(): iterable @@ -48,7 +50,7 @@ public static function provideGuessExtensionFromType(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideGuessExtensionFromType')] + #[DataProvider('provideGuessExtensionFromType')] public function testGuessExtensionFromType(?string $expected, string $mime): void { $this->assertSame($expected, Mimes::guessExtensionFromType($mime)); @@ -80,7 +82,7 @@ public static function provideGuessTypeFromExtension(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideGuessTypeFromExtension')] + #[DataProvider('provideGuessTypeFromExtension')] public function testGuessTypeFromExtension(?string $expected, string $ext): void { $this->assertSame($expected, Mimes::guessTypeFromExtension($ext)); diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 177091dc5c07..c6735c4e2158 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Config; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Autoloader\Autoloader; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Database\MigrationRunner; @@ -52,7 +55,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class ServicesTest extends CIUnitTestCase { private array $original; @@ -240,24 +243,24 @@ public function testNewViewcell(): void $this->assertInstanceOf(Cell::class, $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testNewSession(): void { $actual = Services::session(); $this->assertInstanceOf(Session::class, $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testNewSessionWithNullConfig(): void { $actual = Services::session(null, false); $this->assertInstanceOf(Session::class, $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testCallStatic(): void { // __callStatic should kick in for this but fail @@ -268,8 +271,8 @@ public function testCallStatic(): void $this->assertInstanceOf(Session::class, $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testCallStaticDirectly(): void { // $actual = \CodeIgniter\Config\Services::SeSsIoN(null, false); // original @@ -277,8 +280,8 @@ public function testCallStaticDirectly(): void $this->assertInstanceOf(Session::class, $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testMockInjection(): void { Services::injectMock('response', new MockResponse(new App())); @@ -297,8 +300,8 @@ public function testMockInjection(): void $this->assertSame($response, $response3); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testReset(): void { Services::injectMock('response', new MockResponse(new App())); @@ -314,8 +317,8 @@ public function testReset(): void $this->assertNotSame($response2, $response); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testResetSingle(): void { Services::injectMock('response', new MockResponse(new App())); diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php index 30505f0f711a..9271d046d590 100644 --- a/tests/system/ControllerTest.php +++ b/tests/system/ControllerTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; @@ -34,8 +36,8 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class ControllerTest extends CIUnitTestCase { private App $config; diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php index 22f01169e28b..5ad93e82ac4c 100644 --- a/tests/system/Cookie/CookieStoreTest.php +++ b/tests/system/Cookie/CookieStoreTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cookie; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Test\CIUnitTestCase; use DateTimeImmutable; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CookieStoreTest extends CIUnitTestCase { private array $defaults; diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index a7bf0b7790a8..d8af2eb184a7 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Cookie; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Test\CIUnitTestCase; use Config\Cookie as CookieConfig; @@ -23,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CookieTest extends CIUnitTestCase { private array $defaults; @@ -79,7 +81,7 @@ public function testConfigInjectionForDefaults(): void Cookie::setDefaults($old); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideConfigPrefix')] + #[DataProvider('provideConfigPrefix')] public function testConfigPrefix(string $configPrefix, string $optionPrefix, string $expected): void { $config = new CookieConfig(); @@ -166,7 +168,7 @@ public function testExpirationTime(): void /** * @param bool|float|string $expires */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidExpires')] + #[DataProvider('provideInvalidExpires')] public function testInvalidExpires($expires): void { $this->expectException(CookieException::class); @@ -186,7 +188,7 @@ public static function provideInvalidExpires(): iterable } } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSetCookieHeaderCreation')] + #[DataProvider('provideSetCookieHeaderCreation')] public function testSetCookieHeaderCreation(string $header, array $changed): void { $cookie = Cookie::fromHeaderString($header); diff --git a/tests/system/DataConverter/DataConverterTest.php b/tests/system/DataConverter/DataConverterTest.php index f2c36a4dbd56..109b8b92c66c 100644 --- a/tests/system/DataConverter/DataConverterTest.php +++ b/tests/system/DataConverter/DataConverterTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\DataConverter; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use Closure; use CodeIgniter\HTTP\URI; use CodeIgniter\I18n\Time; @@ -24,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DataConverterTest extends CIUnitTestCase { public function testInstantiate(): void @@ -38,7 +40,7 @@ public function testInstantiate(): void $this->assertInstanceOf(DataConverter::class, $converter); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDataFromDB')] + #[DataProvider('provideConvertDataFromDB')] public function testConvertDataFromDB(array $types, array $dbData, array $expected): void { $converter = $this->createDataConverter($types); @@ -48,7 +50,7 @@ public function testConvertDataFromDB(array $types, array $dbData, array $expect $this->assertSame($expected, $data); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDataToDB')] + #[DataProvider('provideConvertDataToDB')] public function testConvertDataToDB(array $types, array $phpData, array $expected): void { $converter = $this->createDataConverter($types); diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php index 38bc943b2e47..0dda2d3a4ef5 100644 --- a/tests/system/Database/BaseConnectionTest.php +++ b/tests/system/Database/BaseConnectionTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -21,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseConnectionTest extends CIUnitTestCase { private array $options = [ @@ -180,7 +182,7 @@ public function testMagicGetMissing(): void * These tests are intended to confirm the current behavior. * We do not know if all of these are the correct behavior. */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideProtectIdentifiers')] + #[DataProvider('provideProtectIdentifiers')] public function testProtectIdentifiers( bool $prefixSingle, bool $protectIdentifiers, @@ -285,7 +287,7 @@ public static function provideProtectIdentifiers(): iterable /** * These tests are intended to confirm the current behavior. */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideEscapeIdentifiers')] + #[DataProvider('provideEscapeIdentifiers')] public function testEscapeIdentifiers(string $item, string $expected): void { $db = new MockConnection($this->options); @@ -307,7 +309,7 @@ public static function provideEscapeIdentifiers(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideEscapeIdentifier')] + #[DataProvider('provideEscapeIdentifier')] public function testEscapeIdentifier(string $item, string $expected): void { $db = new MockConnection($this->options); diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php index 16e640d1b257..d6ec78243abe 100644 --- a/tests/system/Database/BaseQueryTest.php +++ b/tests/system/Database/BaseQueryTest.php @@ -13,13 +13,15 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseQueryTest extends CIUnitTestCase { protected $db; @@ -187,7 +189,7 @@ public static function provideIsWriteType(): iterable * @param mixed $expected * @param mixed $sql */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideIsWriteType')] + #[DataProvider('provideIsWriteType')] public function testIsWriteType($expected, $sql): void { $query = new Query($this->db); @@ -599,7 +601,7 @@ public static function provideHighlightQueryKeywords(): iterable * @param mixed $expected * @param mixed $sql */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideHighlightQueryKeywords')] + #[DataProvider('provideHighlightQueryKeywords')] public function testHighlightQueryKeywords($expected, $sql): void { $query = new Query($this->db); diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php index 5b5303d3c0d2..bd6ddb3a12a7 100644 --- a/tests/system/Database/Builder/AliasTest.php +++ b/tests/system/Database/Builder/AliasTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class AliasTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php index 90901597728b..2305ca765674 100644 --- a/tests/system/Database/Builder/BaseTest.php +++ b/tests/system/Database/Builder/BaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php index 2bdf3ea3e63e..acfc9569310e 100644 --- a/tests/system/Database/Builder/CountTest.php +++ b/tests/system/Database/Builder/CountTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CountTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php index 9a83941a4806..36387ec3d3e3 100644 --- a/tests/system/Database/Builder/DeleteTest.php +++ b/tests/system/Database/Builder/DeleteTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DeleteTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php index 5b91f9b90ded..fb089d77ae57 100644 --- a/tests/system/Database/Builder/DistinctTest.php +++ b/tests/system/Database/Builder/DistinctTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DistinctTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php index 2b2b1c0089ee..76aa16aadf29 100644 --- a/tests/system/Database/Builder/EmptyTest.php +++ b/tests/system/Database/Builder/EmptyTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EmptyTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index 92f87d6b6571..bfe1af812ec9 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FromTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php index b483bd4cdf3b..e7ceb5030d0c 100644 --- a/tests/system/Database/Builder/GetTest.php +++ b/tests/system/Database/Builder/GetTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; use Config\Feature; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GetTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php index e8ddb0d1e2b8..82cc3e96649b 100644 --- a/tests/system/Database/Builder/GroupTest.php +++ b/tests/system/Database/Builder/GroupTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GroupTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index d5f23af92111..ed0120ba5543 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Query; use CodeIgniter\Database\RawSql; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class InsertTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php index 900e43fa45ec..1d94ebe49ffd 100644 --- a/tests/system/Database/Builder/JoinTest.php +++ b/tests/system/Database/Builder/JoinTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Postgre\Builder as PostgreBuilder; use CodeIgniter\Database\RawSql; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class JoinTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php index 5051b8d1275d..b6fc8e16327d 100644 --- a/tests/system/Database/Builder/LikeTest.php +++ b/tests/system/Database/Builder/LikeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class LikeTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php index 14a8523f69f1..e05fcab2ff12 100644 --- a/tests/system/Database/Builder/LimitTest.php +++ b/tests/system/Database/Builder/LimitTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class LimitTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php index 59a16caecf8b..20bcbc9ea6ce 100644 --- a/tests/system/Database/Builder/OrderTest.php +++ b/tests/system/Database/Builder/OrderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class OrderTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php index 88f6269df230..586b1c38dc53 100644 --- a/tests/system/Database/Builder/PrefixTest.php +++ b/tests/system/Database/Builder/PrefixTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PrefixTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php index a5ecdbb6ce47..e75c90f63fdd 100644 --- a/tests/system/Database/Builder/ReplaceTest.php +++ b/tests/system/Database/Builder/ReplaceTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ReplaceTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php index 48521d299901..f072b79e2055 100644 --- a/tests/system/Database/Builder/SelectTest.php +++ b/tests/system/Database/Builder/SelectTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Database\RawSql; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SelectTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php index 43ad872188cd..71251e98e2b5 100644 --- a/tests/system/Database/Builder/TruncateTest.php +++ b/tests/system/Database/Builder/TruncateTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TruncateTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Builder/UnionTest.php b/tests/system/Database/Builder/UnionTest.php index 8baad8174399..ed1be13c8f1b 100644 --- a/tests/system/Database/Builder/UnionTest.php +++ b/tests/system/Database/Builder/UnionTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\SQLSRV\Connection as SQLSRVConnection; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class UnionTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php index 2df5a28842d9..32bce616e140 100644 --- a/tests/system/Database/Builder/UpdateTest.php +++ b/tests/system/Database/Builder/UpdateTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class UpdateTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/WhenTest.php b/tests/system/Database/Builder/WhenTest.php index 7d2b07e428a3..be38c73406bc 100644 --- a/tests/system/Database/Builder/WhenTest.php +++ b/tests/system/Database/Builder/WhenTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class WhenTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index 3afc27932ccc..d7133013ff07 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Database\Builder; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; @@ -25,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class WhereTest extends CIUnitTestCase { /** @@ -404,7 +406,7 @@ public static function provideWhereInvalidKeyThrowInvalidArgumentException(): it /** * @param mixed $key */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideWhereInvalidKeyThrowInvalidArgumentException')] + #[DataProvider('provideWhereInvalidKeyThrowInvalidArgumentException')] public function testWhereInvalidKeyThrowInvalidArgumentException($key): void { $this->expectException('InvalidArgumentException'); @@ -425,7 +427,7 @@ public static function provideWhereInEmptyValuesThrowInvalidArgumentException(): /** * @param mixed $values */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideWhereInEmptyValuesThrowInvalidArgumentException')] + #[DataProvider('provideWhereInEmptyValuesThrowInvalidArgumentException')] public function testWhereInEmptyValuesThrowInvalidArgumentException($values): void { $this->expectException('InvalidArgumentException'); diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php index 74ac4a141fdb..e380a19be0a2 100644 --- a/tests/system/Database/ConfigTest.php +++ b/tests/system/Database/ConfigTest.php @@ -13,13 +13,15 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ConfigTest extends CIUnitTestCase { use ReflectionHelper; @@ -195,7 +197,7 @@ public function testConnectionGroupWithDSNPostgreNative(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/7550 */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideConvertDSN')] + #[DataProvider('provideConvertDSN')] public function testConvertDSN(string $input, string $expected): void { // @TODO This format is for PDO_PGSQL. diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php index 895d5fc5f6e0..c481ebfd1c8b 100644 --- a/tests/system/Database/DatabaseSeederTest.php +++ b/tests/system/Database/DatabaseSeederTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Database; use Faker\Generator; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DatabaseSeederTest extends CIUnitTestCase { public function testInstantiateNoSeedPath(): void diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php index 07affb5e5082..eb47fa4bcb56 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\DatabaseTestCase; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; @@ -24,7 +25,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php index c20033eaf980..1703bdd8c01f 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\DatabaseTestCase; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; @@ -24,7 +25,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php index 533a31a5bece..5fbcf517b407 100644 --- a/tests/system/Database/DatabaseTestCaseTest.php +++ b/tests/system/Database/DatabaseTestCaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseTestCaseTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php index 7ee4f40bd0f8..b7919f1fdd74 100644 --- a/tests/system/Database/Forge/CreateTableTest.php +++ b/tests/system/Database/Forge/CreateTableTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Forge; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CreateTableTest extends CIUnitTestCase { public function testCreateTableWithDefaultRawSql(): void diff --git a/tests/system/Database/Forge/DropForeignKeyTest.php b/tests/system/Database/Forge/DropForeignKeyTest.php index b788d25247d0..09fc35b96ec6 100644 --- a/tests/system/Database/Forge/DropForeignKeyTest.php +++ b/tests/system/Database/Forge/DropForeignKeyTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Forge; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DropForeignKeyTest extends CIUnitTestCase { protected $db; diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php index 1abaef6a29fd..d0b02d7d6815 100644 --- a/tests/system/Database/Live/AliasTest.php +++ b/tests/system/Database/Live/AliasTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class AliasTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php index b2da47b1fcfe..7e7be58ffef3 100644 --- a/tests/system/Database/Live/BadQueryTest.php +++ b/tests/system/Database/Live/BadQueryTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class BadQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php index b04cf2fe2e3d..ee74f8f7f86e 100644 --- a/tests/system/Database/Live/ConnectTest.php +++ b/tests/system/Database/Live/ConnectTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Database\SQLite3\Connection; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ConnectTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php index d475e961f2bc..e9ca2bc5372c 100644 --- a/tests/system/Database/Live/CountTest.php +++ b/tests/system/Database/Live/CountTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class CountTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php index 4c1467bc48d2..bb7996fd9f6c 100644 --- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php +++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseTestTraitCaseTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DbDebugTest.php b/tests/system/Database/Live/DbDebugTest.php index 1c878578026a..86698123ff05 100644 --- a/tests/system/Database/Live/DbDebugTest.php +++ b/tests/system/Database/Live/DbDebugTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DbDebugTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php index 039ebd926911..ec6c1f5c4b8a 100644 --- a/tests/system/Database/Live/DbUtilsTest.php +++ b/tests/system/Database/Live/DbUtilsTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Database; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DbUtilsTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php index 5ed001c5eb42..f3c7c4b2b737 100644 --- a/tests/system/Database/Live/DeleteTest.php +++ b/tests/system/Database/Live/DeleteTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DeleteTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php index 88305c57d7ae..97224a247f59 100644 --- a/tests/system/Database/Live/EmptyTest.php +++ b/tests/system/Database/Live/EmptyTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class EmptyTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php index 9f0a76184af1..afbc3e3b85da 100644 --- a/tests/system/Database/Live/EscapeTest.php +++ b/tests/system/Database/Live/EscapeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\I18n\Time; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class EscapeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php index 19770bea6a83..103358366240 100644 --- a/tests/system/Database/Live/FabricatorLiveTest.php +++ b/tests/system/Database/Live/FabricatorLiveTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class FabricatorLiveTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 0fa79a255f5f..0652b7c3cfe2 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; @@ -26,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ForgeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php index 312fd5e30416..d6f9ee673e79 100644 --- a/tests/system/Database/Live/FromTest.php +++ b/tests/system/Database/Live/FromTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class FromTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php index 1f2ba9ddcb67..90ad2d8537ed 100644 --- a/tests/system/Database/Live/GetNumRowsTest.php +++ b/tests/system/Database/Live/GetNumRowsTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetNumRowsTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php index ce4cfce4a9d2..29dd82028f60 100644 --- a/tests/system/Database/Live/GetTest.php +++ b/tests/system/Database/Live/GetTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GetVersionTest.php b/tests/system/Database/Live/GetVersionTest.php index d6a60f039a9c..de4bd119241e 100644 --- a/tests/system/Database/Live/GetVersionTest.php +++ b/tests/system/Database/Live/GetVersionTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetVersionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php index dda699ba5bf6..7319f1f353cb 100644 --- a/tests/system/Database/Live/GroupTest.php +++ b/tests/system/Database/Live/GroupTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GroupTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php index 314897454ed9..645344cf85c2 100644 --- a/tests/system/Database/Live/IncrementTest.php +++ b/tests/system/Database/Live/IncrementTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class IncrementTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php index 1e6720225a76..6b0bef010679 100644 --- a/tests/system/Database/Live/InsertTest.php +++ b/tests/system/Database/Live/InsertTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class InsertTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php index 979a516e2030..f739685c74e6 100644 --- a/tests/system/Database/Live/JoinTest.php +++ b/tests/system/Database/Live/JoinTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class JoinTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php index d74544387e09..8d06e180739f 100644 --- a/tests/system/Database/Live/LikeTest.php +++ b/tests/system/Database/Live/LikeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class LikeTest extends CIUnitTestCase { use DatabaseTestTrait; @@ -131,11 +132,7 @@ public function testLikeRawSqlAndCountAllResultsAndGet(): void { $builder = $this->db->table('job'); - if ($this->db->DBDriver === 'OCI8') { - $key = new RawSql('"name"'); - } else { - $key = new RawSql('name'); - } + $key = $this->db->DBDriver === 'OCI8' ? new RawSql('"name"') : new RawSql('name'); $builder->like($key, 'Developer'); $count = $builder->countAllResults(false); @@ -152,11 +149,7 @@ public function testLikeRawSqlAndGetAndCountAllResults(): void { $builder = $this->db->table('job'); - if ($this->db->DBDriver === 'OCI8') { - $key = new RawSql('"name"'); - } else { - $key = new RawSql('name'); - } + $key = $this->db->DBDriver === 'OCI8' ? new RawSql('"name"') : new RawSql('name'); $builder->like($key, 'Developer'); $results = $builder->get(null, 0, false)->getResult(); diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php index b0f1df6ee6ab..135dd7a6bf74 100644 --- a/tests/system/Database/Live/LimitTest.php +++ b/tests/system/Database/Live/LimitTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class LimitTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php index 2e2182fa835a..738ee094e6ce 100644 --- a/tests/system/Database/Live/MetadataTest.php +++ b/tests/system/Database/Live/MetadataTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MetadataTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php index 478fded783d4..a50fddd557da 100644 --- a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live\MySQLi; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/MySQLi/NumberNativeTest.php b/tests/system/Database/Live/MySQLi/NumberNativeTest.php index 051e64cfad71..048c615bce15 100644 --- a/tests/system/Database/Live/MySQLi/NumberNativeTest.php +++ b/tests/system/Database/Live/MySQLi/NumberNativeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\MySQLi; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class NumberNativeTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/MySQLi/RawSqlTest.php b/tests/system/Database/Live/MySQLi/RawSqlTest.php index 77aeddfd4ab4..dd4cfac57d20 100644 --- a/tests/system/Database/Live/MySQLi/RawSqlTest.php +++ b/tests/system/Database/Live/MySQLi/RawSqlTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\MySQLi; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class RawSqlTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php index 8ce809c29af8..78a866a610d4 100644 --- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php +++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live\OCI8; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class CallStoredProcedureTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php index 074b77d4e8bc..89c6f9d157b4 100644 --- a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\OCI8; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; use LogicException; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php index 9b6e46ebc713..4a5ed73ee0a3 100644 --- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php +++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\OCI8; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class LastInsertIDTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php index 9057fb172032..31bdddcff28c 100644 --- a/tests/system/Database/Live/OrderTest.php +++ b/tests/system/Database/Live/OrderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class OrderTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php index ea80dbb6d5f4..1ed01ddd292e 100644 --- a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live\Postgre; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php index 0cd0c23d597e..e1315cc16d3c 100644 --- a/tests/system/Database/Live/PreparedQueryTest.php +++ b/tests/system/Database/Live/PreparedQueryTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class PreparedQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php index f6cb14fc9467..9b44880b3341 100644 --- a/tests/system/Database/Live/PretendTest.php +++ b/tests/system/Database/Live/PretendTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class PretendTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php index 2c074bd57d4d..561b1cae2e48 100644 --- a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live\SQLSRV; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/SQLite3/AlterTableTest.php b/tests/system/Database/Live/SQLite3/AlterTableTest.php index 0d01d4f4c51a..9440a3721cc9 100644 --- a/tests/system/Database/Live/SQLite3/AlterTableTest.php +++ b/tests/system/Database/Live/SQLite3/AlterTableTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Database\Live\SQLite3; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Database\SQLite3\Forge; use CodeIgniter\Database\SQLite3\Table; @@ -23,8 +25,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] -#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('sqlite3')] +#[Group('DatabaseLive')] +#[RequiresPhpExtension('sqlite3')] final class AlterTableTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php index aa7da330a2e8..d04e8fa8e77f 100644 --- a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php +++ b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\SQLite3; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; use Config\Database; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ForgeModifyColumnTest extends CIUnitTestCase { private Forge $forge; diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php index cd463186c4dc..fc5d7959b143 100644 --- a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Database\Live\SQLite3; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetFieldDataTestCase extends AbstractGetFieldDataTestCase { protected function createForge(): void diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php index 8352fdcb8b31..3881b4331638 100644 --- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live\SQLite3; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\SQLite3\Connection; use CodeIgniter\Database\SQLite3\Forge; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class GetIndexDataTest extends CIUnitTestCase { /** diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php index 7afbcbf7fdd8..5d8e3402e716 100644 --- a/tests/system/Database/Live/SelectTest.php +++ b/tests/system/Database/Live/SelectTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class SelectTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/TransactionDBDebugFalseTest.php b/tests/system/Database/Live/TransactionDBDebugFalseTest.php index 326dedbe9983..e4dd8d344420 100644 --- a/tests/system/Database/Live/TransactionDBDebugFalseTest.php +++ b/tests/system/Database/Live/TransactionDBDebugFalseTest.php @@ -13,10 +13,11 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class TransactionDBDebugFalseTest extends TransactionDBDebugTrueTest { protected function setUp(): void diff --git a/tests/system/Database/Live/TransactionDBDebugTrueTest.php b/tests/system/Database/Live/TransactionDBDebugTrueTest.php index 33131c5540f0..5d9178a35509 100644 --- a/tests/system/Database/Live/TransactionDBDebugTrueTest.php +++ b/tests/system/Database/Live/TransactionDBDebugTrueTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -24,7 +25,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] class TransactionDBDebugTrueTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/TransactionTest.php b/tests/system/Database/Live/TransactionTest.php index 578664d26afe..a69de8246d84 100644 --- a/tests/system/Database/Live/TransactionTest.php +++ b/tests/system/Database/Live/TransactionTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class TransactionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/UnionTest.php b/tests/system/Database/Live/UnionTest.php index 98bcc1bbd427..3f8643d0fe71 100644 --- a/tests/system/Database/Live/UnionTest.php +++ b/tests/system/Database/Live/UnionTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class UnionTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php index 5b020d511bf1..ed03b37ad554 100644 --- a/tests/system/Database/Live/UpdateTest.php +++ b/tests/system/Database/Live/UpdateTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; @@ -24,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class UpdateTest extends CIUnitTestCase { use DatabaseTestTrait; @@ -112,7 +114,7 @@ public function testUpdateWithWhereAndLimit(): void } } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUpdateBatch')] + #[DataProvider('provideUpdateBatch')] public function testUpdateBatch(string $constraints, array $data, array $expected): void { $table = 'type_test'; diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php index b3f2d7f9ba97..e1248c3d98f4 100644 --- a/tests/system/Database/Live/UpsertTest.php +++ b/tests/system/Database/Live/UpsertTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class UpsertTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php index 8acc190bfb1c..3c0d8d654db9 100644 --- a/tests/system/Database/Live/WhereTest.php +++ b/tests/system/Database/Live/WhereTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Tests\Support\Database\Seeds\CITestSeeder; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class WhereTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php index 44bd4e99f10e..356db13567e6 100644 --- a/tests/system/Database/Live/WriteTypeQueryTest.php +++ b/tests/system/Database/Live/WriteTypeQueryTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Live; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class WriteTypeQueryTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index 0c979a3b2afc..a9c28d29d914 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Migrations; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\MigrationRunner; use CodeIgniter\Events\Events; @@ -30,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MigrationRunnerTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php index 83873992c411..6873541a4225 100644 --- a/tests/system/Database/Migrations/MigrationTest.php +++ b/tests/system/Database/Migrations/MigrationTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Database\Migrations; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Migration; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MigrationTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php index 6c58c2ad96f5..795533158768 100644 --- a/tests/system/Database/RawSqlTest.php +++ b/tests/system/Database/RawSqlTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Database; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RawSqlTest extends CIUnitTestCase { public function testCanConvertToString(): void diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php index 551298ebdd3d..6c2843a6d369 100644 --- a/tests/system/Debug/ExceptionHandlerTest.php +++ b/tests/system/Debug/ExceptionHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Debug; +use PHPUnit\Framework\Attributes\Group; use App\Controllers\Home; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Test\CIUnitTestCase; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ExceptionHandlerTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 087639a2611c..3548301facc6 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -11,6 +11,8 @@ namespace CodeIgniter\Debug; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhp; use App\Controllers\Home; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Entity\Exceptions\CastException; @@ -25,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ExceptionsTest extends CIUnitTestCase { use ReflectionHelper; @@ -53,7 +55,7 @@ protected function setUp(): void $this->exception = new Exceptions(new ExceptionsConfig()); } - #[\PHPUnit\Framework\Attributes\RequiresPhp('>= 8.1')] + #[RequiresPhp('>= 8.1')] public function testDeprecationsOnPhp81DoNotThrow(): void { $config = new ExceptionsConfig(); diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index 68848d51bf24..f3067c21dcc5 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Debug; +use PHPUnit\Framework\Attributes\Group; use ArgumentCountError; use CodeIgniter\Test\CIUnitTestCase; use RuntimeException; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TimerTest extends CIUnitTestCase { /** diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php index c48632a929a9..abeacfbce43e 100644 --- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php +++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\MockObject\MockObject; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DatabaseTest extends CIUnitTestCase { public function testDisplay(): void diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php index 38a6ca8e2bb6..6c7c6f9a8fbb 100644 --- a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php +++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use DateTime; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class HistoryTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php index b610b687569b..60499cedb57e 100644 --- a/tests/system/DebugTraceableTraitTest.php +++ b/tests/system/DebugTraceableTraitTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\CoversClass; use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; @@ -20,8 +22,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] -#[\PHPUnit\Framework\Attributes\CoversClass(DebugTraceableTrait::class)] +#[Group('Others')] +#[CoversClass(DebugTraceableTrait::class)] final class DebugTraceableTraitTest extends CIUnitTestCase { public function testFactoryInstanceReturnsWhereItIsRaised(): void diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php index c0f431690194..e5350e44e4ac 100644 --- a/tests/system/Email/EmailTest.php +++ b/tests/system/Email/EmailTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Email; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Events\Events; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockEmail; @@ -21,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EmailTest extends CIUnitTestCase { public function testEmailValidation(): void @@ -44,7 +46,7 @@ public static function provideEmailSendWithClearance(): iterable /** * @param mixed $autoClear */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideEmailSendWithClearance')] + #[DataProvider('provideEmailSendWithClearance')] public function testEmailSendWithClearance($autoClear): void { $email = $this->createMockEmail(); diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index 10e6d7f1a041..7481dadd4224 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Encryption; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; use Config\Encryption as EncryptionConfig; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EncryptionTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php index ef194273d9ec..7b99339d4dab 100644 --- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php +++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Encryption\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Encryption; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class OpenSSLHandlerTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php index 1657451d36c1..d4255e2deba0 100644 --- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php +++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Encryption\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Encryption; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SodiumHandlerTest extends CIUnitTestCase { private Encryption $encryption; diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 158aea67a958..17ef6a0ef95f 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Entity; +use PHPUnit\Framework\Attributes\Group; use Closure; use CodeIgniter\Entity\Exceptions\CastException; use CodeIgniter\HTTP\URI; @@ -30,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class EntityTest extends CIUnitTestCase { use ReflectionHelper; diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index 385c9f8d9582..a3210ae61cf6 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Events; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockEvents; use Config\Modules; @@ -20,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class EventsTest extends CIUnitTestCase { /** @@ -46,8 +49,8 @@ protected function tearDown(): void Events::simulate(false); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testInitialize(): void { /** diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php index 334ba739c00f..4aa071c9756f 100644 --- a/tests/system/Files/FileCollectionTest.php +++ b/tests/system/Files/FileCollectionTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Files; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Files\Exceptions\FileException; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileCollectionTest extends CIUnitTestCase { /** diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php index 658a7f7c8f3b..392c4463f361 100644 --- a/tests/system/Files/FileTest.php +++ b/tests/system/Files/FileTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Files; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use ZipArchive; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileTest extends CIUnitTestCase { public function testNewGoodChecked(): void diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php index 8482dfcd9bbb..9ef3e585102b 100644 --- a/tests/system/Files/FileWithVfsTest.php +++ b/tests/system/Files/FileWithVfsTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Files; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileWithVfsTest extends CIUnitTestCase { // For VFS stuff diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php index 824cc6f1fdb9..8a2eb2995463 100644 --- a/tests/system/Filters/CSRFTest.php +++ b/tests/system/Filters/CSRFTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; @@ -22,8 +24,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class CSRFTest extends CIUnitTestCase { private \Config\Filters $config; diff --git a/tests/system/Filters/CorsTest.php b/tests/system/Filters/CorsTest.php index c27a754cf90b..86a69e091728 100644 --- a/tests/system/Filters/CorsTest.php +++ b/tests/system/Filters/CorsTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; @@ -31,7 +32,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CorsTest extends CIUnitTestCase { private Cors $cors; diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php index 3a50e689c184..674fd3f3c123 100644 --- a/tests/system/Filters/DebugToolbarTest.php +++ b/tests/system/Filters/DebugToolbarTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; @@ -23,8 +25,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class DebugToolbarTest extends CIUnitTestCase { /** diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index 0c772cf65ce2..e08e94a62f77 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Filters\Exceptions\FilterException; @@ -44,8 +47,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class FiltersTest extends CIUnitTestCase { use ConfigFromArrayTrait; @@ -230,7 +233,7 @@ public static function provideProcessMethodProcessGlobalsWithExcept(): iterable /** * @param array|string $except */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideProcessMethodProcessGlobalsWithExcept')] + #[DataProvider('provideProcessMethodProcessGlobalsWithExcept')] public function testProcessMethodProcessGlobalsWithExcept($except): void { $_SERVER['REQUEST_METHOD'] = 'GET'; @@ -583,7 +586,7 @@ public function testOtherResult(): void /** * @param array|string $except */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideBeforeExcept')] + #[DataProvider('provideBeforeExcept')] public function testBeforeExcept(string $uri, $except, array $expected): void { $_SERVER['REQUEST_METHOD'] = 'GET'; diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php index 2735b9b67dd1..f5c5db756c10 100644 --- a/tests/system/Filters/HoneypotTest.php +++ b/tests/system/Filters/HoneypotTest.php @@ -13,6 +13,10 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Config\Services; use CodeIgniter\Honeypot\Exceptions\HoneypotException; use CodeIgniter\HTTP\CLIRequest; @@ -24,8 +28,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[BackupGlobals(true)] +#[Group('SeparateProcess')] final class HoneypotTest extends CIUnitTestCase { private \Config\Filters $config; @@ -90,8 +94,8 @@ public function testBeforeClean(): void $this->assertSame($expected, $request); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testAfter(): void { $this->config->globals = [ @@ -110,8 +114,8 @@ public function testAfter(): void $this->assertStringContainsString($this->honey->name, $this->response->getBody()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testAfterNotApplicable(): void { $this->config->globals = [ diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php index b7fcf154178b..ad63d6225131 100644 --- a/tests/system/Filters/InvalidCharsTest.php +++ b/tests/system/Filters/InvalidCharsTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -24,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class InvalidCharsTest extends CIUnitTestCase { private InvalidChars $invalidChars; @@ -65,7 +68,7 @@ private function createRequest(): IncomingRequest return $request; } - #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] + #[DoesNotPerformAssertions] public function testBeforeDoNothingWhenCLIRequest(): void { $cliRequest = new CLIRequest(new MockAppConfig()); @@ -73,7 +76,7 @@ public function testBeforeDoNothingWhenCLIRequest(): void $this->invalidChars->before($cliRequest); } - #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] + #[DoesNotPerformAssertions] public function testBeforeValidString(): void { $_POST['val'] = [ @@ -109,8 +112,8 @@ public function testBeforeInvalidControlCharCausesException(): void $this->invalidChars->before($this->request); } - #[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions] - #[\PHPUnit\Framework\Attributes\DataProvider('provideCheckControlStringWithLineBreakAndTabReturnsTheString')] + #[DoesNotPerformAssertions] + #[DataProvider('provideCheckControlStringWithLineBreakAndTabReturnsTheString')] public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string $input): void { $_GET['val'] = $input; @@ -129,7 +132,7 @@ public static function provideCheckControlStringWithLineBreakAndTabReturnsTheStr ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideCheckControlStringWithControlCharsCausesException')] + #[DataProvider('provideCheckControlStringWithControlCharsCausesException')] public function testCheckControlStringWithControlCharsCausesException(string $input): void { $this->expectException(SecurityException::class); diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php index 6958663426d2..e8c0a40a7a8f 100644 --- a/tests/system/Filters/SecureHeadersTest.php +++ b/tests/system/Filters/SecureHeadersTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Filters; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SecureHeadersTest extends CIUnitTestCase { public function testAfter(): void diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php index e580d19ae85d..fc8977267810 100644 --- a/tests/system/Format/FormatTest.php +++ b/tests/system/Format/FormatTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Format; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Format\Exceptions\FormatException; use CodeIgniter\HTTP\URI; use CodeIgniter\Test\CIUnitTestCase; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FormatTest extends CIUnitTestCase { private Format $format; diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php index 025b6b2a7593..4e203bd5c7c8 100644 --- a/tests/system/Format/JSONFormatterTest.php +++ b/tests/system/Format/JSONFormatterTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Format; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use RuntimeException; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class JSONFormatterTest extends CIUnitTestCase { private JSONFormatter $jsonFormatter; diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php index be118820237b..2e1cb84d221f 100644 --- a/tests/system/Format/XMLFormatterTest.php +++ b/tests/system/Format/XMLFormatterTest.php @@ -13,13 +13,15 @@ namespace CodeIgniter\Format; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use DOMDocument; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class XMLFormatterTest extends CIUnitTestCase { private XMLFormatter $xmlFormatter; @@ -102,7 +104,7 @@ public function testValidatingXmlTags(): void $this->assertSame($expected, $this->xmlFormatter->format($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidatingInvalidTags')] + #[DataProvider('provideValidatingInvalidTags')] public function testValidatingInvalidTags(string $expected, array $input): void { $expectedXML = <<assertSame('apple', $request->header('fruit')->getValue()); } - #[\PHPUnit\Framework\Attributes\BackupGlobals(true)] + #[BackupGlobals(true)] public function testOptionsHeadersNotUsingPopulate(): void { $_SERVER['HTTP_HOST'] = 'site1.com'; @@ -245,7 +247,7 @@ public function testHeaderContentLengthNotSharedBetweenRequests(): void $this->assertNull($request->header('Content-Length')); } - #[\PHPUnit\Framework\Attributes\BackupGlobals(true)] + #[BackupGlobals(true)] public function testHeaderContentLengthNotSharedBetweenClients(): void { $_SERVER['HTTP_CONTENT_LENGTH'] = '10'; diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 86baa46626a2..50f8a707d22a 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\TestResponse; use Config\App; @@ -26,7 +29,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class ContentSecurityPolicyTest extends CIUnitTestCase { private ?Response $response = null; @@ -69,8 +72,8 @@ protected function work(string $parm = 'Hello') return $buffer; } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testExistence(): void { $this->prepare(); @@ -79,8 +82,8 @@ public function testExistence(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testReportOnly(): void { $this->prepare(); @@ -90,8 +93,8 @@ public function testReportOnly(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testDefaults(): void { $this->prepare(); @@ -107,8 +110,8 @@ public function testDefaults(): void $this->assertStringContainsString("style-src 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testChildSrc(): void { $this->prepare(); @@ -122,8 +125,8 @@ public function testChildSrc(): void $this->assertStringContainsString("child-src 'self' good.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testConnectSrc(): void { $this->prepare(); @@ -136,8 +139,8 @@ public function testConnectSrc(): void $this->assertStringContainsString("connect-src 'self' iffy.com maybe.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testFontSrc(): void { $this->prepare(); @@ -152,8 +155,8 @@ public function testFontSrc(): void $this->assertStringContainsString('font-src fontsrus.com;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testFormAction(): void { $this->prepare(); @@ -168,8 +171,8 @@ public function testFormAction(): void $this->assertStringNotContainsString("form-action 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testFrameAncestor(): void { $this->prepare(); @@ -183,8 +186,8 @@ public function testFrameAncestor(): void $this->assertStringContainsString("frame-ancestors 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testFrameSrc(): void { $this->prepare(); @@ -198,8 +201,8 @@ public function testFrameSrc(): void $this->assertStringContainsString("frame-src 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testImageSrc(): void { $this->prepare(); @@ -213,8 +216,8 @@ public function testImageSrc(): void $this->assertStringContainsString("img-src 'self' cdn.cloudy.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testMediaSrc(): void { $this->prepare(); @@ -228,8 +231,8 @@ public function testMediaSrc(): void $this->assertStringContainsString("media-src 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testManifestSrc(): void { $this->prepare(); @@ -243,8 +246,8 @@ public function testManifestSrc(): void $this->assertStringContainsString('manifest-src cdn.cloudy.com;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testPluginType(): void { $this->prepare(); @@ -258,8 +261,8 @@ public function testPluginType(): void $this->assertStringContainsString("plugin-types 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testPluginArray(): void { $this->prepare(); @@ -271,8 +274,8 @@ public function testPluginArray(): void $this->assertStringContainsString('plugin-types application/x-shockwave-flash application/wacky-hacky;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testObjectSrc(): void { $this->prepare(); @@ -286,8 +289,8 @@ public function testObjectSrc(): void $this->assertStringContainsString("object-src 'self' cdn.cloudy.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testScriptSrc(): void { $this->prepare(); @@ -301,8 +304,8 @@ public function testScriptSrc(): void $this->assertStringContainsString("script-src 'self' cdn.cloudy.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testStyleSrc(): void { $this->prepare(); @@ -316,8 +319,8 @@ public function testStyleSrc(): void $this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBaseURIDefault(): void { $this->prepare(); @@ -327,8 +330,8 @@ public function testBaseURIDefault(): void $this->assertStringContainsString("base-uri 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBaseURI(): void { $this->prepare(); @@ -339,8 +342,8 @@ public function testBaseURI(): void $this->assertStringContainsString('base-uri example.com;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBaseURIRich(): void { $this->prepare(); @@ -351,8 +354,8 @@ public function testBaseURIRich(): void $this->assertStringContainsString("base-uri 'self' example.com;", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testDefaultSrc(): void { $this->prepare(); @@ -365,8 +368,8 @@ public function testDefaultSrc(): void $this->assertStringContainsString('default-src iffy.com;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testReportURI(): void { $this->prepare(); @@ -378,8 +381,8 @@ public function testReportURI(): void $this->assertStringContainsString('report-uri http://example.com/csptracker;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSandboxFlags(): void { $this->prepare(); @@ -392,8 +395,8 @@ public function testSandboxFlags(): void $this->assertStringContainsString('sandbox allow-popups allow-top-navigation;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testUpgradeInsecureRequests(): void { $this->prepare(); @@ -404,8 +407,8 @@ public function testUpgradeInsecureRequests(): void $this->assertStringContainsString('upgrade-insecure-requests;', $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBodyEmpty(): void { $this->prepare(); @@ -415,8 +418,8 @@ public function testBodyEmpty(): void $this->assertSame($body, $this->response->getBody()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBodyScriptNonce(): void { $this->prepare(); @@ -490,8 +493,8 @@ public function testBodyStyleNonceDisableAutoNonce(): void $result->assertHeader('Content-Security-Policy'); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testBodyStyleNonce(): void { $this->prepare(); @@ -527,8 +530,8 @@ public function testBodyStyleNonceCustomStyleTag(): void $this->assertStringContainsString('nonce=', $response->getBody()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeaderWrongCaseNotFound(): void { $this->prepare(); @@ -538,8 +541,8 @@ public function testHeaderWrongCaseNotFound(): void $this->assertNull($result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeaderIgnoreCase(): void { $this->prepare(); @@ -549,8 +552,8 @@ public function testHeaderIgnoreCase(): void $this->assertStringContainsString("base-uri 'self';", $result); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testCSPDisabled(): void { $this->prepare(false); @@ -578,8 +581,8 @@ public function testGetStyleNonce(): void $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled(): void { $this->prepare(); diff --git a/tests/system/HTTP/CorsTest.php b/tests/system/HTTP/CorsTest.php index dac9aaa000af..88b63a96cb11 100644 --- a/tests/system/HTTP/CorsTest.php +++ b/tests/system/HTTP/CorsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CorsTest extends CIUnitTestCase { /** diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index 1ee24ed58692..5116c47eb6da 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Exceptions\DownloadException; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class DownloadResponseTest extends CIUnitTestCase { protected function setUp(): void @@ -316,8 +319,8 @@ public function testPretendOutput(): void $this->assertSame(file_get_contents(__FILE__), $actual); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRealOutput(): void { $response = new DownloadResponse('unit-test.php', false); diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php index b2e026ac2374..6861a81dc343 100644 --- a/tests/system/HTTP/Files/FileCollectionTest.php +++ b/tests/system/HTTP/Files/FileCollectionTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\HTTP\Files; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Mimes; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileCollectionTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php index 1eb476e67222..b33c5867cf50 100644 --- a/tests/system/HTTP/Files/FileMovingTest.php +++ b/tests/system/HTTP/Files/FileMovingTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\HTTP\Files; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileMovingTest extends CIUnitTestCase { private ?vfsStreamDirectory $root; diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php index f07ce98ca49f..52b29fe44cb1 100644 --- a/tests/system/HTTP/HeaderTest.php +++ b/tests/system/HTTP/HeaderTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Error; use stdClass; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class HeaderTest extends CIUnitTestCase { public function testHeaderStoresBasics(): void diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index 85e948a8240f..ad6e3295f941 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -13,14 +13,16 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\App; /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class IncomingRequestDetectingTest extends CIUnitTestCase { private IncomingRequest $request; diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index da4e55d4ca5f..7ac764b18d88 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -13,6 +13,11 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; @@ -26,8 +31,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[BackupGlobals(true)] +#[Group('SeparateProcess')] final class IncomingRequestTest extends CIUnitTestCase { private Request $request; @@ -143,8 +148,8 @@ public function testCanGetOldInputArrayWithSESSION(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testCanGetOldInputArrayWithSessionService(): void { $locations = [ @@ -662,7 +667,7 @@ public static function provideCanGrabGetRawInputVar(): iterable * @param mixed $filter * @param mixed $flag */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideCanGrabGetRawInputVar')] + #[DataProvider('provideCanGrabGetRawInputVar')] public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $flag): void { $config = new App(); @@ -673,7 +678,7 @@ public function testCanGrabGetRawInputVar($rawstring, $var, $expected, $filter, $this->assertSame($expected, $request->getRawInputVar($var, $filter, $flag)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideIsHTTPMethods')] + #[DataProvider('provideIsHTTPMethods')] public function testIsHTTPMethodLowerCase(string $value): void { $request = $this->request->withMethod($value); @@ -694,7 +699,7 @@ public static function provideIsHTTPMethods(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideIsHTTPMethods')] + #[DataProvider('provideIsHTTPMethods')] public function testIsHTTPMethodUpperCase(string $value): void { $request = $this->request->withMethod($value); @@ -917,7 +922,7 @@ public static function provideExtensionPHP(): iterable * @param mixed $path * @param mixed $detectPath */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideExtensionPHP')] + #[DataProvider('provideExtensionPHP')] public function testExtensionPHP($path, $detectPath): void { $config = new App(); diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index 2359f5cf8c68..304478338294 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; @@ -20,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class MessageTest extends CIUnitTestCase { private ?Message $message; @@ -209,7 +211,7 @@ public static function provideArrayHeaderValue(): iterable /** * @param array $arrayHeaderValue */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayHeaderValue')] + #[DataProvider('provideArrayHeaderValue')] public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); @@ -221,7 +223,7 @@ public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHead /** * @param array $arrayHeaderValue */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayHeaderValue')] + #[DataProvider('provideArrayHeaderValue')] public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue): void { $this->message->setHeader('Accept', $arrayHeaderValue); diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php index ed7ee482c369..90cdf81ac378 100644 --- a/tests/system/HTTP/NegotiateTest.php +++ b/tests/system/HTTP/NegotiateTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class NegotiateTest extends CIUnitTestCase { private ?IncomingRequest $request; diff --git a/tests/system/HTTP/OutgoingRequestTest.php b/tests/system/HTTP/OutgoingRequestTest.php index bc1e8b58f13e..c1645f9c1a71 100644 --- a/tests/system/HTTP/OutgoingRequestTest.php +++ b/tests/system/HTTP/OutgoingRequestTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class OutgoingRequestTest extends CIUnitTestCase { public function testCreateWithHeader(): void diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index afa7ca278a5d..cb0ae7024de8 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Logger; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RedirectExceptionTest extends TestCase { protected function setUp(): void diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index c31295415abb..2c96c2651f70 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Router\RouteCollection; @@ -27,7 +30,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class RedirectResponseTest extends CIUnitTestCase { /** @@ -128,8 +131,8 @@ public function testRedirectRelativeConvertsToFullURI(): void $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testWithInput(): void { $_SESSION = []; @@ -146,8 +149,8 @@ public function testWithInput(): void $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testWithValidationErrors(): void { $_SESSION = []; @@ -164,8 +167,8 @@ public function testWithValidationErrors(): void $this->assertArrayHasKey('_ci_validation_errors', $_SESSION); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testWith(): void { $_SESSION = []; @@ -178,8 +181,8 @@ public function testWith(): void $this->assertArrayHasKey('foo', $_SESSION); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRedirectBack(): void { $_SERVER['HTTP_REFERER'] = 'http://somewhere.com'; @@ -193,8 +196,8 @@ public function testRedirectBack(): void $this->assertSame('http://somewhere.com', $returned->header('location')->getValue()); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRedirectBackMissing(): void { $_SESSION = []; @@ -209,8 +212,8 @@ public function testRedirectBackMissing(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119 */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRedirectRouteBaseUrl(): void { $config = new App(); @@ -246,8 +249,8 @@ public function testWithCookies(): void $this->assertTrue($response->hasCookie('foo', 'bar')); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testWithCookiesWithEmptyCookies(): void { $_SESSION = []; diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index f0298aaa30e2..0dc74a5d12a0 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -20,8 +22,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class RequestTest extends CIUnitTestCase { private Request $request; diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php index a220e3678395..5831540169d9 100644 --- a/tests/system/HTTP/ResponseCookieTest.php +++ b/tests/system/HTTP/ResponseCookieTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ResponseCookieTest extends CIUnitTestCase { private array $defaults; diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php index beee6886371c..1d6e94de8985 100644 --- a/tests/system/HTTP/ResponseSendTest.php +++ b/tests/system/HTTP/ResponseSendTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Security\Exceptions\SecurityException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -26,7 +29,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class ResponseSendTest extends CIUnitTestCase { /** @@ -42,8 +45,8 @@ final class ResponseSendTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeadersMissingDate(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -78,8 +81,8 @@ public function testHeadersMissingDate(): void * This test does not test that CSP is handled properly - * it makes sure that sending gives CSP a chance to do its thing. */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeadersWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -117,8 +120,8 @@ public function testHeadersWithCSP(): void * * @see https://github.com/codeigniter4/CodeIgniter4/issues/1393 */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testRedirectResponseCookies(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index bba85116f12c..d80db9c45083 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; @@ -25,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ResponseTest extends CIUnitTestCase { private array $server; @@ -269,7 +271,7 @@ public function testRedirectSetsDefaultCodeAndLocationHeader(): void $this->assertSame(302, $response->getStatusCode()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirect')] + #[DataProvider('provideRedirect')] public function testRedirect( string $server, string $protocol, @@ -313,7 +315,7 @@ public static function provideRedirect(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirectWithIIS')] + #[DataProvider('provideRedirectWithIIS')] public function testRedirectWithIIS( string $protocol, string $method, diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php index 3f84409d3dcf..bde5fe629e51 100644 --- a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -20,8 +23,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SiteURIFactoryDetectRoutePathTest extends CIUnitTestCase { protected function setUp(): void @@ -281,7 +284,7 @@ public function testPathInfoSubfolder(): void * @param string $path * @param string $detectPath */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideExtensionPHP')] + #[DataProvider('provideExtensionPHP')] public function testExtensionPHP($path, $detectPath): void { $config = new App(); diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index 2203e3453b09..9b2acf06d51e 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -20,8 +23,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SiteURIFactoryTest extends CIUnitTestCase { protected function setUp(): void @@ -85,7 +88,7 @@ public function testCreateFromGlobalsAllowedHost(): void $this->assertSame('woot', $uri->getRoutePath()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideCreateFromStringWithIndexPage')] + #[DataProvider('provideCreateFromStringWithIndexPage')] public function testCreateFromStringWithIndexPage( string $uriString, string $expectUriString, @@ -126,7 +129,7 @@ public static function provideCreateFromStringWithIndexPage(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideCreateFromStringWithoutIndexPage')] + #[DataProvider('provideCreateFromStringWithoutIndexPage')] public function testCreateFromStringWithoutIndexPage( string $uriString, string $expectUriString, diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index b8cac4d7058f..b529b215abf7 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use BadMethodCallException; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; @@ -22,11 +25,11 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SiteURITest extends CIUnitTestCase { - #[\PHPUnit\Framework\Attributes\DataProvider('provideConstructor')] + #[DataProvider('provideConstructor')] public function testConstructor( string $baseURL, string $indexPage, @@ -323,7 +326,7 @@ public function testConstructorInvalidBaseURL(): void new SiteURI($config); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSetPath')] + #[DataProvider('provideSetPath')] public function testSetPath( string $baseURL, string $indexPage, diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 9b5f7ba1d32f..1ada5869ecb5 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Exceptions\HTTPException; @@ -22,8 +25,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class URITest extends CIUnitTestCase { public function testConstructorSetsAllParts(): void @@ -125,7 +128,7 @@ public function testCanCastAsString(): void $this->assertSame($expected, (string) $uri); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSimpleUri')] + #[DataProvider('provideSimpleUri')] public function testSimpleUri(string $url, string $expectedURL, string $expectedPath): void { $uri = new URI($url); @@ -397,7 +400,7 @@ public function testSetPathSetsValue(): void $this->assertSame($expected, (string) $uri); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSetPath')] + #[DataProvider('provideSetPath')] public function testSetPath(string $path, string $expectedURL, string $expectedPath): void { $url = 'http://example.com/'; @@ -511,7 +514,7 @@ public static function providePathGetsFiltered(): iterable * @param string $path * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('providePathGetsFiltered')] + #[DataProvider('providePathGetsFiltered')] public function testPathGetsFiltered($path, $expected): void { $uri = new URI(); @@ -626,7 +629,7 @@ public static function provideAuthorityReturnsExceptedValues(): iterable * @param string $url * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAuthorityReturnsExceptedValues')] + #[DataProvider('provideAuthorityReturnsExceptedValues')] public function testAuthorityReturnsExceptedValues($url, $expected): void { $uri = new URI($url); @@ -652,7 +655,7 @@ public static function provideAuthorityRemovesDefaultPorts(): iterable * @param string $scheme * @param int $port */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAuthorityRemovesDefaultPorts')] + #[DataProvider('provideAuthorityRemovesDefaultPorts')] public function testAuthorityRemovesDefaultPorts($scheme, $port): void { $url = "{$scheme}://example.com:{$port}/path"; @@ -774,7 +777,7 @@ public static function provideRemoveDotSegments(): iterable * @param string $path * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideRemoveDotSegments')] + #[DataProvider('provideRemoveDotSegments')] public function testRemoveDotSegments($path, $expected): void { $this->assertSame($expected, URI::removeDotSegments($path)); @@ -814,7 +817,7 @@ public static function defaultResolutions(): iterable * @param string $rel * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('defaultResolutions')] + #[DataProvider('defaultResolutions')] public function testResolveRelativeURI($rel, $expected): void { $base = 'http://a/b/c/d'; @@ -829,7 +832,7 @@ public function testResolveRelativeURI($rel, $expected): void * @param string $rel * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('defaultResolutions')] + #[DataProvider('defaultResolutions')] public function testResolveRelativeURIHTTPS($rel, $expected): void { $base = 'https://a/b/c/d'; diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php index 2d03f8cae933..a72ff9129f5e 100644 --- a/tests/system/HTTP/UserAgentTest.php +++ b/tests/system/HTTP/UserAgentTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\HTTP; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class UserAgentTest extends CIUnitTestCase { private string $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27'; diff --git a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php index 9332bcccf5b4..ead5b25643f2 100644 --- a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php +++ b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Helpers\Array; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ArrayHelperDotKeyExistsTest extends CIUnitTestCase { private array $array = [ diff --git a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php index 5d8c9fa3d42c..dfd2ac994f98 100644 --- a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php +++ b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Helpers\Array; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ArrayHelperRecursiveDiffTest extends CIUnitTestCase { private array $compareWith; diff --git a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php index 314d406671ea..5ed25d142be8 100644 --- a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php +++ b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Helpers\Array; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ArrayHelperSortValuesByNaturalTest extends CIUnitTestCase { private array $arrayWithStringValues = [ diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php index 5cb240c57fad..dc6289b6aa2e 100644 --- a/tests/system/Helpers/ArrayHelperTest.php +++ b/tests/system/Helpers/ArrayHelperTest.php @@ -13,13 +13,15 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use ValueError; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ArrayHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -212,7 +214,7 @@ public function testArrayDotIgnoresLastWildcard(): void * @param int|string $key * @param array|string|null $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayDeepSearch')] + #[DataProvider('provideArrayDeepSearch')] public function testArrayDeepSearch($key, $expected): void { $data = [ @@ -246,7 +248,7 @@ public function testArrayDeepSearchReturnNullEmptyArray(): void $this->assertNull(array_deep_search('key644', $data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] + #[DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysWithArray(array $data, array $sortColumns, array $expected): void { $success = array_sort_by_multiple_keys($data, $sortColumns); @@ -255,7 +257,7 @@ public function testArraySortByMultipleKeysWithArray(array $data, array $sortCol $this->assertSame($expected, array_column($data, 'name')); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] + #[DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysWithObjects(array $data, array $sortColumns, array $expected): void { // Morph to objects @@ -269,7 +271,7 @@ public function testArraySortByMultipleKeysWithObjects(array $data, array $sortC $this->assertSame($expected, array_column((array) $data, 'name')); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] + #[DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, array $sortColumns, array $expected): void { // Both filled @@ -292,7 +294,7 @@ public function testArraySortByMultipleKeysFailsEmptyParameter(array $data, arra /** * @param mixed $data */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideSortByMultipleKeys')] + #[DataProvider('provideSortByMultipleKeys')] public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data): void { $this->expectException(ValueError::class); @@ -385,7 +387,7 @@ public static function provideSortByMultipleKeys(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayFlattening')] + #[DataProvider('provideArrayFlattening')] public function testArrayFlattening(array $input, array $expected): void { $this->assertSame($expected, array_flatten_with_dots($input)); @@ -483,7 +485,7 @@ public static function provideArrayFlattening(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayGroupByIncludeEmpty')] + #[DataProvider('provideArrayGroupByIncludeEmpty')] public function testArrayGroupByIncludeEmpty(array $indexes, array $data, array $expected): void { $actual = array_group_by($data, $indexes, true); @@ -491,7 +493,7 @@ public function testArrayGroupByIncludeEmpty(array $indexes, array $data, array $this->assertSame($expected, $actual, 'array including empty not the same'); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideArrayGroupByExcludeEmpty')] + #[DataProvider('provideArrayGroupByExcludeEmpty')] public function testArrayGroupByExcludeEmpty(array $indexes, array $data, array $expected): void { $actual = array_group_by($data, $indexes, false); diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php index 40e02a808b1a..a872fb1ffe05 100755 --- a/tests/system/Helpers/CookieHelperTest.php +++ b/tests/system/Helpers/CookieHelperTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\HTTP\IncomingRequest; @@ -29,7 +30,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CookieHelperTest extends CIUnitTestCase { private IncomingRequest $request; diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php index 3ac268fbf264..cfbbbc5da25b 100644 --- a/tests/system/Helpers/DateHelperTest.php +++ b/tests/system/Helpers/DateHelperTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; use CodeIgniter\Test\CIUnitTestCase; use DateTimeZone; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DateHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index 4e7cbe7e1045..f0caa2264b01 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\visitor\vfsStreamStructureVisitor; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilesystemHelperTest extends CIUnitTestCase { /** diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index cc9e16edb155..9c3a22d57527 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\HTTP\SiteURI; use CodeIgniter\Test\CIUnitTestCase; use Config\App; @@ -23,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class FormHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -952,8 +955,8 @@ public function testSetCheckboxWithUnchecked(): void ); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSetRadioFromSessionOldInput(): void { $_SESSION = [ @@ -970,8 +973,8 @@ public function testSetRadioFromSessionOldInput(): void unset($_SESSION['_ci_old_input']); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSetRadioFromPost(): void { $_POST['bar'] = 'baz'; @@ -981,8 +984,8 @@ public function testSetRadioFromPost(): void $this->assertSame('', set_radio('bar', 'boop', true)); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testSetRadioFromPostWithValueZero(): void { $_POST['bar'] = '0'; diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php index c66e4b3d0ff8..ecf576734790 100755 --- a/tests/system/Helpers/HTMLHelperTest.php +++ b/tests/system/Helpers/HTMLHelperTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class HTMLHelperTest extends CIUnitTestCase { private array $tracks; diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php index a20d39f26f59..bb5cb8da21c8 100755 --- a/tests/system/Helpers/InflectorHelperTest.php +++ b/tests/system/Helpers/InflectorHelperTest.php @@ -13,12 +13,14 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class InflectorHelperTest extends CIUnitTestCase { protected function setUp(): void @@ -260,7 +262,7 @@ public static function provideOrdinal(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideOrdinal')] + #[DataProvider('provideOrdinal')] public function testOrdinal(string $suffix, int $number): void { $this->assertSame($suffix, ordinal($number)); diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php index 0a2f112dc9e2..68c133ea1d8f 100755 --- a/tests/system/Helpers/NumberHelperTest.php +++ b/tests/system/Helpers/NumberHelperTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class NumberHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php index 7d0821e7a572..59c85b9077ed 100644 --- a/tests/system/Helpers/SecurityHelperTest.php +++ b/tests/system/Helpers/SecurityHelperTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockSecurity; use Config\Security as SecurityConfig; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SecurityHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php index e32a8b2c0a8a..382c68b3aafd 100755 --- a/tests/system/Helpers/TextHelperTest.php +++ b/tests/system/Helpers/TextHelperTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TextHelperTest extends CIUnitTestCase { private string $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.'; diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php index 77c6d85ae3c5..abe001aa60af 100644 --- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php +++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Helpers\URLHelper; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -30,8 +33,8 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class CurrentUrlTest extends CIUnitTestCase { private App $config; @@ -280,7 +283,7 @@ public static function provideUrlIs(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] + #[DataProvider('provideUrlIs')] public function testUrlIs(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -291,7 +294,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected) $this->assertSame($expected, url_is($testPath)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] + #[DataProvider('provideUrlIs')] public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -304,7 +307,7 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex $this->assertSame($expected, url_is($testPath)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlIs')] + #[DataProvider('provideUrlIs')] public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected): void { $_SERVER['HTTP_HOST'] = 'example.com'; diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index 4f3c47803ea4..def34b04cd93 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -13,6 +13,11 @@ namespace CodeIgniter\Helpers\URLHelper; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -27,8 +32,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class MiscUrlTest extends CIUnitTestCase { private App $config; @@ -53,9 +58,9 @@ protected function tearDown(): void $_SERVER = []; } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] - #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] + #[Group('SeparateProcess')] public function testPreviousURLUsesSessionFirst(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -88,9 +93,9 @@ private function createRequest(string $uri): void Factories::injectMock('config', 'App', $this->config); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] - #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] + #[Group('SeparateProcess')] public function testPreviousURLUsesRefererIfNeeded(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -180,7 +185,7 @@ public static function provideAnchor(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchor')] + #[DataProvider('provideAnchor')] public function testAnchor($expected = '', $uri = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -244,7 +249,7 @@ public static function provideAnchorNoindex(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorNoindex')] + #[DataProvider('provideAnchorNoindex')] public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = ''): void { $this->config->indexPage = ''; @@ -300,7 +305,7 @@ public static function provideAnchorTargetted(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorTargetted')] + #[DataProvider('provideAnchorTargetted')] public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = ''): void { $this->config->indexPage = ''; @@ -345,7 +350,7 @@ public static function provideAnchorExamples(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorExamples')] + #[DataProvider('provideAnchorExamples')] public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -402,7 +407,7 @@ public static function provideAnchorPopup(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAnchorPopup')] + #[DataProvider('provideAnchorPopup')] public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false): void { $uriString = 'http://example.com/'; @@ -440,7 +445,7 @@ public static function provideMailto(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideMailto')] + #[DataProvider('provideMailto')] public function testMailto($expected = '', $email = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -478,7 +483,7 @@ public static function provideSafeMailto(): iterable * @param mixed $title * @param mixed $attributes */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideSafeMailto')] + #[DataProvider('provideSafeMailto')] public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = ''): void { $uriString = 'http://example.com/'; @@ -541,7 +546,7 @@ public static function provideAutoLinkUrl(): iterable * @param mixed $in * @param mixed $out */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkUrl')] + #[DataProvider('provideAutoLinkUrl')] public function testAutoLinkUrl($in, $out): void { $this->assertSame($out, auto_link($in, 'url')); @@ -589,7 +594,7 @@ public static function provideAutoLinkEmail(): iterable * @param mixed $in * @param mixed $out */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkEmail')] + #[DataProvider('provideAutoLinkEmail')] public function testAutoLinkEmail($in, $out): void { $this->assertSame($out, auto_link($in, 'email')); @@ -637,7 +642,7 @@ public static function provideAutolinkBoth(): iterable * @param mixed $in * @param mixed $out */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAutolinkBoth')] + #[DataProvider('provideAutolinkBoth')] public function testAutolinkBoth($in, $out): void { $this->assertSame($out, auto_link($in)); @@ -685,7 +690,7 @@ public static function provideAutoLinkPopup(): iterable * @param mixed $in * @param mixed $out */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAutoLinkPopup')] + #[DataProvider('provideAutoLinkPopup')] public function testAutoLinkPopup($in, $out): void { $this->assertSame($out, auto_link($in, 'url', true)); @@ -770,7 +775,7 @@ public static function providePrepUrl(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('providePrepUrl')] + #[DataProvider('providePrepUrl')] public function testPrepUrl(string $input, string $expected, bool $secure): void { $this->assertSame($expected, prep_url($input, $secure)); @@ -834,7 +839,7 @@ public function testMbUrlTitleExtraDashes(): void } } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlTo')] + #[DataProvider('provideUrlTo')] public function testUrlTo(string $expected, string $input, ...$args): void { $_SERVER['HTTP_HOST'] = 'example.com'; @@ -848,7 +853,7 @@ public function testUrlTo(string $expected, string $input, ...$args): void $this->assertSame($expected, url_to($input, ...$args)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrlToThrowsOnEmptyOrMissingRoute')] + #[DataProvider('provideUrlToThrowsOnEmptyOrMissingRoute')] public function testUrlToThrowsOnEmptyOrMissingRoute(string $route): void { $this->expectException(RouterException::class); diff --git a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php index 0bd9a0d5f720..c688ba6fbcb4 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Helpers\URLHelper; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; @@ -26,8 +29,8 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SiteUrlCliTest extends CIUnitTestCase { private App $config; @@ -70,7 +73,7 @@ private function createRequest(?App $config = null): void * @param string $expectedSiteUrl * @param string $expectedBaseUrl */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrls')] + #[DataProvider('provideUrls')] public function testUrls( $baseURL, $indexPage, diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index 8bf26f67d7e0..d07a9e50200f 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Helpers\URLHelper; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -29,8 +32,8 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SiteUrlTest extends CIUnitTestCase { private App $config; @@ -80,7 +83,7 @@ private function createRequest(?App $config = null, $body = null, ?string $path * @param string $expectedSiteUrl * @param string $expectedBaseUrl */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideUrls')] + #[DataProvider('provideUrls')] public function testUrls( $baseURL, $indexPage, diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php index af1852a32b12..681314127ea9 100644 --- a/tests/system/Helpers/XMLHelperTest.php +++ b/tests/system/Helpers/XMLHelperTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Helpers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class XMLHelperTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php index 4347beb2ca8f..161535aa1d22 100644 --- a/tests/system/HomeTest.php +++ b/tests/system/HomeTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\FeatureTestTrait; use CodeIgniter\Test\TestResponse; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class HomeTest extends CIUnitTestCase { use FeatureTestTrait; diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index 30128b8d03f7..d97794cb160e 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Honeypot; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Filters\Filters; @@ -27,8 +29,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class HoneypotTest extends CIUnitTestCase { private HoneypotConfig $config; diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index 31d65a819376..f8dcecedf0e5 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\HotReloader; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DirectoryHasherTest extends CIUnitTestCase { private DirectoryHasher $hasher; diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php index bb45a2388b9a..0a1e244c19e9 100644 --- a/tests/system/I18n/TimeDifferenceTest.php +++ b/tests/system/I18n/TimeDifferenceTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\I18n; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Locale; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TimeDifferenceTest extends CIUnitTestCase { private string $currentLocale; diff --git a/tests/system/I18n/TimeLegacyTest.php b/tests/system/I18n/TimeLegacyTest.php index 20857cd633cf..2f85b7d9122b 100644 --- a/tests/system/I18n/TimeLegacyTest.php +++ b/tests/system/I18n/TimeLegacyTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\I18n; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\I18n\Exceptions\I18nException; use CodeIgniter\Test\CIUnitTestCase; @@ -25,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TimeLegacyTest extends CIUnitTestCase { private string $currentLocale; @@ -1151,7 +1153,7 @@ public function testSetTestNowWithFaLocale(): void $this->assertSame('2017-03-10T12:00:00+09:00', $now); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideToStringDoesNotDependOnLocale')] + #[DataProvider('provideToStringDoesNotDependOnLocale')] public function testToStringDoesNotDependOnLocale(string $locale): void { Locale::setDefault($locale); diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index d4bdaba8f349..606e3cd0d6e8 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\I18n; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\I18n\Exceptions\I18nException; use CodeIgniter\Test\CIUnitTestCase; @@ -25,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TimeTest extends CIUnitTestCase { private string $currentLocale; @@ -1167,7 +1169,7 @@ public function testSetTestNowWithFaLocale(): void $this->assertSame('2017-03-10T12:00:00+09:00', $now); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideToStringDoesNotDependOnLocale')] + #[DataProvider('provideToStringDoesNotDependOnLocale')] public function testToStringDoesNotDependOnLocale(string $locale): void { Locale::setDefault($locale); diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php index b6fe8c0b4ac7..cf02b4fb492c 100644 --- a/tests/system/Images/BaseHandlerTest.php +++ b/tests/system/Images/BaseHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Images; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Images\Exceptions\ImageException; @@ -31,7 +32,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BaseHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php index 15df5d13bc1e..bab99482fe8f 100644 --- a/tests/system/Images/GDHandlerTest.php +++ b/tests/system/Images/GDHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Images; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Images\Handlers\BaseHandler; @@ -31,7 +32,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GDHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php index e9a04d2eafc5..4e67fce70a4a 100644 --- a/tests/system/Images/ImageMagickHandlerTest.php +++ b/tests/system/Images/ImageMagickHandlerTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Images; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Images\Handlers\BaseHandler; @@ -32,8 +35,8 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] -#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('imagick')] +#[Group('Others')] +#[RequiresPhpExtension('imagick')] final class ImageMagickHandlerTest extends CIUnitTestCase { private string $root; @@ -78,7 +81,7 @@ protected function setUp(): void $this->handler = Services::image('imagick', $config, false); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideNonexistentLibraryPathTerminatesProcessing')] + #[DataProvider('provideNonexistentLibraryPathTerminatesProcessing')] public function testNonexistentLibraryPathTerminatesProcessing(string $path, string $invalidPath): void { $this->expectException(ImageException::class); diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php index d9b4418e3bd0..e1d782ea1a88 100644 --- a/tests/system/Images/ImageTest.php +++ b/tests/system/Images/ImageTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Images; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ImageTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index 1dbb239f662b..69363c8fecae 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Language; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLanguage; use Config\Services; @@ -22,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class LanguageTest extends CIUnitTestCase { private Language $lang; @@ -267,7 +269,7 @@ public static function provideBundleUniqueKeys(): iterable * * @param mixed $bundle */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideBundleUniqueKeys')] + #[DataProvider('provideBundleUniqueKeys')] public function testBundleUniqueKeys($bundle): void { $messages = require SYSTEMPATH . 'Language/en/' . $bundle . '.php'; diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php index c3f37654a55b..dfb34b5c840f 100644 --- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Log\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use CodeIgniter\Test\Mock\MockResponse; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ChromeLoggerHandlerTest extends CIUnitTestCase { public function testCanHandleLogLevel(): void diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php index 052aeabb2611..728ef653d2c1 100644 --- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php +++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Log\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Log\Exceptions\LogException; use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\MockObject\MockObject; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ErrorlogHandlerTest extends CIUnitTestCase { public function testHandlerThrowsOnInvalidMessageType(): void diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php index 25c323d9332e..eb7af4d53dbb 100644 --- a/tests/system/Log/Handlers/FileHandlerTest.php +++ b/tests/system/Log/Handlers/FileHandlerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Log\Handlers; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockFileLogger; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileHandlerTest extends CIUnitTestCase { private vfsStreamDirectory $root; diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index 0611fe532649..e909fccbad69 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Log; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Exceptions\LogException; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class LoggerTest extends CIUnitTestCase { protected function tearDown(): void diff --git a/tests/system/Models/AffectedRowsTest.php b/tests/system/Models/AffectedRowsTest.php index 07da816981a0..bbf749d23233 100644 --- a/tests/system/Models/AffectedRowsTest.php +++ b/tests/system/Models/AffectedRowsTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class AffectedRowsTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php index 8a3a3af617ca..f91a97c1b309 100644 --- a/tests/system/Models/CountAllModelTest.php +++ b/tests/system/Models/CountAllModelTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class CountAllModelTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/DataConverterModelTest.php b/tests/system/Models/DataConverterModelTest.php index ce404ab21e02..67df1ea3b356 100644 --- a/tests/system/Models/DataConverterModelTest.php +++ b/tests/system/Models/DataConverterModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; use Tests\Support\Entity\CustomUser; use Tests\Support\Entity\User; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DataConverterModelTest extends LiveModelTestCase { protected $migrate = true; diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php index a8e36ee1bb08..1cc0b3245f2b 100644 --- a/tests/system/Models/DeleteModelTest.php +++ b/tests/system/Models/DeleteModelTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Exceptions\ModelException; use Tests\Support\Models\JobModel; @@ -22,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DeleteModelTest extends LiveModelTestCase { public function testDeleteBasics(): void @@ -155,7 +157,7 @@ public function testOnlyDeleted(): void * * @param int|string|null $emptyValue */ - #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] + #[DataProvider('emptyPkValues')] public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void { $this->createModel(UserModel::class); @@ -168,7 +170,7 @@ public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue /** * @param int|string|null $emptyValue */ - #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] + #[DataProvider('emptyPkValues')] public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): void { $this->expectException(DatabaseException::class); @@ -182,7 +184,7 @@ public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): /** * @param int|string|null $emptyValue */ - #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] + #[DataProvider('emptyPkValues')] public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void { $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]); @@ -241,7 +243,7 @@ public function testPurgeDeletedWithSoftDeleteFalse(): void /** * @param int|string|null $id */ - #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] + #[DataProvider('emptyPkValues')] public function testDeleteThrowDatabaseExceptionWithoutWhereClause($id): void { // BaseBuilder throws Exception. @@ -259,7 +261,7 @@ public function testDeleteThrowDatabaseExceptionWithoutWhereClause($id): void /** * @param int|string|null $id */ - #[\PHPUnit\Framework\Attributes\DataProvider('emptyPkValues')] + #[DataProvider('emptyPkValues')] public function testDeleteWithSoftDeleteThrowDatabaseExceptionWithoutWhereClause($id): void { // Model throws Exception. diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php index 2ec66e73228f..d3a00ee0111c 100644 --- a/tests/system/Models/EventsModelTest.php +++ b/tests/system/Models/EventsModelTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use Tests\Support\Models\EventModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class EventsModelTest extends LiveModelTestCase { /** diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php index 6ec8452ac95f..362619855a59 100644 --- a/tests/system/Models/FindModelTest.php +++ b/tests/system/Models/FindModelTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Exceptions\ModelException; use Tests\Support\Entity\UserWithCasts; @@ -24,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class FindModelTest extends LiveModelTestCase { public function testFindReturnsRow(): void @@ -181,7 +183,7 @@ public function testFirst(): void * @param mixed $groupBy * @param mixed $total */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideFirstAggregate')] + #[DataProvider('provideFirstAggregate')] public function testFirstAggregate($groupBy, $total): void { $this->createModel(UserModel::class); @@ -216,7 +218,7 @@ public static function provideFirstAggregate(): iterable * @param mixed $aggregate * @param mixed $groupBy */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAggregateAndGroupBy')] + #[DataProvider('provideAggregateAndGroupBy')] public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void { $this->db->table('user') @@ -261,7 +263,7 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void * @param mixed $aggregate * @param mixed $groupBy */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideAggregateAndGroupBy')] + #[DataProvider('provideAggregateAndGroupBy')] public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void { $this->createModel(UserModel::class); diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php index 7f04b7add02a..f85f5d795813 100644 --- a/tests/system/Models/GeneralModelTest.php +++ b/tests/system/Models/GeneralModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use BadMethodCallException; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Model; @@ -26,7 +27,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GeneralModelTest extends CIUnitTestCase { /** diff --git a/tests/system/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php index c495ba75b55b..288c7b189fd4 100644 --- a/tests/system/Models/GetCompiledModelTest.php +++ b/tests/system/Models/GetCompiledModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\ModelException; use CodeIgniter\Model; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class GetCompiledModelTest extends CIUnitTestCase { private ?object $model = null; diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php index 6b00ba1260a1..6afd2260df7f 100644 --- a/tests/system/Models/InsertModelTest.php +++ b/tests/system/Models/InsertModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; use CodeIgniter\I18n\Time; @@ -28,7 +29,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class InsertModelTest extends LiveModelTestCase { public function testSetWorksWithInsert(): void diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php index 4388e691463a..c05896406054 100644 --- a/tests/system/Models/MiscellaneousModelTest.php +++ b/tests/system/Models/MiscellaneousModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\I18n\Time; use Tests\Support\Models\EntityModel; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MiscellaneousModelTest extends LiveModelTestCase { public function testChunk(): void diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php index b6fa8e27e845..b7e4661f83ec 100644 --- a/tests/system/Models/PaginateModelTest.php +++ b/tests/system/Models/PaginateModelTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserModel; use Tests\Support\Models\ValidModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class PaginateModelTest extends LiveModelTestCase { public function testPaginate(): void diff --git a/tests/system/Models/ReplaceModelTest.php b/tests/system/Models/ReplaceModelTest.php index 35ae1b207da7..1fa71323334e 100644 --- a/tests/system/Models/ReplaceModelTest.php +++ b/tests/system/Models/ReplaceModelTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ReplaceModelTest extends LiveModelTestCase { public function testReplaceRespectsUseTimestamps(): void diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php index a3186a470f74..8af9677196c8 100644 --- a/tests/system/Models/SaveModelTest.php +++ b/tests/system/Models/SaveModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; use CodeIgniter\I18n\Time; @@ -28,7 +29,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class SaveModelTest extends LiveModelTestCase { public function testSaveNewRecordObject(): void diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php index d99ab50bfc9c..36ea733cd643 100644 --- a/tests/system/Models/TimestampModelTest.php +++ b/tests/system/Models/TimestampModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; use Tests\Support\Entity\User; use Tests\Support\Models\UserTimestampModel; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class TimestampModelTest extends LiveModelTestCase { protected $migrate = true; diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php index 3296a2a211ef..c2f90705f998 100644 --- a/tests/system/Models/UpdateModelTest.php +++ b/tests/system/Models/UpdateModelTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; @@ -33,7 +35,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class UpdateModelTest extends LiveModelTestCase { public function testSetWorksWithUpdate(): void @@ -553,7 +555,7 @@ public function testUpdateWithSetAndEscape(): void /** * @param false|null $id */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideUpdateThrowDatabaseExceptionWithoutWhereClause')] + #[DataProvider('provideUpdateThrowDatabaseExceptionWithoutWhereClause')] public function testUpdateThrowDatabaseExceptionWithoutWhereClause($id, string $exception, string $exceptionMessage): void { $this->expectException($exception); diff --git a/tests/system/Models/ValidationModelRuleGroupTest.php b/tests/system/Models/ValidationModelRuleGroupTest.php index 2a7a7b75258d..48bf900caa2a 100644 --- a/tests/system/Models/ValidationModelRuleGroupTest.php +++ b/tests/system/Models/ValidationModelRuleGroupTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Model; use Config\Services; @@ -26,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ValidationModelRuleGroupTest extends LiveModelTestCase { protected function setUp(): void diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php index 753c437250cd..0abce78b7f51 100644 --- a/tests/system/Models/ValidationModelTest.php +++ b/tests/system/Models/ValidationModelTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Model; use Config\Validation; @@ -25,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class ValidationModelTest extends LiveModelTestCase { protected function setUp(): void diff --git a/tests/system/Models/WhenWhenNotModelTest.php b/tests/system/Models/WhenWhenNotModelTest.php index 61bf3f375216..31015aa88bb1 100644 --- a/tests/system/Models/WhenWhenNotModelTest.php +++ b/tests/system/Models/WhenWhenNotModelTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Models; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\SecondaryModel; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class WhenWhenNotModelTest extends LiveModelTestCase { public function testWhenWithTrueCondition(): void diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php index 795401ecb71d..c0dd61b05186 100644 --- a/tests/system/Pager/PagerRendererTest.php +++ b/tests/system/Pager/PagerRendererTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Pager; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\URI; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PagerRendererTest extends CIUnitTestCase { private string $expect; diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php index 6da74a9bce2d..d3bec487a475 100644 --- a/tests/system/Pager/PagerTest.php +++ b/tests/system/Pager/PagerTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Pager; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -27,8 +29,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class PagerTest extends CIUnitTestCase { private ?Pager $pager = null; diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php index 2c7f5db96685..6e667215da48 100644 --- a/tests/system/Publisher/ContentReplacerTest.php +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ContentReplacerTest extends CIUnitTestCase { public function testReplace(): void diff --git a/tests/system/Publisher/PublisherContentReplaceTest.php b/tests/system/Publisher/PublisherContentReplaceTest.php index 4549ed662d5b..7c873602b1a5 100644 --- a/tests/system/Publisher/PublisherContentReplaceTest.php +++ b/tests/system/Publisher/PublisherContentReplaceTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublisherContentReplaceTest extends CIUnitTestCase { private string $file; diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php index d3fcc9fe436b..481ecb5403a2 100644 --- a/tests/system/Publisher/PublisherInputTest.php +++ b/tests/system/Publisher/PublisherInputTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublisherInputTest extends CIUnitTestCase { /** diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php index 6c4670c282ec..b79144006592 100644 --- a/tests/system/Publisher/PublisherOutputTest.php +++ b/tests/system/Publisher/PublisherOutputTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublisherOutputTest extends CIUnitTestCase { /** diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php index 952c3c4608ca..0f67e5e0056c 100644 --- a/tests/system/Publisher/PublisherRestrictionsTest.php +++ b/tests/system/Publisher/PublisherRestrictionsTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Publisher\Exceptions\PublisherException; use CodeIgniter\Test\CIUnitTestCase; @@ -24,7 +26,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublisherRestrictionsTest extends CIUnitTestCase { /** @@ -47,7 +49,7 @@ public function testImmutableRestrictions(): void $this->assertArrayNotHasKey(SUPPORTPATH, $restrictions); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideDefaultPublicRestrictions')] + #[DataProvider('provideDefaultPublicRestrictions')] public function testDefaultPublicRestrictions(string $path): void { $publisher = new Publisher(ROOTPATH, FCPATH); @@ -77,7 +79,7 @@ public static function provideDefaultPublicRestrictions(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideDestinations')] + #[DataProvider('provideDestinations')] public function testDestinations(string $destination, bool $allowed): void { config('Publisher')->restrictions = [ diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php index 2dd26c2c7a9f..079e14a30692 100644 --- a/tests/system/Publisher/PublisherSupportTest.php +++ b/tests/system/Publisher/PublisherSupportTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Publisher; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Publisher\Exceptions\PublisherException; use CodeIgniter\Test\CIUnitTestCase; use Tests\Support\Publishers\TestPublisher; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class PublisherSupportTest extends CIUnitTestCase { /** diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php index 22fd3a0e10f8..717884a83250 100644 --- a/tests/system/RESTful/ResourceControllerTest.php +++ b/tests/system/RESTful/ResourceControllerTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\RESTful; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\Services; use CodeIgniter\Format\JSONFormatter; @@ -39,9 +42,9 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class ResourceControllerTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php index f2d37b1c9ce9..389f54ef38f6 100644 --- a/tests/system/RESTful/ResourcePresenterTest.php +++ b/tests/system/RESTful/ResourcePresenterTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\RESTful; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\Services; use CodeIgniter\Model; @@ -33,9 +36,9 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class ResourcePresenterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php index f476cb2aa27b..9b438d821809 100644 --- a/tests/system/Router/AutoRouterImprovedTest.php +++ b/tests/system/Router/AutoRouterImprovedTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Router; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\PageNotFoundException; @@ -29,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class AutoRouterImprovedTest extends CIUnitTestCase { private RouteCollection $collection; @@ -457,7 +459,7 @@ public function testDoesNotTranslateDashInParam(): void $this->assertSame(['a-b'], $params); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideTranslateUriToCamelCase')] + #[DataProvider('provideTranslateUriToCamelCase')] public function testTranslateUriToCamelCase( string $uri, ?string $expDirectory, @@ -529,7 +531,7 @@ public static function provideTranslateUriToCamelCase(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRejectTranslateUriToCamelCase')] + #[DataProvider('provideRejectTranslateUriToCamelCase')] public function testRejectTranslateUriToCamelCase(string $uri, string $expMsg): void { $this->expectException(PageNotFoundException::class); diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php index 8707a6bceafd..351b02437696 100644 --- a/tests/system/Router/DefinedRouteCollectorTest.php +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Router; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DefinedRouteCollectorTest extends CIUnitTestCase { private function createRouteCollection(array $config = [], $moduleConfig = null): RouteCollection diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php index 701d79f7bdc1..34be8aea84d0 100644 --- a/tests/system/Router/RouteCollectionReverseRouteTest.php +++ b/tests/system/Router/RouteCollectionReverseRouteTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Router; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Method; use CodeIgniter\Router\Exceptions\RouterException; @@ -23,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RouteCollectionReverseRouteTest extends CIUnitTestCase { protected function setUp(): void @@ -142,7 +144,7 @@ public static function provideReverseRoutingDefaultNamespaceAppController(): ite ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideReverseRoutingDefaultNamespaceAppController')] + #[DataProvider('provideReverseRoutingDefaultNamespaceAppController')] public function testReverseRoutingDefaultNamespaceAppController(string $controller): void { $routes = $this->getCollector(); diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 0911b486d7a1..420ac9f607ea 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Router; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use App\Controllers\Product; use CodeIgniter\Config\Services; use CodeIgniter\controller; @@ -26,7 +28,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RouteCollectionTest extends CIUnitTestCase { protected function setUp(): void @@ -484,7 +486,7 @@ static function ($routes): void { $this->assertSame($expected, $routes->getRoutes()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideNestedGroupingWorksWithRootPrefix')] + #[DataProvider('provideNestedGroupingWorksWithRootPrefix')] public function testNestedGroupingWorksWithRootPrefix( string $group, string $subgroup, @@ -1320,7 +1322,7 @@ static function (): void {}, $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRoutesOptionsWithSameFromTwoRoutes')] + #[DataProvider('provideRoutesOptionsWithSameFromTwoRoutes')] public function testRoutesOptionsWithSameFromTwoRoutes(array $options1, array $options2): void { $routes = $this->getCollector(); @@ -1769,7 +1771,7 @@ public static function provideRouteDefaultNamespace(): iterable /** * @param mixed $namespace */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideRouteDefaultNamespace')] + #[DataProvider('provideRouteDefaultNamespace')] public function testAutoRoutesControllerNameReturnsFQCN($namespace): void { $routes = $this->getCollector(); @@ -1789,7 +1791,7 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace): void /** * @param mixed $namespace */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideRouteDefaultNamespace')] + #[DataProvider('provideRouteDefaultNamespace')] public function testRoutesControllerNameReturnsFQCN($namespace): void { Services::request()->setMethod(Method::GET); diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index 09f710978d42..a2fc16dbd1d5 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Router; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\PageNotFoundException; @@ -30,7 +32,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RouterTest extends CIUnitTestCase { private RouteCollection $collection; @@ -912,7 +914,7 @@ public function testSetDirectoryInvalid(): void $this->assertSame('', $router->directory()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRedirectRoute')] + #[DataProvider('provideRedirectRoute')] public function testRedirectRoute( string $route, string $redirectFrom, diff --git a/tests/system/Security/CheckPhpIniTest.php b/tests/system/Security/CheckPhpIniTest.php index 08c49c3094fb..38d5ced76a3f 100644 --- a/tests/system/Security/CheckPhpIniTest.php +++ b/tests/system/Security/CheckPhpIniTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Security; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockInputOutput; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CheckPhpIniTest extends CIUnitTestCase { public function testCheckIni(): void diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php index dd4cd16847aa..796b8f5ec22c 100644 --- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Security; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Cookie; use CodeIgniter\HTTP\IncomingRequest; @@ -26,7 +27,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SecurityCSRFCookieRandomizeTokenTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index 3d6386d70036..bce3d3735063 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Security; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -37,9 +40,9 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index 90bb0e49c014..ee553b6db73a 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Security; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -35,9 +38,9 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class SecurityCSRFSessionTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index d449e6b2dec4..bce6c47824d0 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Security; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Request; @@ -28,8 +30,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\BackupGlobals(true)] -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[BackupGlobals(true)] +#[Group('Others')] final class SecurityTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php index f239402acc08..165bab9088f8 100644 --- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php +++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Session\Handlers\Database; +use PHPUnit\Framework\Attributes\Group; use Config\Database as DatabaseConfig; use Config\Session as SessionConfig; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class MySQLiHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php index 58dd19ab50e8..69f052b5a59c 100644 --- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php +++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Session\Handlers\Database; +use PHPUnit\Framework\Attributes\Group; use Config\Database as DatabaseConfig; use Config\Session as SessionConfig; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class PostgreHandlerTest extends AbstractHandlerTestCase { protected function setUp(): void diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index aa03d39e6c7f..eba8152ee587 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Session\Handlers\Database; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Session\Handlers\RedisHandler; use CodeIgniter\Test\CIUnitTestCase; use Config\Session as SessionConfig; @@ -20,8 +23,8 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] -#[\PHPUnit\Framework\Attributes\RequiresPhpExtension('redis')] +#[Group('DatabaseLive')] +#[RequiresPhpExtension('redis')] final class RedisHandlerTest extends CIUnitTestCase { private string $sessionDriver = RedisHandler::class; @@ -134,7 +137,7 @@ public function testSecondaryReadAfterClose(): void $handler->close(); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideSetSavePath')] + #[DataProvider('provideSetSavePath')] public function testSetSavePath(string $savePath, array $expected): void { $option = ['savePath' => $savePath]; diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php index 26b4a02558e4..40afe2dc789d 100644 --- a/tests/system/Session/SessionTest.php +++ b/tests/system/Session/SessionTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Session; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Session\Handlers\FileHandler; @@ -26,9 +29,9 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class SessionTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php index 66f8a3dc3809..ab70dc4e3aff 100644 --- a/tests/system/SparkTest.php +++ b/tests/system/SparkTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SparkTest extends CIUnitTestCase { public function testCanUseOption(): void diff --git a/tests/system/SuperglobalsTest.php b/tests/system/SuperglobalsTest.php index fa61bc8f30f8..272f502a8ada 100644 --- a/tests/system/SuperglobalsTest.php +++ b/tests/system/SuperglobalsTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class SuperglobalsTest extends CIUnitTestCase { public function testSetGet(): void diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php index 7f664b5bb183..a48c20a89515 100644 --- a/tests/system/Test/BootstrapFCPATHTest.php +++ b/tests/system/Test/BootstrapFCPATHTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; /** * Class BootstrapFCPATHTest * @@ -25,7 +26,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class BootstrapFCPATHTest extends CIUnitTestCase { private string $currentDir = __DIR__; diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index b5f2bdd516be..600359cc8112 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\Group; use App\Controllers\Home; use App\Controllers\NeverHeardOfIt; use CodeIgniter\Controller; @@ -29,9 +32,9 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses] -#[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[RunTestsInSeparateProcesses] +#[PreserveGlobalState(false)] +#[Group('SeparateProcess')] final class ControllerTestTraitTest extends CIUnitTestCase { use ControllerTestTrait; diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php index 1d086db48c37..0477fc0561fb 100644 --- a/tests/system/Test/DOMParserTest.php +++ b/tests/system/Test/DOMParserTest.php @@ -13,10 +13,12 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DOMParserTest extends CIUnitTestCase { protected function setUp(): void @@ -92,7 +94,7 @@ public static function provideText(): iterable /** * @param string $text */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideText')] + #[DataProvider('provideText')] public function testSeeText($text): void { $dom = new DOMParser(); @@ -139,7 +141,7 @@ public function testSeeFail(): void /** * @param string $text */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideText')] + #[DataProvider('provideText')] public function testSeeElement($text): void { $dom = new DOMParser(); diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php index 236b6ab126a8..39243804a47c 100644 --- a/tests/system/Test/FabricatorTest.php +++ b/tests/system/Test/FabricatorTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Model; use Tests\Support\Models\EntityModel; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FabricatorTest extends CIUnitTestCase { /** diff --git a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php index 9b1f451c6565..1ad1be055569 100644 --- a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php +++ b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Events\Events; use Config\Feature; use Config\Services; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FeatureTestAutoRoutingImprovedTest extends CIUnitTestCase { use FeatureTestTrait; diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index b259448f2e90..e7c658eda821 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\PageNotFoundException; @@ -26,7 +28,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class FeatureTestTraitTest extends CIUnitTestCase { use FeatureTestTrait; @@ -362,7 +364,7 @@ public static function provideOpenCliRoutesFromHttpGot404(): iterable * @param mixed $to * @param mixed $httpGet */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideOpenCliRoutesFromHttpGot404')] + #[DataProvider('provideOpenCliRoutesFromHttpGot404')] public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet): void { $this->expectException(PageNotFoundException::class); diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php index e8ed466e6dff..7b8f123b9109 100644 --- a/tests/system/Test/FilterTestTraitTest.php +++ b/tests/system/Test/FilterTestTraitTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\RequestInterface; use Config\Services; use Tests\Support\Filters\Customfilter; @@ -28,7 +29,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FilterTestTraitTest extends CIUnitTestCase { use FilterTestTrait; diff --git a/tests/system/Test/IniTestTraitTest.php b/tests/system/Test/IniTestTraitTest.php index 70c78f2f1c79..1e958493937f 100644 --- a/tests/system/Test/IniTestTraitTest.php +++ b/tests/system/Test/IniTestTraitTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use ReflectionException; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class IniTestTraitTest extends CIUnitTestCase { use IniTestTrait; diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php index caa7aa41fe1e..59afc3411f61 100644 --- a/tests/system/Test/ReflectionHelperTest.php +++ b/tests/system/Test/ReflectionHelperTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Test\TestForReflectionHelper; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ReflectionHelperTest extends CIUnitTestCase { public function testGetPrivatePropertyWithObject(): void diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php index 22c2844f29ca..40559aeef3fb 100644 --- a/tests/system/Test/TestCaseEmissionsTest.php +++ b/tests/system/Test/TestCaseEmissionsTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\HTTP\Response; use Config\App; @@ -24,7 +27,7 @@ * * @internal */ -#[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] +#[Group('SeparateProcess')] final class TestCaseEmissionsTest extends CIUnitTestCase { /** @@ -40,8 +43,8 @@ final class TestCaseEmissionsTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeadersEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -70,8 +73,8 @@ public function testHeadersEmitted(): void $this->assertHeaderEmitted('set-cookie: FOO=bar', true); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] public function testHeadersNotEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php index f939b055ac20..c64867f9da03 100644 --- a/tests/system/Test/TestCaseTest.php +++ b/tests/system/Test/TestCaseTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Events\Events; use Tests\Support\Test\TestForReflectionHelper; @@ -20,7 +21,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TestCaseTest extends CIUnitTestCase { use StreamFilterTrait; diff --git a/tests/system/Test/TestLoggerTest.php b/tests/system/Test/TestLoggerTest.php index 5ea2003942d3..d4b95bbfe02b 100644 --- a/tests/system/Test/TestLoggerTest.php +++ b/tests/system/Test/TestLoggerTest.php @@ -13,15 +13,17 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use Config\Logger; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TestLoggerTest extends CIUnitTestCase { - #[\PHPUnit\Framework\Attributes\DataProvider('provideDidLogMethod')] + #[DataProvider('provideDidLogMethod')] public function testDidLogMethod(bool $expected, string $level, string $message, bool $exact): void { (new TestLogger(new Logger()))->log('error', 'Some variable did not contain a value.'); diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php index 6794d222d68d..2145d174cd5a 100644 --- a/tests/system/Test/TestResponseTest.php +++ b/tests/system/Test/TestResponseTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Test; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Response; use Config\App; @@ -22,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TestResponseTest extends CIUnitTestCase { private ?TestResponse $testResponse = null; @@ -33,7 +35,7 @@ protected function setUp(): void parent::setUp(); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideHttpStatusCodes')] + #[DataProvider('provideHttpStatusCodes')] public function testIsOK(int $code, bool $isOk): void { $this->getTestResponse('Hello World'); @@ -221,7 +223,7 @@ public function testAssertStatus(): void $this->testResponse->assertStatus(201); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideHttpStatusCodes')] + #[DataProvider('provideHttpStatusCodes')] public function testAssertIsOK(int $code, bool $isOk): void { $this->getTestResponse('

        Hello World

        ', ['statusCode' => $code]); diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 0b8bfdb726b5..0d0b5d219dea 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Throttle; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cache\CacheInterface; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; @@ -20,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ThrottleTest extends CIUnitTestCase { private CacheInterface $cache; @@ -189,7 +191,7 @@ public function testFlooding(): void $this->assertEqualsWithDelta(10.0, round($this->cache->get('throttler_127.0.0.1')), PHP_FLOAT_EPSILON); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideTokenTimeCalculationUCs')] + #[DataProvider('provideTokenTimeCalculationUCs')] public function testTokenTimeCalculationUCs(int $capacity, int $seconds, array $checkInputs): void { $key = 'testkey'; diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php index 9774c6f19b61..399f1d96dd9a 100644 --- a/tests/system/Typography/TypographyTest.php +++ b/tests/system/Typography/TypographyTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Typography; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TypographyTest extends CIUnitTestCase { private Typography $typography; diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php index 496a5e3c835e..9b587374eaf9 100644 --- a/tests/system/Validation/CreditCardRulesTest.php +++ b/tests/system/Validation/CreditCardRulesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use Tests\Support\Validation\TestRules; @@ -20,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CreditCardRulesTest extends CIUnitTestCase { private Validation $validation; @@ -49,7 +51,7 @@ protected function setUp(): void $this->validation->reset(); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidCCNumber')] + #[DataProvider('provideValidCCNumber')] public function testValidCCNumber(string $type, ?string $number, bool $expected): void { $data = ['cc' => $number]; diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php index af811eddb4bc..d9656b02d777 100644 --- a/tests/system/Validation/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/DatabaseRelatedRulesTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest; use Tests\Support\Validation\TestRules; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] final class DatabaseRelatedRulesTest extends StrictDatabaseRelatedRulesTest { protected array $config = [ diff --git a/tests/system/Validation/DotArrayFilterTest.php b/tests/system/Validation/DotArrayFilterTest.php index c1b2ac7fc523..6db223279f6e 100644 --- a/tests/system/Validation/DotArrayFilterTest.php +++ b/tests/system/Validation/DotArrayFilterTest.php @@ -13,12 +13,13 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DotArrayFilterTest extends CIUnitTestCase { public function testRunReturnEmptyArray(): void diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php index 8083d95939e1..7bd681a3b074 100644 --- a/tests/system/Validation/FileRulesTest.php +++ b/tests/system/Validation/FileRulesTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use InvalidArgumentException; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileRulesTest extends CIUnitTestCase { private Validation $validation; diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php index 62c8ce257b31..827d74f2e09a 100644 --- a/tests/system/Validation/FormatRulesTest.php +++ b/tests/system/Validation/FormatRulesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use Generator; @@ -23,7 +25,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] class FormatRulesTest extends CIUnitTestCase { public const ALPHABET = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ'; @@ -85,7 +87,7 @@ public function testRegexMatchFalse(): void $this->assertFalse($this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidUrl')] + #[DataProvider('provideValidUrl')] public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void { $data = [ @@ -99,7 +101,7 @@ public function testValidURL(?string $url, bool $isLoose, bool $isStrict): void $this->assertSame($isLoose, $this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidUrl')] + #[DataProvider('provideValidUrl')] public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict): void { $data = [ @@ -225,7 +227,7 @@ public static function provideValidUrl(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidEmail')] + #[DataProvider('provideValidEmail')] public function testValidEmail(?string $email, bool $expected): void { $data = [ @@ -239,7 +241,7 @@ public function testValidEmail(?string $email, bool $expected): void $this->assertSame($expected, $this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidEmails')] + #[DataProvider('provideValidEmails')] public function testValidEmails(?string $email, bool $expected): void { $data = [ @@ -301,7 +303,7 @@ public static function provideValidEmails(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidIP')] + #[DataProvider('provideValidIP')] public function testValidIP(?string $ip, ?string $which, bool $expected): void { $data = [ @@ -369,7 +371,7 @@ public static function provideValidIP(): iterable /** * @param int|string $str */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideString')] + #[DataProvider('provideString')] public function testString($str, bool $expected): void { $data = [ @@ -401,7 +403,7 @@ public static function provideString(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideAlpha')] + #[DataProvider('provideAlpha')] public function testAlpha(?string $str, bool $expected): void { $data = [ @@ -441,7 +443,7 @@ public static function provideAlpha(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaSpace')] + #[DataProvider('provideAlphaSpace')] public function testAlphaSpace(?string $value, bool $expected): void { $data = [ @@ -485,7 +487,7 @@ public static function provideAlphaSpace(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('alphaNumericProvider')] + #[DataProvider('alphaNumericProvider')] public function testAlphaNumeric(?string $str, bool $expected): void { $data = [ @@ -521,7 +523,7 @@ public static function alphaNumericProvider(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaNumericPunct')] + #[DataProvider('provideAlphaNumericPunct')] public function testAlphaNumericPunct(?string $str, bool $expected): void { $data = [ @@ -613,7 +615,7 @@ public static function provideAlphaNumericPunct(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('alphaNumericProvider')] + #[DataProvider('alphaNumericProvider')] public function testAlphaNumericSpace(?string $str, bool $expected): void { $data = [ @@ -649,7 +651,7 @@ public function alphaNumericSpaceProvider(): Generator ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideAlphaDash')] + #[DataProvider('provideAlphaDash')] public function testAlphaDash(?string $str, bool $expected): void { $data = [ @@ -685,7 +687,7 @@ public static function provideAlphaDash(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideHex')] + #[DataProvider('provideHex')] public function testHex(?string $str, bool $expected): void { $data = [ @@ -721,7 +723,7 @@ public static function provideHex(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideNumeric')] + #[DataProvider('provideNumeric')] public function testNumeric(?string $str, bool $expected): void { $data = [ @@ -778,7 +780,7 @@ public static function provideNumeric(): iterable * * @param mixed $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidIntegerType')] + #[DataProvider('provideInvalidIntegerType')] public function testIntegerWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules([ @@ -796,7 +798,7 @@ public function testIntegerWithInvalidTypeData($value, bool $expected): void * * @param mixed $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideInvalidIntegerType')] + #[DataProvider('provideInvalidIntegerType')] public function testNumericWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules([ @@ -839,7 +841,7 @@ public static function provideInvalidIntegerType(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideInteger')] + #[DataProvider('provideInteger')] public function testInteger(?string $str, bool $expected): void { $data = [ @@ -891,7 +893,7 @@ public static function provideInteger(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideDecimal')] + #[DataProvider('provideDecimal')] public function testDecimal(?string $str, bool $expected): void { $data = [ @@ -947,7 +949,7 @@ public static function provideDecimal(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideNatural')] + #[DataProvider('provideNatural')] public function testNatural(?string $str, bool $expected): void { $data = [ @@ -987,7 +989,7 @@ public static function provideNatural(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideNaturalNoZero')] + #[DataProvider('provideNaturalNoZero')] public function testNaturalNoZero(?string $str, bool $expected): void { $data = [ @@ -1027,7 +1029,7 @@ public static function provideNaturalNoZero(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideBase64')] + #[DataProvider('provideBase64')] public function testBase64(?string $str, bool $expected): void { $data = [ @@ -1059,7 +1061,7 @@ public static function provideBase64(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideJson')] + #[DataProvider('provideJson')] public function testJson(?string $str, bool $expected): void { $data = [ @@ -1115,7 +1117,7 @@ public static function provideJson(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideTimeZone')] + #[DataProvider('provideTimeZone')] public function testTimeZone(?string $str, bool $expected): void { $data = [ @@ -1151,7 +1153,7 @@ public static function provideTimeZone(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidDate')] + #[DataProvider('provideValidDate')] public function testValidDate(?string $str, ?string $format, bool $expected): void { $data = [ diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php index 6ea38beea074..3737bf7216d1 100644 --- a/tests/system/Validation/RulesTest.php +++ b/tests/system/Validation/RulesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use stdClass; @@ -23,7 +25,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] class RulesTest extends CIUnitTestCase { protected Validation $validation; @@ -53,7 +55,7 @@ protected function setUp(): void $this->validation->reset(); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequired')] + #[DataProvider('provideRequired')] public function testRequired(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'required']); @@ -73,7 +75,7 @@ public static function provideRequired(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideIfExist')] + #[DataProvider('provideIfExist')] public function testIfExist(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -124,7 +126,7 @@ public static function provideIfExist(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('providePermitEmpty')] + #[DataProvider('providePermitEmpty')] public function testPermitEmpty(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -291,7 +293,7 @@ public static function providePermitEmpty(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMatches')] + #[DataProvider('provideMatches')] public function testMatches(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'matches[bar]']); @@ -313,7 +315,7 @@ public static function provideMatches(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMatchesNestedCases')] + #[DataProvider('provideMatchesNestedCases')] public function testMatchesNested(array $data, bool $expected): void { $this->validation->setRules(['nested.foo' => 'matches[nested.bar]']); @@ -328,7 +330,7 @@ public static function provideMatchesNestedCases(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideDiffers')] + #[DataProvider('provideDiffers')] public function testDiffers(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'differs[bar]']); @@ -350,14 +352,14 @@ public static function provideDiffers(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMatchesNestedCases')] + #[DataProvider('provideMatchesNestedCases')] public function testDiffersNested(array $data, bool $expected): void { $this->validation->setRules(['nested.foo' => 'differs[nested.bar]']); $this->assertSame(! $expected, $this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideEquals')] + #[DataProvider('provideEquals')] public function testEquals(array $data, string $param, bool $expected): void { $this->validation->setRules(['foo' => "equals[{$param}]"]); @@ -375,7 +377,7 @@ public static function provideEquals(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMinLengthCases')] + #[DataProvider('provideMinLengthCases')] public function testMinLength(?string $data, string $length, bool $expected): void { $this->validation->setRules(['foo' => "min_length[{$length}]"]); @@ -392,7 +394,7 @@ public static function provideMinLengthCases(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMinLengthCases')] + #[DataProvider('provideMinLengthCases')] public function testMaxLength(?string $data, string $length, bool $expected): void { $this->validation->setRules(['foo' => "max_length[{$length}]"]); @@ -408,7 +410,7 @@ public function testMaxLengthReturnsFalseWithNonNumericVal(): void /** * @param int|string|null $data */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideExactLength')] + #[DataProvider('provideExactLength')] public function testExactLength($data, bool $expected): void { $this->validation->setRules(['foo' => 'exact_length[3]']); @@ -435,7 +437,7 @@ public function testExactLengthDetectsBadLength(): void $this->assertFalse($this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThan')] + #[DataProvider('provideGreaterThan')] public function testGreaterThan(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -458,7 +460,7 @@ public static function provideGreaterThan(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanEqual')] + #[DataProvider('provideGreaterThanEqual')] public function testGreaterThanEqual(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -482,7 +484,7 @@ public static function provideGreaterThanEqual(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThan')] + #[DataProvider('provideLessThan')] public function testLessThan(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -506,7 +508,7 @@ public static function provideLessThan(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThanEqual')] + #[DataProvider('provideLessThanEqual')] public function testLessThanEqual(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -530,7 +532,7 @@ public static function provideLessThanEqual(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideInList')] + #[DataProvider('provideInList')] public function testInList(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -538,7 +540,7 @@ public function testInList(?string $first, ?string $second, bool $expected): voi $this->assertSame($expected, $this->validation->run($data)); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideInList')] + #[DataProvider('provideInList')] public function testNotInList(?string $first, ?string $second, bool $expected): void { $data = ['foo' => $first]; @@ -561,7 +563,7 @@ public static function provideInList(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWith')] + #[DataProvider('provideRequiredWith')] public function testRequiredWith(?string $field, ?string $check, bool $expected): void { $data = [ @@ -615,7 +617,7 @@ public static function provideRequiredWith(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/7557 */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithAndOtherRules')] + #[DataProvider('provideRequiredWithAndOtherRules')] public function testRequiredWithAndOtherRules(bool $expected, array $data): void { $this->validation->setRules([ @@ -649,7 +651,7 @@ public static function provideRequiredWithAndOtherRules(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithAndOtherRuleWithValueZero')] + #[DataProvider('provideRequiredWithAndOtherRuleWithValueZero')] public function testRequiredWithAndOtherRuleWithValueZero(bool $expected, array $data): void { $this->validation->setRules([ @@ -671,7 +673,7 @@ public static function provideRequiredWithAndOtherRuleWithValueZero(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithout')] + #[DataProvider('provideRequiredWithout')] public function testRequiredWithout(?string $field, ?string $check, bool $expected): void { $data = [ @@ -721,7 +723,7 @@ public static function provideRequiredWithout(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithoutMultiple')] + #[DataProvider('provideRequiredWithoutMultiple')] public function testRequiredWithoutMultiple(string $foo, string $bar, string $baz, bool $result): void { $this->validation->setRules(['foo' => 'required_without[bar,baz]']); @@ -770,7 +772,7 @@ public static function provideRequiredWithoutMultiple(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRequiredWithoutMultipleWithoutFields')] + #[DataProvider('provideRequiredWithoutMultipleWithoutFields')] public function testRequiredWithoutMultipleWithoutFields(array $data, bool $result): void { $this->validation->setRules(['foo' => 'required_without[bar,baz]']); @@ -810,7 +812,7 @@ public static function provideRequiredWithoutMultipleWithoutFields(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideFieldExists')] + #[DataProvider('provideFieldExists')] public function testFieldExists(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php index 8903ab073c5b..867eefdf8aba 100644 --- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php +++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; @@ -21,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CreditCardRulesTest extends CIUnitTestCase { private Validation $validation; @@ -50,7 +52,7 @@ protected function setUp(): void $this->validation->reset(); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidCCNumber')] + #[DataProvider('provideValidCCNumber')] public function testValidCCNumber(string $type, ?string $number, bool $expected): void { $data = ['cc' => $number]; diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php index 208d0cb3f79e..556c40bf656c 100644 --- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Validation\Validation; @@ -27,7 +28,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('DatabaseLive')] +#[Group('DatabaseLive')] class DatabaseRelatedRulesTest extends CIUnitTestCase { use DatabaseTestTrait; diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php index 9a8a9f68c010..f09e1416817f 100644 --- a/tests/system/Validation/StrictRules/FileRulesTest.php +++ b/tests/system/Validation/StrictRules/FileRulesTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; @@ -22,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FileRulesTest extends CIUnitTestCase { private Validation $validation; diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php index 8b08a4d300bd..1da8403017ea 100644 --- a/tests/system/Validation/StrictRules/FormatRulesTest.php +++ b/tests/system/Validation/StrictRules/FormatRulesTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\FormatRulesTest as TraditionalFormatRulesTest; use Tests\Support\Validation\TestRules; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class FormatRulesTest extends TraditionalFormatRulesTest { protected array $config = [ diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php index 5db01491bde3..0145459265ca 100644 --- a/tests/system/Validation/StrictRules/RulesTest.php +++ b/tests/system/Validation/StrictRules/RulesTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Validation\RulesTest as TraditionalRulesTest; use CodeIgniter\Validation\Validation; use Tests\Support\Validation\TestRules; @@ -20,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class RulesTest extends TraditionalRulesTest { protected Validation $validation; @@ -42,7 +44,7 @@ final class RulesTest extends TraditionalRulesTest ], ]; - #[\PHPUnit\Framework\Attributes\DataProvider('providePermitEmptyStrict')] + #[DataProvider('providePermitEmptyStrict')] public function testPermitEmptyStrict(array $rules, array $data, bool $expected): void { $this->validation->setRules($rules); @@ -99,7 +101,7 @@ public static function providePermitEmptyStrict(): iterable /** * @param int $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanEqualStrict')] + #[DataProvider('provideGreaterThanEqualStrict')] public function testGreaterThanEqualStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "greater_than_equal_to[{$param}]"]); @@ -124,7 +126,7 @@ public static function provideGreaterThanEqualStrict(): iterable /** * @param int $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideGreaterThanStrict')] + #[DataProvider('provideGreaterThanStrict')] public function testGreaterThanStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "greater_than[{$param}]"]); @@ -150,7 +152,7 @@ public static function provideGreaterThanStrict(): iterable /** * @param int $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideLessThanStrict')] + #[DataProvider('provideLessThanStrict')] public function testLessThanStrict($value, string $param, bool $expected): void { $this->validation->setRules(['foo' => "less_than[{$param}]"]); @@ -177,7 +179,7 @@ public static function provideLessThanStrict(): iterable /** * @param int $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideLessEqualThanStrict')] + #[DataProvider('provideLessEqualThanStrict')] public function testLessEqualThanStrict($value, ?string $param, bool $expected): void { $this->validation->setRules(['foo' => "less_than_equal_to[{$param}]"]); @@ -199,7 +201,7 @@ public static function provideLessEqualThanStrict(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideMatches')] + #[DataProvider('provideMatches')] public function testMatches(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'matches[bar]']); @@ -221,7 +223,7 @@ public static function provideMatches(): iterable ]; } - #[\PHPUnit\Framework\Attributes\DataProvider('provideDiffers')] + #[DataProvider('provideDiffers')] public function testDiffers(array $data, bool $expected): void { $this->validation->setRules(['foo' => 'differs[bar]']); diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php index 82a6944a7931..fd778e748b3d 100644 --- a/tests/system/Validation/StrictRules/ValidationTest.php +++ b/tests/system/Validation/StrictRules/ValidationTest.php @@ -13,13 +13,14 @@ namespace CodeIgniter\Validation\StrictRules; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\ValidationTest as TraditionalValidationTest; use Tests\Support\Validation\TestRules; /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ValidationTest extends TraditionalValidationTest { protected static array $config = [ diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index 861e6b681d6b..9e789edde1bc 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\Validation; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -31,7 +33,7 @@ * * @no-final */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] class ValidationTest extends CIUnitTestCase { protected Validation $validation; @@ -191,7 +193,7 @@ public function testSetRuleOverwritesRuleReverse(): void /** * @param mixed $rules */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideSetRuleRulesFormat')] + #[DataProvider('provideSetRuleRulesFormat')] public function testSetRuleRulesFormat(bool $expected, $rules): void { if (! $expected) { @@ -445,7 +447,7 @@ public function testCallableRuleWithLabel(): void * * @param mixed $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideCanValidatetArrayData')] + #[DataProvider('provideCanValidatetArrayData')] public function testCanValidatetArrayData($value, bool $expected): void { $data = []; @@ -497,7 +499,7 @@ public static function provideCanValidatetArrayData(): iterable * * @param mixed $value */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideIsIntWithInvalidTypeData')] + #[DataProvider('provideIsIntWithInvalidTypeData')] public function testIsIntWithInvalidTypeData($value, bool $expected): void { $this->validation->setRules(['foo' => 'is_int']); @@ -734,7 +736,7 @@ public function testRunWithCustomErrorsAndAsteriskField(): void * @param list|string $rules * @param string $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideRulesSetup')] + #[DataProvider('provideRulesSetup')] public function testRulesSetup($rules, $expected, array $errors = []): void { $data = ['foo' => '']; @@ -1127,7 +1129,7 @@ public function testRulesForObjectField(): void ], $this->validation->getErrors()); } - #[\PHPUnit\Framework\Attributes\DataProvider('provideRulesForArrayField')] + #[DataProvider('provideRulesForArrayField')] public function testRulesForArrayField(array $body, array $rules, array $results): void { $config = new App(); @@ -1368,7 +1370,7 @@ public function testTranslatedLabelTagReplacement(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521 */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideIfExistRuleWithAsterisk')] + #[DataProvider('provideIfExistRuleWithAsterisk')] public function testIfExistRuleWithAsterisk(bool $expected, array $rules, array $data): void { $actual = $this->validation->setRules($rules)->run($data); @@ -1437,7 +1439,7 @@ public static function provideIfExistRuleWithAsterisk(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510 */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideValidationOfArrayData')] + #[DataProvider('provideValidationOfArrayData')] public function testValidationOfArrayData(bool $expected, array $rules, array $data): void { $actual = $this->validation->setRules($rules)->run($data); @@ -1492,7 +1494,7 @@ public static function provideValidationOfArrayData(): iterable /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/4929 */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideSplittingOfComplexStringRules')] + #[DataProvider('provideSplittingOfComplexStringRules')] public function testSplittingOfComplexStringRules(string $input, array $expected): void { $splitter = $this->getPrivateMethodInvoker($this->validation, 'splitRules'); diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php index 145a2303327b..79d561c6a0ae 100644 --- a/tests/system/View/CellTest.php +++ b/tests/system/View/CellTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class CellTest extends CIUnitTestCase { private MockCache $cache; diff --git a/tests/system/View/ControlledCellTest.php b/tests/system/View/ControlledCellTest.php index 542fc733c812..f94aa47b7672 100644 --- a/tests/system/View/ControlledCellTest.php +++ b/tests/system/View/ControlledCellTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; use LogicException; @@ -30,7 +31,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ControlledCellTest extends CIUnitTestCase { public function testCellRendersDefaultValues(): void diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php index bf8eecfb43ab..2e3faae0dae7 100644 --- a/tests/system/View/DecoratorsTest.php +++ b/tests/system/View/DecoratorsTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; @@ -24,7 +25,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class DecoratorsTest extends CIUnitTestCase { private FileLocator $loader; diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php index 1411eacc83a6..f0270edb1c33 100644 --- a/tests/system/View/ParserFilterTest.php +++ b/tests/system/View/ParserFilterTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; @@ -21,7 +22,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ParserFilterTest extends CIUnitTestCase { private FileLocator $loader; diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php index c24b2bdb3f97..146d05cf2940 100644 --- a/tests/system/View/ParserPluginTest.php +++ b/tests/system/View/ParserPluginTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; +use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; @@ -20,7 +23,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ParserPluginTest extends CIUnitTestCase { private Parser $parser; @@ -43,9 +46,9 @@ public function testCurrentURL(): void $this->assertSame(current_url(), $this->parser->renderString($template)); } - #[\PHPUnit\Framework\Attributes\RunInSeparateProcess] - #[\PHPUnit\Framework\Attributes\PreserveGlobalState(false)] - #[\PHPUnit\Framework\Attributes\Group('SeparateProcess')] + #[RunInSeparateProcess] + #[PreserveGlobalState(false)] + #[Group('SeparateProcess')] public function testPreviousURL(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index 177377c85dd3..48a9343e5d68 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -13,6 +13,8 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Entity\Entity; use CodeIgniter\Test\CIUnitTestCase; @@ -24,7 +26,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ParserTest extends CIUnitTestCase { private FileLocator $loader; @@ -479,7 +481,7 @@ public static function provideEscHandling(): iterable * @param mixed $value * @param mixed|null $expected */ - #[\PHPUnit\Framework\Attributes\DataProvider('provideEscHandling')] + #[DataProvider('provideEscHandling')] public function testEscHandling($value, $expected = null): void { if ($expected === null) { diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php index d8582f4d0e0e..d7572760838c 100644 --- a/tests/system/View/TableTest.php +++ b/tests/system/View/TableTest.php @@ -13,6 +13,9 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\Depends; +use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\MySQLi\Result; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockTable; @@ -21,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class TableTest extends CIUnitTestCase { private Table $table; @@ -57,7 +60,7 @@ public function testSetCaption(): void $this->assertSame('awesome cap', $this->table->caption); } - #[\PHPUnit\Framework\Attributes\Depends('testPrepArgs')] + #[Depends('testPrepArgs')] public function testSetHeading(): void { // uses _prep_args internally, so we'll just do a quick @@ -147,7 +150,7 @@ public function testSetFootingWithStyle(): void ); } - #[\PHPUnit\Framework\Attributes\Depends('testPrepArgs')] + #[Depends('testPrepArgs')] public function testAddRow(): void { // uses _prep_args internally, so we'll just do a quick @@ -778,7 +781,7 @@ public function testInvalidCallback(): void $this->assertStringContainsString('        ', $generated); } - #[\PHPUnit\Framework\Attributes\DataProvider('orderedColumnUsecases')] + #[DataProvider('orderedColumnUsecases')] public function testAddRowAndGenerateOrderedColumns(array $heading, array $row, string $expectContainsString): void { $this->table->setHeading($heading); @@ -790,7 +793,7 @@ public function testAddRowAndGenerateOrderedColumns(array $heading, array $row, $this->assertStringContainsString($expectContainsString, $generated); } - #[\PHPUnit\Framework\Attributes\DataProvider('orderedColumnUsecases')] + #[DataProvider('orderedColumnUsecases')] public function testGenerateOrderedColumns(array $heading, array $row, string $expectContainsString): void { $this->table->setHeading($heading); diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index 9a51d9b2eab7..a4c5e34af5f4 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\View; +use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; @@ -23,7 +24,7 @@ /** * @internal */ -#[\PHPUnit\Framework\Attributes\Group('Others')] +#[Group('Others')] final class ViewTest extends CIUnitTestCase { private FileLocator $loader; From 07daa923b1fce2f45504e5a9c85abaef9caf211a Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 09:18:49 +0900 Subject: [PATCH 6843/8282] chore: update test-coding-standards.yml for .php-cs-fixer.tests.php --- .github/workflows/test-coding-standards.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index f2ecb8effbad..a8c34b440522 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -60,8 +60,11 @@ jobs: - name: Run lint on `app/`, `admin/`, `public/` run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff - - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files + - name: Run lint on `system/`, `utils/`, and root PHP files run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff + - name: Run lint on `tests` + run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.tests.php --using-cache=no --diff + - name: Run lint on `user_guide_src/source/` run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff From 6647a8e5fed48741fff4c87a71321017edcf2a9f Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 09:19:17 +0900 Subject: [PATCH 6844/8282] chore: update highest PHP version --- .github/workflows/test-coding-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml index a8c34b440522..7e5f18820288 100644 --- a/.github/workflows/test-coding-standards.yml +++ b/.github/workflows/test-coding-standards.yml @@ -29,7 +29,7 @@ jobs: matrix: php-version: - '8.1' - - '8.2' + - '8.3' steps: - name: Checkout From 9a7cae807d9e670b4ac506ead2dd3d09c5748c53 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 09:19:46 +0900 Subject: [PATCH 6845/8282] test: composer cs-fix --- tests/system/API/ResponseTraitTest.php | 2 +- tests/system/AutoReview/ComposerJsonTest.php | 4 ++-- tests/system/AutoReview/FrameworkCodeTest.php | 2 +- tests/system/Autoloader/AutoloaderTest.php | 6 +++--- tests/system/Autoloader/FileLocatorCachedTest.php | 2 +- tests/system/Autoloader/FileLocatorTest.php | 2 +- tests/system/CLI/CLITest.php | 4 ++-- tests/system/CLI/ConsoleTest.php | 2 +- tests/system/Cache/CacheFactoryTest.php | 2 +- tests/system/Cache/CacheMockTest.php | 2 +- tests/system/Cache/FactoriesCacheFileHandlerTest.php | 2 +- .../Cache/FactoriesCacheFileVarExportHandlerTest.php | 2 +- tests/system/Cache/Handlers/BaseHandlerTest.php | 4 ++-- tests/system/Cache/Handlers/DummyHandlerTest.php | 2 +- tests/system/Cache/Handlers/FileHandlerTest.php | 6 +++--- tests/system/Cache/Handlers/MemcachedHandlerTest.php | 2 +- tests/system/Cache/Handlers/PredisHandlerTest.php | 2 +- tests/system/Cache/Handlers/RedisHandlerTest.php | 2 +- tests/system/Cache/ResponseCacheTest.php | 4 ++-- tests/system/CodeIgniterTest.php | 8 ++++---- tests/system/Commands/BaseCommandTest.php | 2 +- tests/system/Commands/CellGeneratorTest.php | 2 +- tests/system/Commands/ClearCacheTest.php | 2 +- tests/system/Commands/ClearDebugbarTest.php | 2 +- tests/system/Commands/ClearLogsTest.php | 2 +- tests/system/Commands/CommandGeneratorTest.php | 2 +- tests/system/Commands/CommandTest.php | 4 ++-- tests/system/Commands/ConfigGeneratorTest.php | 2 +- tests/system/Commands/ConfigurableSortImportsTest.php | 2 +- tests/system/Commands/ControllerGeneratorTest.php | 2 +- tests/system/Commands/CreateDatabaseTest.php | 2 +- tests/system/Commands/Database/MigrateStatusTest.php | 2 +- .../Commands/Database/ShowTableInfoMockIOTest.php | 2 +- tests/system/Commands/Database/ShowTableInfoTest.php | 2 +- tests/system/Commands/DatabaseCommandsTest.php | 2 +- tests/system/Commands/EntityGeneratorTest.php | 2 +- tests/system/Commands/EnvironmentCommandTest.php | 2 +- tests/system/Commands/FilterCheckTest.php | 2 +- tests/system/Commands/FilterGeneratorTest.php | 2 +- tests/system/Commands/GenerateKeyTest.php | 6 +++--- tests/system/Commands/GeneratorsTest.php | 2 +- tests/system/Commands/HelpCommandTest.php | 2 +- tests/system/Commands/InfoCacheTest.php | 2 +- tests/system/Commands/MigrationGeneratorTest.php | 2 +- tests/system/Commands/MigrationIntegrationTest.php | 2 +- tests/system/Commands/ModelGeneratorTest.php | 2 +- tests/system/Commands/PublishCommandTest.php | 2 +- tests/system/Commands/RoutesTest.php | 2 +- tests/system/Commands/ScaffoldGeneratorTest.php | 2 +- tests/system/Commands/SeederGeneratorTest.php | 2 +- tests/system/Commands/TestGeneratorTest.php | 2 +- .../Commands/Translation/LocalizationFinderTest.php | 2 +- tests/system/Commands/Utilities/ConfigCheckTest.php | 2 +- tests/system/Commands/Utilities/NamespacesTest.php | 2 +- .../Utilities/Routes/AutoRouteCollectorTest.php | 2 +- .../AutoRouterImproved/AutoRouteCollectorTest.php | 2 +- .../AutoRouterImproved/ControllerMethodReaderTest.php | 2 +- .../Commands/Utilities/Routes/ControllerFinderTest.php | 2 +- .../Utilities/Routes/ControllerMethodReaderTest.php | 2 +- .../Commands/Utilities/Routes/FilterCollectorTest.php | 2 +- .../Commands/Utilities/Routes/FilterFinderTest.php | 2 +- .../Utilities/Routes/SampleURIGeneratorTest.php | 4 ++-- tests/system/Commands/ValidationGeneratorTest.php | 2 +- tests/system/CommonFunctionsSendTest.php | 4 ++-- tests/system/CommonFunctionsTest.php | 10 +++++----- tests/system/CommonHelperTest.php | 4 ++-- tests/system/CommonSingleServiceTest.php | 4 ++-- tests/system/Config/BaseConfigTest.php | 6 +++--- tests/system/Config/DotEnvTest.php | 10 +++++----- tests/system/Config/FactoriesTest.php | 4 ++-- tests/system/Config/MimesTest.php | 4 ++-- tests/system/Config/ServicesTest.php | 6 +++--- tests/system/ControllerTest.php | 4 ++-- tests/system/Cookie/CookieStoreTest.php | 2 +- tests/system/Cookie/CookieTest.php | 4 ++-- tests/system/DataConverter/DataConverterTest.php | 4 ++-- tests/system/Database/BaseConnectionTest.php | 4 ++-- tests/system/Database/BaseQueryTest.php | 4 ++-- tests/system/Database/Builder/AliasTest.php | 2 +- tests/system/Database/Builder/BaseTest.php | 2 +- tests/system/Database/Builder/CountTest.php | 2 +- tests/system/Database/Builder/DeleteTest.php | 2 +- tests/system/Database/Builder/DistinctTest.php | 2 +- tests/system/Database/Builder/EmptyTest.php | 2 +- tests/system/Database/Builder/FromTest.php | 2 +- tests/system/Database/Builder/GetTest.php | 2 +- tests/system/Database/Builder/GroupTest.php | 2 +- tests/system/Database/Builder/InsertTest.php | 2 +- tests/system/Database/Builder/JoinTest.php | 2 +- tests/system/Database/Builder/LikeTest.php | 2 +- tests/system/Database/Builder/LimitTest.php | 2 +- tests/system/Database/Builder/OrderTest.php | 2 +- tests/system/Database/Builder/PrefixTest.php | 2 +- tests/system/Database/Builder/ReplaceTest.php | 2 +- tests/system/Database/Builder/SelectTest.php | 2 +- tests/system/Database/Builder/TruncateTest.php | 2 +- tests/system/Database/Builder/UnionTest.php | 2 +- tests/system/Database/Builder/UpdateTest.php | 2 +- tests/system/Database/Builder/WhenTest.php | 2 +- tests/system/Database/Builder/WhereTest.php | 4 ++-- tests/system/Database/ConfigTest.php | 4 ++-- tests/system/Database/DatabaseSeederTest.php | 2 +- .../DatabaseTestCaseMigrationOnce1Test.php | 2 +- .../DatabaseTestCaseMigrationOnce2Test.php | 2 +- tests/system/Database/DatabaseTestCaseTest.php | 2 +- tests/system/Database/Forge/CreateTableTest.php | 2 +- tests/system/Database/Forge/DropForeignKeyTest.php | 2 +- tests/system/Database/Live/AliasTest.php | 2 +- tests/system/Database/Live/BadQueryTest.php | 2 +- tests/system/Database/Live/ConnectTest.php | 2 +- tests/system/Database/Live/CountTest.php | 2 +- .../system/Database/Live/DatabaseTestTraitCaseTest.php | 2 +- tests/system/Database/Live/DbDebugTest.php | 2 +- tests/system/Database/Live/DbUtilsTest.php | 2 +- tests/system/Database/Live/DeleteTest.php | 2 +- tests/system/Database/Live/EmptyTest.php | 2 +- tests/system/Database/Live/EscapeTest.php | 2 +- tests/system/Database/Live/FabricatorLiveTest.php | 2 +- tests/system/Database/Live/ForgeTest.php | 2 +- tests/system/Database/Live/FromTest.php | 2 +- tests/system/Database/Live/GetNumRowsTest.php | 2 +- tests/system/Database/Live/GetTest.php | 2 +- tests/system/Database/Live/GetVersionTest.php | 2 +- tests/system/Database/Live/GroupTest.php | 2 +- tests/system/Database/Live/IncrementTest.php | 2 +- tests/system/Database/Live/InsertTest.php | 2 +- tests/system/Database/Live/JoinTest.php | 2 +- tests/system/Database/Live/LikeTest.php | 2 +- tests/system/Database/Live/LimitTest.php | 2 +- tests/system/Database/Live/MetadataTest.php | 2 +- .../Database/Live/MySQLi/GetFieldDataTestCase.php | 2 +- tests/system/Database/Live/MySQLi/NumberNativeTest.php | 2 +- tests/system/Database/Live/MySQLi/RawSqlTest.php | 2 +- .../Database/Live/OCI8/CallStoredProcedureTest.php | 2 +- .../system/Database/Live/OCI8/GetFieldDataTestCase.php | 2 +- tests/system/Database/Live/OCI8/LastInsertIDTest.php | 2 +- tests/system/Database/Live/OrderTest.php | 2 +- .../Database/Live/Postgre/GetFieldDataTestCase.php | 2 +- tests/system/Database/Live/PreparedQueryTest.php | 2 +- tests/system/Database/Live/PretendTest.php | 2 +- .../Database/Live/SQLSRV/GetFieldDataTestCase.php | 2 +- tests/system/Database/Live/SQLite3/AlterTableTest.php | 4 ++-- .../Database/Live/SQLite3/ForgeModifyColumnTest.php | 2 +- .../Database/Live/SQLite3/GetFieldDataTestCase.php | 2 +- .../system/Database/Live/SQLite3/GetIndexDataTest.php | 2 +- tests/system/Database/Live/SelectTest.php | 2 +- .../Database/Live/TransactionDBDebugFalseTest.php | 1 + .../Database/Live/TransactionDBDebugTrueTest.php | 2 +- tests/system/Database/Live/TransactionTest.php | 2 +- tests/system/Database/Live/UnionTest.php | 2 +- tests/system/Database/Live/UpdateTest.php | 4 ++-- tests/system/Database/Live/UpsertTest.php | 2 +- tests/system/Database/Live/WhereTest.php | 2 +- tests/system/Database/Live/WriteTypeQueryTest.php | 2 +- .../system/Database/Migrations/MigrationRunnerTest.php | 2 +- tests/system/Database/Migrations/MigrationTest.php | 2 +- tests/system/Database/RawSqlTest.php | 2 +- tests/system/Debug/ExceptionHandlerTest.php | 2 +- tests/system/Debug/ExceptionsTest.php | 4 ++-- tests/system/Debug/TimerTest.php | 2 +- tests/system/Debug/Toolbar/Collectors/DatabaseTest.php | 2 +- tests/system/Debug/Toolbar/Collectors/HistoryTest.php | 2 +- tests/system/DebugTraceableTraitTest.php | 4 ++-- tests/system/Email/EmailTest.php | 4 ++-- tests/system/Encryption/EncryptionTest.php | 2 +- .../system/Encryption/Handlers/OpenSSLHandlerTest.php | 2 +- tests/system/Encryption/Handlers/SodiumHandlerTest.php | 2 +- tests/system/Entity/EntityTest.php | 2 +- tests/system/Events/EventsTest.php | 6 +++--- tests/system/Files/FileCollectionTest.php | 2 +- tests/system/Files/FileTest.php | 2 +- tests/system/Files/FileWithVfsTest.php | 2 +- tests/system/Filters/CSRFTest.php | 4 ++-- tests/system/Filters/CorsTest.php | 2 +- tests/system/Filters/DebugToolbarTest.php | 4 ++-- tests/system/Filters/FiltersTest.php | 6 +++--- tests/system/Filters/HoneypotTest.php | 8 ++++---- tests/system/Filters/InvalidCharsTest.php | 6 +++--- tests/system/Filters/SecureHeadersTest.php | 2 +- tests/system/Format/FormatTest.php | 2 +- tests/system/Format/JSONFormatterTest.php | 2 +- tests/system/Format/XMLFormatterTest.php | 4 ++-- tests/system/HTTP/CLIRequestTest.php | 4 ++-- tests/system/HTTP/CURLRequestShareOptionsTest.php | 2 +- tests/system/HTTP/CURLRequestTest.php | 4 ++-- tests/system/HTTP/ContentSecurityPolicyTest.php | 6 +++--- tests/system/HTTP/CorsTest.php | 2 +- tests/system/HTTP/DownloadResponseTest.php | 6 +++--- tests/system/HTTP/Files/FileCollectionTest.php | 2 +- tests/system/HTTP/Files/FileMovingTest.php | 2 +- tests/system/HTTP/HeaderTest.php | 2 +- tests/system/HTTP/IncomingRequestDetectingTest.php | 4 ++-- tests/system/HTTP/IncomingRequestTest.php | 10 +++++----- tests/system/HTTP/MessageTest.php | 4 ++-- tests/system/HTTP/NegotiateTest.php | 2 +- tests/system/HTTP/OutgoingRequestTest.php | 2 +- tests/system/HTTP/RedirectExceptionTest.php | 2 +- tests/system/HTTP/RedirectResponseTest.php | 6 +++--- tests/system/HTTP/RequestTest.php | 4 ++-- tests/system/HTTP/ResponseCookieTest.php | 2 +- tests/system/HTTP/ResponseSendTest.php | 6 +++--- tests/system/HTTP/ResponseTest.php | 4 ++-- .../system/HTTP/SiteURIFactoryDetectRoutePathTest.php | 6 +++--- tests/system/HTTP/SiteURIFactoryTest.php | 6 +++--- tests/system/HTTP/SiteURITest.php | 6 +++--- tests/system/HTTP/URITest.php | 6 +++--- tests/system/HTTP/UserAgentTest.php | 2 +- .../Helpers/Array/ArrayHelperDotKeyExistsTest.php | 2 +- .../Helpers/Array/ArrayHelperRecursiveDiffTest.php | 2 +- .../Array/ArrayHelperSortValuesByNaturalTest.php | 2 +- tests/system/Helpers/ArrayHelperTest.php | 4 ++-- tests/system/Helpers/CookieHelperTest.php | 2 +- tests/system/Helpers/DateHelperTest.php | 2 +- tests/system/Helpers/FilesystemHelperTest.php | 2 +- tests/system/Helpers/FormHelperTest.php | 6 +++--- tests/system/Helpers/HTMLHelperTest.php | 2 +- tests/system/Helpers/InflectorHelperTest.php | 4 ++-- tests/system/Helpers/NumberHelperTest.php | 2 +- tests/system/Helpers/SecurityHelperTest.php | 2 +- tests/system/Helpers/TextHelperTest.php | 2 +- tests/system/Helpers/URLHelper/CurrentUrlTest.php | 6 +++--- tests/system/Helpers/URLHelper/MiscUrlTest.php | 10 +++++----- tests/system/Helpers/URLHelper/SiteUrlCliTest.php | 6 +++--- tests/system/Helpers/URLHelper/SiteUrlTest.php | 6 +++--- tests/system/Helpers/XMLHelperTest.php | 2 +- tests/system/HomeTest.php | 2 +- tests/system/Honeypot/HoneypotTest.php | 4 ++-- tests/system/HotReloader/DirectoryHasherTest.php | 2 +- tests/system/I18n/TimeDifferenceTest.php | 2 +- tests/system/I18n/TimeLegacyTest.php | 4 ++-- tests/system/I18n/TimeTest.php | 4 ++-- tests/system/Images/BaseHandlerTest.php | 2 +- tests/system/Images/GDHandlerTest.php | 2 +- tests/system/Images/ImageMagickHandlerTest.php | 6 +++--- tests/system/Images/ImageTest.php | 2 +- tests/system/Language/LanguageTest.php | 4 ++-- tests/system/Log/Handlers/ChromeLoggerHandlerTest.php | 2 +- tests/system/Log/Handlers/ErrorlogHandlerTest.php | 2 +- tests/system/Log/Handlers/FileHandlerTest.php | 2 +- tests/system/Log/LoggerTest.php | 2 +- tests/system/Models/DataConverterModelTest.php | 2 +- tests/system/Models/DeleteModelTest.php | 4 ++-- tests/system/Models/EventsModelTest.php | 2 +- tests/system/Models/FindModelTest.php | 4 ++-- tests/system/Models/GeneralModelTest.php | 2 +- tests/system/Models/GetCompiledModelTest.php | 2 +- tests/system/Models/InsertModelTest.php | 2 +- tests/system/Models/MiscellaneousModelTest.php | 2 +- tests/system/Models/SaveModelTest.php | 2 +- tests/system/Models/TimestampModelTest.php | 2 +- tests/system/Models/UpdateModelTest.php | 4 ++-- tests/system/Models/ValidationModelRuleGroupTest.php | 2 +- tests/system/Models/ValidationModelTest.php | 2 +- tests/system/Pager/PagerRendererTest.php | 2 +- tests/system/Pager/PagerTest.php | 4 ++-- tests/system/Publisher/ContentReplacerTest.php | 2 +- tests/system/Publisher/PublisherContentReplaceTest.php | 2 +- tests/system/Publisher/PublisherInputTest.php | 2 +- tests/system/Publisher/PublisherOutputTest.php | 2 +- tests/system/Publisher/PublisherRestrictionsTest.php | 4 ++-- tests/system/Publisher/PublisherSupportTest.php | 2 +- tests/system/RESTful/ResourceControllerTest.php | 6 +++--- tests/system/RESTful/ResourcePresenterTest.php | 6 +++--- tests/system/Router/AutoRouterImprovedTest.php | 4 ++-- tests/system/Router/DefinedRouteCollectorTest.php | 2 +- .../system/Router/RouteCollectionReverseRouteTest.php | 4 ++-- tests/system/Router/RouteCollectionTest.php | 4 ++-- tests/system/Router/RouterTest.php | 4 ++-- tests/system/Security/CheckPhpIniTest.php | 2 +- .../Security/SecurityCSRFCookieRandomizeTokenTest.php | 2 +- .../Security/SecurityCSRFSessionRandomizeTokenTest.php | 6 +++--- tests/system/Security/SecurityCSRFSessionTest.php | 6 +++--- tests/system/Security/SecurityTest.php | 4 ++-- .../Session/Handlers/Database/MySQLiHandlerTest.php | 2 +- .../Session/Handlers/Database/PostgreHandlerTest.php | 2 +- .../Session/Handlers/Database/RedisHandlerTest.php | 6 +++--- tests/system/Session/SessionTest.php | 6 +++--- tests/system/SparkTest.php | 2 +- tests/system/SuperglobalsTest.php | 2 +- tests/system/Test/BootstrapFCPATHTest.php | 1 + tests/system/Test/ControllerTestTraitTest.php | 6 +++--- tests/system/Test/DOMParserTest.php | 3 ++- tests/system/Test/FabricatorTest.php | 2 +- .../system/Test/FeatureTestAutoRoutingImprovedTest.php | 2 +- tests/system/Test/FeatureTestTraitTest.php | 4 ++-- tests/system/Test/FilterTestTraitTest.php | 2 +- tests/system/Test/TestCaseEmissionsTest.php | 6 +++--- tests/system/Test/TestCaseTest.php | 2 +- tests/system/Test/TestLoggerTest.php | 4 ++-- tests/system/Test/TestResponseTest.php | 4 ++-- tests/system/Throttle/ThrottleTest.php | 4 ++-- tests/system/Typography/TypographyTest.php | 2 +- tests/system/Validation/CreditCardRulesTest.php | 4 ++-- tests/system/Validation/DatabaseRelatedRulesTest.php | 2 +- tests/system/Validation/DotArrayFilterTest.php | 2 +- tests/system/Validation/FileRulesTest.php | 2 +- tests/system/Validation/FormatRulesTest.php | 4 ++-- tests/system/Validation/RulesTest.php | 4 ++-- .../Validation/StrictRules/CreditCardRulesTest.php | 4 ++-- .../StrictRules/DatabaseRelatedRulesTest.php | 2 +- tests/system/Validation/StrictRules/FileRulesTest.php | 2 +- .../system/Validation/StrictRules/FormatRulesTest.php | 2 +- tests/system/Validation/StrictRules/RulesTest.php | 4 ++-- tests/system/Validation/StrictRules/ValidationTest.php | 2 +- tests/system/Validation/ValidationTest.php | 4 ++-- tests/system/View/CellTest.php | 2 +- tests/system/View/ControlledCellTest.php | 2 +- tests/system/View/DecoratorsTest.php | 2 +- tests/system/View/ParserFilterTest.php | 2 +- tests/system/View/ParserPluginTest.php | 6 +++--- tests/system/View/ParserTest.php | 4 ++-- tests/system/View/TableTest.php | 6 +++--- tests/system/View/ViewTest.php | 2 +- 313 files changed, 457 insertions(+), 454 deletions(-) diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php index fc2c4dea2467..0887c673d616 100644 --- a/tests/system/API/ResponseTraitTest.php +++ b/tests/system/API/ResponseTraitTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\API; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Format\FormatterInterface; use CodeIgniter\Format\JSONFormatter; @@ -25,6 +24,7 @@ use CodeIgniter\Test\Mock\MockResponse; use Config\App; use Config\Cookie; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 89f4dcdeec29..995ef99f4f2b 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\AutoReview; -use PHPUnit\Framework\Attributes\CoversNothing; -use PHPUnit\Framework\Attributes\Group; use InvalidArgumentException; use JsonException; +use PHPUnit\Framework\Attributes\CoversNothing; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; /** diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php index fcbd5851dbc1..b8b155bbbf28 100644 --- a/tests/system/AutoReview/FrameworkCodeTest.php +++ b/tests/system/AutoReview/FrameworkCodeTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\AutoReview; -use PHPUnit\Framework\Attributes\DataProvider; use FilesystemIterator; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use RecursiveDirectoryIterator; diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 74d3a4cace3b..647b041d5f78 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Autoloader; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use App\Controllers\Home; use Closure; use CodeIgniter\Exceptions\ConfigException; @@ -25,6 +22,9 @@ use Config\Modules; use Config\Services; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use RuntimeException; use UnnamespacedClass; diff --git a/tests/system/Autoloader/FileLocatorCachedTest.php b/tests/system/Autoloader/FileLocatorCachedTest.php index 68bb9245dfdd..0aac85a8c59c 100644 --- a/tests/system/Autoloader/FileLocatorCachedTest.php +++ b/tests/system/Autoloader/FileLocatorCachedTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Autoloader; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\FactoriesCache\FileVarExportHandler; use Config\Autoload; use Config\Modules; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php index 8c185bbae6ea..e3a20286acc6 100644 --- a/tests/system/Autoloader/FileLocatorTest.php +++ b/tests/system/Autoloader/FileLocatorTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Autoloader; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Header; use CodeIgniter\Test\CIUnitTestCase; use Config\Autoload; use Config\Modules; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 063f4dace051..fc62e5888e53 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\CLI; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\PhpStreamWrapper; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use ReflectionProperty; use RuntimeException; diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php index 116e480f5563..cabe2152b684 100644 --- a/tests/system/CLI/ConsoleTest.php +++ b/tests/system/CLI/ConsoleTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\CLI; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\DotEnv; use CodeIgniter\Events\Events; @@ -21,6 +20,7 @@ use CodeIgniter\Test\Mock\MockCLIConfig; use CodeIgniter\Test\Mock\MockCodeIgniter; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php index 2a2150509001..0947f31d5045 100644 --- a/tests/system/Cache/CacheFactoryTest.php +++ b/tests/system/Cache/CacheFactoryTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Cache; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\Exceptions\CacheException; use CodeIgniter\Cache\Handlers\DummyHandler; use CodeIgniter\Test\CIUnitTestCase; use Config\Cache; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php index 6a1361d1b972..c867bebc4249 100644 --- a/tests/system/Cache/CacheMockTest.php +++ b/tests/system/Cache/CacheMockTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Cache; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\Handlers\BaseHandler; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/FactoriesCacheFileHandlerTest.php b/tests/system/Cache/FactoriesCacheFileHandlerTest.php index 769bfd2cb2db..892eb7260638 100644 --- a/tests/system/Cache/FactoriesCacheFileHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileHandlerTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Cache; -use PHPUnit\Framework\Attributes\Group; use Config\Cache as CacheConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php index 690674ccf810..8bf5c79d9209 100644 --- a/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php +++ b/tests/system/Cache/FactoriesCacheFileVarExportHandlerTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Cache; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\FactoriesCache\FileVarExportHandler; use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php index 55b51abcc7cd..06d3c4a98f8e 100644 --- a/tests/system/Cache/Handlers/BaseHandlerTest.php +++ b/tests/system/Cache/Handlers/BaseHandlerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Cache\RestrictiveHandler; diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php index 09782e3a699b..1b6fa3aa773a 100644 --- a/tests/system/Cache/Handlers/DummyHandlerTest.php +++ b/tests/system/Cache/Handlers/DummyHandlerTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php index 4cd0f638893c..9a7213374dd2 100644 --- a/tests/system/Cache/Handlers/FileHandlerTest.php +++ b/tests/system/Cache/Handlers/FileHandlerTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RequiresOperatingSystem; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cache\Exceptions\CacheException; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresOperatingSystem; /** * @internal diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index 16990f5c87e3..4aad8288401c 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; use Exception; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php index 341ea6dcc62d..6d88d6e3f609 100644 --- a/tests/system/Cache/Handlers/PredisHandlerTest.php +++ b/tests/system/Cache/Handlers/PredisHandlerTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php index 67ba3c5ebde0..e5880f8ae0c2 100644 --- a/tests/system/Cache/Handlers/RedisHandlerTest.php +++ b/tests/system/Cache/Handlers/RedisHandlerTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Cache\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\I18n\Time; use Config\Cache; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index 8ba6d85c8d62..b0b73855231a 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Cache; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; @@ -26,6 +24,8 @@ use Config\Cache as CacheConfig; use ErrorException; use Exception; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index 33368fb5cb73..b3908b462777 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -13,10 +13,6 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use App\Controllers\Home; use CodeIgniter\Config\Services; use CodeIgniter\Debug\Timer; @@ -34,6 +30,10 @@ use Config\Filters as FiltersConfig; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Tests\Support\Filters\Customfilter; use Tests\Support\Filters\RedirectFilter; diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php index b9a05d51eae5..9e9a2d3408a0 100644 --- a/tests/system/Commands/BaseCommandTest.php +++ b/tests/system/Commands/BaseCommandTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Log\Logger; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Commands\AppInfo; /** diff --git a/tests/system/Commands/CellGeneratorTest.php b/tests/system/Commands/CellGeneratorTest.php index a8f4bdb460b9..31ec6dc3921e 100644 --- a/tests/system/Commands/CellGeneratorTest.php +++ b/tests/system/Commands/CellGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php index 7221edc43b63..e27978e40919 100644 --- a/tests/system/Commands/ClearCacheTest.php +++ b/tests/system/Commands/ClearCacheTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php index 51635e5f0307..b3c2de18c394 100644 --- a/tests/system/Commands/ClearDebugbarTest.php +++ b/tests/system/Commands/ClearDebugbarTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php index 4a559300ed95..28019d5d51f6 100644 --- a/tests/system/Commands/ClearLogsTest.php +++ b/tests/system/Commands/ClearLogsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php index a8d9d93de14b..d485d6e4f063 100644 --- a/tests/system/Commands/CommandGeneratorTest.php +++ b/tests/system/Commands/CommandGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php index a687474cb87e..aa8c4959ac75 100644 --- a/tests/system/Commands/CommandTest.php +++ b/tests/system/Commands/CommandTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\CLI\Commands; use CodeIgniter\Log\Logger; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Commands\ParamsReveal; /** diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php index 45068084da30..ab4914914719 100644 --- a/tests/system/Commands/ConfigGeneratorTest.php +++ b/tests/system/Commands/ConfigGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php index bd0df985dd76..4f54390d7ffe 100644 --- a/tests/system/Commands/ConfigurableSortImportsTest.php +++ b/tests/system/Commands/ConfigurableSortImportsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php index d41c34535b55..dc8293bb3997 100644 --- a/tests/system/Commands/ControllerGeneratorTest.php +++ b/tests/system/Commands/ControllerGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php index e6bdfc2f3b51..6bf93f4a2eb3 100644 --- a/tests/system/Commands/CreateDatabaseTest.php +++ b/tests/system/Commands/CreateDatabaseTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\Database as DatabaseFactory; use CodeIgniter\Database\OCI8\Connection as OCI8Connection; @@ -21,6 +20,7 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Database/MigrateStatusTest.php b/tests/system/Commands/Database/MigrateStatusTest.php index 9e4324cf725c..5e54b380fdee 100644 --- a/tests/system/Commands/Database/MigrateStatusTest.php +++ b/tests/system/Commands/Database/MigrateStatusTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php index ac9a20f84d75..0842c28ae12a 100644 --- a/tests/system/Commands/Database/ShowTableInfoMockIOTest.php +++ b/tests/system/Commands/Database/ShowTableInfoMockIOTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Test\Mock\MockInputOutput; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php index da845f7a1710..a707f519a858 100644 --- a/tests/system/Commands/Database/ShowTableInfoTest.php +++ b/tests/system/Commands/Database/ShowTableInfoTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Commands\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Test\StreamFilterTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php index 4e90d52e7dfd..1ccdea9251ee 100644 --- a/tests/system/Commands/DatabaseCommandsTest.php +++ b/tests/system/Commands/DatabaseCommandsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php index e694cd74819e..1e764add9cec 100644 --- a/tests/system/Commands/EntityGeneratorTest.php +++ b/tests/system/Commands/EntityGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php index eff814707356..177becf34f9f 100644 --- a/tests/system/Commands/EnvironmentCommandTest.php +++ b/tests/system/Commands/EnvironmentCommandTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/FilterCheckTest.php b/tests/system/Commands/FilterCheckTest.php index b63e4b774cdc..0c26dd9bf349 100644 --- a/tests/system/Commands/FilterCheckTest.php +++ b/tests/system/Commands/FilterCheckTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php index 8a00ed717e0b..b336387d3ab4 100644 --- a/tests/system/Commands/FilterGeneratorTest.php +++ b/tests/system/Commands/FilterGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php index d6d36cfbfaa7..85bd0f9078c2 100644 --- a/tests/system/Commands/GenerateKeyTest.php +++ b/tests/system/Commands/GenerateKeyTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Filters\CITestStreamFilter; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php index 99d7ceb51281..f72ceabc710c 100644 --- a/tests/system/Commands/GeneratorsTest.php +++ b/tests/system/Commands/GeneratorsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php index a05b5ebca0fa..7ce07d8129fb 100644 --- a/tests/system/Commands/HelpCommandTest.php +++ b/tests/system/Commands/HelpCommandTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php index c157bd9e8a4a..1c3ad93db5f0 100644 --- a/tests/system/Commands/InfoCacheTest.php +++ b/tests/system/Commands/InfoCacheTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cache\CacheFactory; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php index d6cb31dbc28f..0f999d638789 100644 --- a/tests/system/Commands/MigrationGeneratorTest.php +++ b/tests/system/Commands/MigrationGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php index 90f7c1b01166..14b66ccb920a 100644 --- a/tests/system/Commands/MigrationIntegrationTest.php +++ b/tests/system/Commands/MigrationIntegrationTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php index 3108be0c1971..65596958606c 100644 --- a/tests/system/Commands/ModelGeneratorTest.php +++ b/tests/system/Commands/ModelGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php index 4494f8418be0..0cd2605aaa1e 100644 --- a/tests/system/Commands/PublishCommandTest.php +++ b/tests/system/Commands/PublishCommandTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Publishers\TestPublisher; /** diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php index 2d25b178bec4..4c0ffd174550 100644 --- a/tests/system/Commands/RoutesTest.php +++ b/tests/system/Commands/RoutesTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Router\RouteCollection; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php index 7e9f7ce91184..aca2bf2a2469 100644 --- a/tests/system/Commands/ScaffoldGeneratorTest.php +++ b/tests/system/Commands/ScaffoldGeneratorTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\Autoload; use Config\Modules; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php index a0f678e67715..b8f504489c5b 100644 --- a/tests/system/Commands/SeederGeneratorTest.php +++ b/tests/system/Commands/SeederGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/TestGeneratorTest.php b/tests/system/Commands/TestGeneratorTest.php index 5641a9a62c53..b449afd76f05 100644 --- a/tests/system/Commands/TestGeneratorTest.php +++ b/tests/system/Commands/TestGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Translation/LocalizationFinderTest.php b/tests/system/Commands/Translation/LocalizationFinderTest.php index 88224ceb4f33..85bb59c7c09b 100644 --- a/tests/system/Commands/Translation/LocalizationFinderTest.php +++ b/tests/system/Commands/Translation/LocalizationFinderTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Commands\Translation; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\App; use Config\Services; use Locale; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/ConfigCheckTest.php b/tests/system/Commands/Utilities/ConfigCheckTest.php index 4bc2bf4dce3d..535cb0dd0489 100644 --- a/tests/system/Commands/Utilities/ConfigCheckTest.php +++ b/tests/system/Commands/Utilities/ConfigCheckTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands\Utilities; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use Config\App; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/NamespacesTest.php b/tests/system/Commands/Utilities/NamespacesTest.php index efb95c58d3ac..c32d9280aef4 100644 --- a/tests/system/Commands/Utilities/NamespacesTest.php +++ b/tests/system/Commands/Utilities/NamespacesTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands\Utilities; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php index 77381e83617f..ef8e43282b92 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php index 78636caeaee0..a669385568dd 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; use Config\Filters; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php index 44c2a69e8662..936b2b8fe184 100644 --- a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Dash_folder\Dash_controller; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\Home; use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\Controllers\SubDir\BlogController; use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; use Config\Routing; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Controllers\Newautorouting; use Tests\Support\Controllers\Remap; diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php index acfe87d82bc9..1f6ecce2ec3e 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Controllers\Hello; /** diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php index 2a44d79756fe..04563a481d7b 100644 --- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php +++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Controllers\Popcorn; use Tests\Support\Controllers\Remap; diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php index 07d7f0dc76e8..e3b86fcf9a56 100644 --- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php index 387da092b697..d96571c6b2f2 100644 --- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php +++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Filters\CSRF; use CodeIgniter\Filters\DebugToolbar; @@ -30,6 +29,7 @@ use Config\Filters as FiltersConfig; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php index eef413ebe73a..d5f3d4a542c8 100644 --- a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php +++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Commands\Utilities\Routes; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php index 6fdaddd55b28..0bcbcdec12e7 100644 --- a/tests/system/Commands/ValidationGeneratorTest.php +++ b/tests/system/Commands/ValidationGeneratorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Commands; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php index f389efb2366a..8af14200ea7f 100644 --- a/tests/system/CommonFunctionsSendTest.php +++ b/tests/system/CommonFunctionsSendTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter; +use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; use PHPUnit\Framework\Attributes\PreserveGlobalState; -use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 308d45d5dec2..226f9f79c776 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -13,11 +13,6 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\BaseService; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\CLIRequest; @@ -46,6 +41,11 @@ use Config\Session as SessionConfig; use Exception; use Kint; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use RuntimeException; use stdClass; use Tests\Support\Models\JobModel; diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php index 29b60dc472a3..819b5c582d4c 100644 --- a/tests/system/CommonHelperTest.php +++ b/tests/system/CommonHelperTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\CoversFunction; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\CoversFunction; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; use RuntimeException; use Tests\Support\Autoloader\FatalLocator; diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php index 59c07c7f4ff1..a8b4c6dabc32 100644 --- a/tests/system/CommonSingleServiceTest.php +++ b/tests/system/CommonSingleServiceTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockSecurity; use Config\Security as SecurityConfig; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use ReflectionClass; use ReflectionMethod; diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 89ecfdabff8c..68776b671fda 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Config; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Encryption; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use PHPUnit\Framework\MockObject\MockObject; use RegistrarConfig; use RuntimeException; diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php index 218940a46e01..8ffc4c5dafbc 100644 --- a/tests/system/Config/DotEnvTest.php +++ b/tests/system/Config/DotEnvTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Config; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use TypeError; /** diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index 73c7c0363947..11a5e77a433e 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Config; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\Depends; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Database; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Depends; +use PHPUnit\Framework\Attributes\Group; use ReflectionClass; use stdClass; use Tests\Support\Config\TestRegistrar; diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php index 25b3f9a50011..bcf5923f5b9d 100644 --- a/tests/system/Config/MimesTest.php +++ b/tests/system/Config/MimesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Config; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Mimes; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index c6735c4e2158..17b97dd2e259 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Config; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Autoloader\Autoloader; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Database\MigrationRunner; @@ -49,6 +46,9 @@ use Config\App; use Config\Exceptions; use Config\Security as SecurityConfig; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use RuntimeException; use Tests\Support\Config\Services; diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php index 9271d046d590..7cbe664aabc0 100644 --- a/tests/system/ControllerTest.php +++ b/tests/system/ControllerTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; @@ -27,6 +25,8 @@ use Config\App; use Config\Services; use Config\Validation as ValidationConfig; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; use Psr\Log\LoggerInterface; /** diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php index 5ad93e82ac4c..7e752fde5da5 100644 --- a/tests/system/Cookie/CookieStoreTest.php +++ b/tests/system/Cookie/CookieStoreTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Cookie; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Test\CIUnitTestCase; use DateTimeImmutable; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index d8af2eb184a7..51016ca0061e 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Cookie; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Test\CIUnitTestCase; use Config\Cookie as CookieConfig; use DateTimeImmutable; use DateTimeZone; use LogicException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/DataConverter/DataConverterTest.php b/tests/system/DataConverter/DataConverterTest.php index 109b8b92c66c..6592f4d801c6 100644 --- a/tests/system/DataConverter/DataConverterTest.php +++ b/tests/system/DataConverter/DataConverterTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\DataConverter; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use Closure; use CodeIgniter\HTTP\URI; use CodeIgniter\I18n\Time; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Entity\CustomUser; use Tests\Support\Entity\User; diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php index 0dda2d3a4ef5..b36ec7ea022a 100644 --- a/tests/system/Database/BaseConnectionTest.php +++ b/tests/system/Database/BaseConnectionTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Throwable; /** diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php index d6ec78243abe..a87bc64e727a 100644 --- a/tests/system/Database/BaseQueryTest.php +++ b/tests/system/Database/BaseQueryTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php index bd6ddb3a12a7..9528ba6aabb2 100644 --- a/tests/system/Database/Builder/AliasTest.php +++ b/tests/system/Database/Builder/AliasTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php index 2305ca765674..49f74da2762d 100644 --- a/tests/system/Database/Builder/BaseTest.php +++ b/tests/system/Database/Builder/BaseTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php index acfc9569310e..8d129efb5c31 100644 --- a/tests/system/Database/Builder/CountTest.php +++ b/tests/system/Database/Builder/CountTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php index 36387ec3d3e3..53b66eed805b 100644 --- a/tests/system/Database/Builder/DeleteTest.php +++ b/tests/system/Database/Builder/DeleteTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php index fb089d77ae57..5a5712db2c0e 100644 --- a/tests/system/Database/Builder/DistinctTest.php +++ b/tests/system/Database/Builder/DistinctTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php index 76aa16aadf29..959bfbc81c56 100644 --- a/tests/system/Database/Builder/EmptyTest.php +++ b/tests/system/Database/Builder/EmptyTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php index bfe1af812ec9..99bacd97fe18 100644 --- a/tests/system/Database/Builder/FromTest.php +++ b/tests/system/Database/Builder/FromTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php index e7ceb5030d0c..2447511c89ca 100644 --- a/tests/system/Database/Builder/GetTest.php +++ b/tests/system/Database/Builder/GetTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; use Config\Feature; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php index 82cc3e96649b..d03937ca6b3f 100644 --- a/tests/system/Database/Builder/GroupTest.php +++ b/tests/system/Database/Builder/GroupTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index ed0120ba5543..e021472b72fc 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Query; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php index 1d94ebe49ffd..377df4816e57 100644 --- a/tests/system/Database/Builder/JoinTest.php +++ b/tests/system/Database/Builder/JoinTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Postgre\Builder as PostgreBuilder; use CodeIgniter\Database\RawSql; use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php index b6fc8e16327d..d2a534b5bf27 100644 --- a/tests/system/Database/Builder/LikeTest.php +++ b/tests/system/Database/Builder/LikeTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php index e05fcab2ff12..4e7bbfd40203 100644 --- a/tests/system/Database/Builder/LimitTest.php +++ b/tests/system/Database/Builder/LimitTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php index 20bcbc9ea6ce..b1b2a684d9df 100644 --- a/tests/system/Database/Builder/OrderTest.php +++ b/tests/system/Database/Builder/OrderTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php index 586b1c38dc53..03b8cd99e4d3 100644 --- a/tests/system/Database/Builder/PrefixTest.php +++ b/tests/system/Database/Builder/PrefixTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php index e75c90f63fdd..c0aa754ac9e5 100644 --- a/tests/system/Database/Builder/ReplaceTest.php +++ b/tests/system/Database/Builder/ReplaceTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php index f072b79e2055..cd3f39029f6b 100644 --- a/tests/system/Database/Builder/SelectTest.php +++ b/tests/system/Database/Builder/SelectTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Database\RawSql; use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php index 71251e98e2b5..1b9d4199ade0 100644 --- a/tests/system/Database/Builder/TruncateTest.php +++ b/tests/system/Database/Builder/TruncateTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/UnionTest.php b/tests/system/Database/Builder/UnionTest.php index ed1be13c8f1b..bd498e2e2cab 100644 --- a/tests/system/Database/Builder/UnionTest.php +++ b/tests/system/Database/Builder/UnionTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\SQLSRV\Connection as SQLSRVConnection; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php index 32bce616e140..b13739dfbd58 100644 --- a/tests/system/Database/Builder/UpdateTest.php +++ b/tests/system/Database/Builder/UpdateTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; use CodeIgniter\Test\Mock\MockQuery; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/WhenTest.php b/tests/system/Database/Builder/WhenTest.php index be38c73406bc..a7fede7879d3 100644 --- a/tests/system/Database/Builder/WhenTest.php +++ b/tests/system/Database/Builder/WhenTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php index d7133013ff07..57980f28ee8c 100644 --- a/tests/system/Database/Builder/WhereTest.php +++ b/tests/system/Database/Builder/WhereTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Database\Builder; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; @@ -22,6 +20,8 @@ use DateTime; use Error; use ErrorException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php index e380a19be0a2..882301692352 100644 --- a/tests/system/Database/ConfigTest.php +++ b/tests/system/Database/ConfigTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php index c481ebfd1c8b..398052636246 100644 --- a/tests/system/Database/DatabaseSeederTest.php +++ b/tests/system/Database/DatabaseSeederTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Database; use Faker\Generator; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php index eb47fa4bcb56..8a0980f853a9 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\DatabaseTestCase; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * DatabaseTestCaseMigrationOnce1Test and DatabaseTestCaseMigrationOnce2Test diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php index 1703bdd8c01f..5c4013e055e1 100644 --- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php +++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\DatabaseTestCase; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * DatabaseTestCaseMigrationOnce1Test and DatabaseTestCaseMigrationOnce2Test diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php index 5fbcf517b407..c6a03022df72 100644 --- a/tests/system/Database/DatabaseTestCaseTest.php +++ b/tests/system/Database/DatabaseTestCaseTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\AnotherSeeder; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php index b7919f1fdd74..115c5506d379 100644 --- a/tests/system/Database/Forge/CreateTableTest.php +++ b/tests/system/Database/Forge/CreateTableTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Forge; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Forge/DropForeignKeyTest.php b/tests/system/Database/Forge/DropForeignKeyTest.php index 09fc35b96ec6..8c2b37e10b2b 100644 --- a/tests/system/Database/Forge/DropForeignKeyTest.php +++ b/tests/system/Database/Forge/DropForeignKeyTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Forge; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php index d0b02d7d6815..ccd83ee361b8 100644 --- a/tests/system/Database/Live/AliasTest.php +++ b/tests/system/Database/Live/AliasTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php index 7e7be58ffef3..8b842b21b930 100644 --- a/tests/system/Database/Live/BadQueryTest.php +++ b/tests/system/Database/Live/BadQueryTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php index ee74f8f7f86e..3f7941a201ec 100644 --- a/tests/system/Database/Live/ConnectTest.php +++ b/tests/system/Database/Live/ConnectTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Database\SQLite3\Connection; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php index e9ca2bc5372c..c5aa64d4c700 100644 --- a/tests/system/Database/Live/CountTest.php +++ b/tests/system/Database/Live/CountTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php index bb7996fd9f6c..dc43976de9f1 100644 --- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php +++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/DbDebugTest.php b/tests/system/Database/Live/DbDebugTest.php index 86698123ff05..8155e9e42db2 100644 --- a/tests/system/Database/Live/DbDebugTest.php +++ b/tests/system/Database/Live/DbDebugTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php index ec6c1f5c4b8a..b7fd56923334 100644 --- a/tests/system/Database/Live/DbUtilsTest.php +++ b/tests/system/Database/Live/DbUtilsTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Database; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php index f3c7c4b2b737..421f5c0f430f 100644 --- a/tests/system/Database/Live/DeleteTest.php +++ b/tests/system/Database/Live/DeleteTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php index 97224a247f59..42f21af10f39 100644 --- a/tests/system/Database/Live/EmptyTest.php +++ b/tests/system/Database/Live/EmptyTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php index afbc3e3b85da..adc5d414e34e 100644 --- a/tests/system/Database/Live/EscapeTest.php +++ b/tests/system/Database/Live/EscapeTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\I18n\Time; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php index 103358366240..a865d2fef4c8 100644 --- a/tests/system/Database/Live/FabricatorLiveTest.php +++ b/tests/system/Database/Live/FabricatorLiveTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Test\Fabricator; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserModel; use Tests\Support\Models\ValidModel; diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 0652b7c3cfe2..7fccd6b1d298 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; use LogicException; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; use stdClass; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php index d6f9ee673e79..8e26ef0cad78 100644 --- a/tests/system/Database/Live/FromTest.php +++ b/tests/system/Database/Live/FromTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php index 90ad2d8537ed..c7575462d598 100644 --- a/tests/system/Database/Live/GetNumRowsTest.php +++ b/tests/system/Database/Live/GetNumRowsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php index 29dd82028f60..681af7344183 100644 --- a/tests/system/Database/Live/GetTest.php +++ b/tests/system/Database/Live/GetTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Feature; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/GetVersionTest.php b/tests/system/Database/Live/GetVersionTest.php index de4bd119241e..73da7c07071d 100644 --- a/tests/system/Database/Live/GetVersionTest.php +++ b/tests/system/Database/Live/GetVersionTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php index 7319f1f353cb..7dee9b1e5a67 100644 --- a/tests/system/Database/Live/GroupTest.php +++ b/tests/system/Database/Live/GroupTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php index 645344cf85c2..0051e1a9039d 100644 --- a/tests/system/Database/Live/IncrementTest.php +++ b/tests/system/Database/Live/IncrementTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php index 6b0bef010679..217632551b29 100644 --- a/tests/system/Database/Live/InsertTest.php +++ b/tests/system/Database/Live/InsertTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php index f739685c74e6..77324cea6403 100644 --- a/tests/system/Database/Live/JoinTest.php +++ b/tests/system/Database/Live/JoinTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php index 8d06e180739f..5884f9d01220 100644 --- a/tests/system/Database/Live/LikeTest.php +++ b/tests/system/Database/Live/LikeTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php index 135dd7a6bf74..a35bf1d8056c 100644 --- a/tests/system/Database/Live/LimitTest.php +++ b/tests/system/Database/Live/LimitTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php index 738ee094e6ce..56e5d70a60e8 100644 --- a/tests/system/Database/Live/MetadataTest.php +++ b/tests/system/Database/Live/MetadataTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php index a50fddd557da..98403c46e8a8 100644 --- a/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/MySQLi/GetFieldDataTestCase.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live\MySQLi; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/MySQLi/NumberNativeTest.php b/tests/system/Database/Live/MySQLi/NumberNativeTest.php index 048c615bce15..4469e4c3659a 100644 --- a/tests/system/Database/Live/MySQLi/NumberNativeTest.php +++ b/tests/system/Database/Live/MySQLi/NumberNativeTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live\MySQLi; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/MySQLi/RawSqlTest.php b/tests/system/Database/Live/MySQLi/RawSqlTest.php index dd4cfac57d20..e136d526e2de 100644 --- a/tests/system/Database/Live/MySQLi/RawSqlTest.php +++ b/tests/system/Database/Live/MySQLi/RawSqlTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live\MySQLi; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use stdclass; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php index 78a866a610d4..2baffb669957 100644 --- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php +++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live\OCI8; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php index 89c6f9d157b4..a45c893dc3f9 100644 --- a/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/OCI8/GetFieldDataTestCase.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live\OCI8; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; use LogicException; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php index 4a5ed73ee0a3..5cc88e39510b 100644 --- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php +++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live\OCI8; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php index 31bdddcff28c..1451222b5ceb 100644 --- a/tests/system/Database/Live/OrderTest.php +++ b/tests/system/Database/Live/OrderTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php index 1ed01ddd292e..42e823397926 100644 --- a/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/Postgre/GetFieldDataTestCase.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live\Postgre; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php index e1315cc16d3c..fd3b6cedb403 100644 --- a/tests/system/Database/Live/PreparedQueryTest.php +++ b/tests/system/Database/Live/PreparedQueryTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; @@ -21,6 +20,7 @@ use CodeIgniter\Database\ResultInterface; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php index 9b44880b3341..b3e6506c1be6 100644 --- a/tests/system/Database/Live/PretendTest.php +++ b/tests/system/Database/Live/PretendTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php index 561b1cae2e48..bf00175c4fab 100644 --- a/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLSRV/GetFieldDataTestCase.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live\SQLSRV; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/SQLite3/AlterTableTest.php b/tests/system/Database/Live/SQLite3/AlterTableTest.php index 9440a3721cc9..46806b9618fb 100644 --- a/tests/system/Database/Live/SQLite3/AlterTableTest.php +++ b/tests/system/Database/Live/SQLite3/AlterTableTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Database\Live\SQLite3; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RequiresPhpExtension; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Database\SQLite3\Forge; use CodeIgniter\Database\SQLite3\Table; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; /** * @internal diff --git a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php index d04e8fa8e77f..c628b01aea21 100644 --- a/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php +++ b/tests/system/Database/Live/SQLite3/ForgeModifyColumnTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live\SQLite3; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Forge; use CodeIgniter\Test\CIUnitTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php index fc5d7959b143..9fb6d881f019 100644 --- a/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php +++ b/tests/system/Database/Live/SQLite3/GetFieldDataTestCase.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live\SQLite3; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Live\AbstractGetFieldDataTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php index 3881b4331638..5ef439644417 100644 --- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php +++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live\SQLite3; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\SQLite3\Connection; use CodeIgniter\Database\SQLite3\Forge; use CodeIgniter\Test\CIUnitTestCase; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php index 5d8e3402e716..8fbd416da8ee 100644 --- a/tests/system/Database/Live/SelectTest.php +++ b/tests/system/Database/Live/SelectTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/TransactionDBDebugFalseTest.php b/tests/system/Database/Live/TransactionDBDebugFalseTest.php index e4dd8d344420..8be00575abed 100644 --- a/tests/system/Database/Live/TransactionDBDebugFalseTest.php +++ b/tests/system/Database/Live/TransactionDBDebugFalseTest.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Database\Live; use PHPUnit\Framework\Attributes\Group; + /** * @internal */ diff --git a/tests/system/Database/Live/TransactionDBDebugTrueTest.php b/tests/system/Database/Live/TransactionDBDebugTrueTest.php index 5d9178a35509..da77edb9b975 100644 --- a/tests/system/Database/Live/TransactionDBDebugTrueTest.php +++ b/tests/system/Database/Live/TransactionDBDebugTrueTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/TransactionTest.php b/tests/system/Database/Live/TransactionTest.php index a69de8246d84..3414d2dfffdf 100644 --- a/tests/system/Database/Live/TransactionTest.php +++ b/tests/system/Database/Live/TransactionTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/UnionTest.php b/tests/system/Database/Live/UnionTest.php index 3f8643d0fe71..c3ddee84c5b1 100644 --- a/tests/system/Database/Live/UnionTest.php +++ b/tests/system/Database/Live/UnionTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php index ed03b37ad554..8af549fc638e 100644 --- a/tests/system/Database/Live/UpdateTest.php +++ b/tests/system/Database/Live/UpdateTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php index e1248c3d98f4..94732e694d50 100644 --- a/tests/system/Database/Live/UpsertTest.php +++ b/tests/system/Database/Live/UpsertTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; use CodeIgniter\Database\RawSql; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use stdclass; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php index 3c0d8d654db9..8513144356cf 100644 --- a/tests/system/Database/Live/WhereTest.php +++ b/tests/system/Database/Live/WhereTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php index 356db13567e6..faaa7bfabddb 100644 --- a/tests/system/Database/Live/WriteTypeQueryTest.php +++ b/tests/system/Database/Live/WriteTypeQueryTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Live; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Database\Seeds\CITestSeeder; /** diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php index a9c28d29d914..547eec670ce4 100644 --- a/tests/system/Database/Migrations/MigrationRunnerTest.php +++ b/tests/system/Database/Migrations/MigrationRunnerTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Database\Migrations; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\MigrationRunner; use CodeIgniter\Events\Events; @@ -25,6 +24,7 @@ use Config\Services; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration; use Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration; diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php index 6873541a4225..7e4049a113ce 100644 --- a/tests/system/Database/Migrations/MigrationTest.php +++ b/tests/system/Database/Migrations/MigrationTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Database\Migrations; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Migration; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php index 795533158768..340e85c0ffba 100644 --- a/tests/system/Database/RawSqlTest.php +++ b/tests/system/Database/RawSqlTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Database; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php index 6c2843a6d369..85eaed74621b 100644 --- a/tests/system/Debug/ExceptionHandlerTest.php +++ b/tests/system/Debug/ExceptionHandlerTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Debug; -use PHPUnit\Framework\Attributes\Group; use App\Controllers\Home; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Test\CIUnitTestCase; @@ -21,6 +20,7 @@ use CodeIgniter\Test\StreamFilterTrait; use Config\Exceptions as ExceptionsConfig; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; /** diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index 3548301facc6..aa3c2d8b49a6 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -11,8 +11,6 @@ namespace CodeIgniter\Debug; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RequiresPhp; use App\Controllers\Home; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Entity\Exceptions\CastException; @@ -22,6 +20,8 @@ use CodeIgniter\Test\ReflectionHelper; use Config\Exceptions as ExceptionsConfig; use ErrorException; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhp; use RuntimeException; /** diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index f3067c21dcc5..eb3cb243b398 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Debug; -use PHPUnit\Framework\Attributes\Group; use ArgumentCountError; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; /** diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php index abeacfbce43e..9c091ee4e530 100644 --- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php +++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Query; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; /** diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php index 6c7c6f9a8fbb..3a5411a96a0f 100644 --- a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php +++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Debug\Toolbar\Collectors; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\StreamFilterTrait; use DateTime; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php index 60499cedb57e..bd41fda23e33 100644 --- a/tests/system/DebugTraceableTraitTest.php +++ b/tests/system/DebugTraceableTraitTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\CoversClass; use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\CoversClass; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php index e5350e44e4ac..99918122d8cf 100644 --- a/tests/system/Email/EmailTest.php +++ b/tests/system/Email/EmailTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Email; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Events\Events; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockEmail; use ErrorException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php index 7481dadd4224..de372e232411 100644 --- a/tests/system/Encryption/EncryptionTest.php +++ b/tests/system/Encryption/EncryptionTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Encryption; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; use Config\Encryption as EncryptionConfig; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php index 7b99339d4dab..f82e9151cd3c 100644 --- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php +++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Encryption\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Encryption; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; use Config\Encryption as EncryptionConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php index d4255e2deba0..bf30036eb2a4 100644 --- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php +++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Encryption\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Encryption\Encryption; use CodeIgniter\Encryption\Exceptions\EncryptionException; use CodeIgniter\Test\CIUnitTestCase; use Config\Encryption as EncryptionConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php index 17ef6a0ef95f..10947277926a 100644 --- a/tests/system/Entity/EntityTest.php +++ b/tests/system/Entity/EntityTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Entity; -use PHPUnit\Framework\Attributes\Group; use Closure; use CodeIgniter\Entity\Exceptions\CastException; use CodeIgniter\HTTP\URI; @@ -22,6 +21,7 @@ use CodeIgniter\Test\ReflectionHelper; use DateTime; use DateTimeInterface; +use PHPUnit\Framework\Attributes\Group; use ReflectionException; use Tests\Support\Entity\Cast\CastBase64; use Tests\Support\Entity\Cast\CastPassParameters; diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index a3210ae61cf6..8ea4fc54f4ce 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Events; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockEvents; use Config\Modules; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php index 4aa071c9756f..51e8b10e9955 100644 --- a/tests/system/Files/FileCollectionTest.php +++ b/tests/system/Files/FileCollectionTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Files; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Files\Exceptions\FileException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php index 392c4463f361..800a1ac278f1 100644 --- a/tests/system/Files/FileTest.php +++ b/tests/system/Files/FileTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Files; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use ZipArchive; /** diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php index 9ef3e585102b..9a1075ad9a1c 100644 --- a/tests/system/Files/FileWithVfsTest.php +++ b/tests/system/Files/FileWithVfsTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Files; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php index 8a2eb2995463..c0d85b02150d 100644 --- a/tests/system/Filters/CSRFTest.php +++ b/tests/system/Filters/CSRFTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Filters/CorsTest.php b/tests/system/Filters/CorsTest.php index 86a69e091728..78023ddfdadc 100644 --- a/tests/system/Filters/CorsTest.php +++ b/tests/system/Filters/CorsTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; @@ -24,6 +23,7 @@ use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockAppConfig; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * This test case is based on: diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php index 674fd3f3c123..6cb716ee9556 100644 --- a/tests/system/Filters/DebugToolbarTest.php +++ b/tests/system/Filters/DebugToolbarTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; use Config\Filters as FilterConfig; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php index e08e94a62f77..3a35920989e5 100644 --- a/tests/system/Filters/FiltersTest.php +++ b/tests/system/Filters/FiltersTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Filters\Exceptions\FilterException; @@ -34,6 +31,9 @@ use CodeIgniter\Test\ConfigFromArrayTrait; use CodeIgniter\Test\Mock\MockAppConfig; use Config\Filters as FiltersConfig; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; require_once __DIR__ . '/fixtures/GoogleMe.php'; require_once __DIR__ . '/fixtures/GoogleYou.php'; diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php index f5c5db756c10..ee7b37a8df73 100644 --- a/tests/system/Filters/HoneypotTest.php +++ b/tests/system/Filters/HoneypotTest.php @@ -13,10 +13,6 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Config\Services; use CodeIgniter\Honeypot\Exceptions\HoneypotException; use CodeIgniter\HTTP\CLIRequest; @@ -24,6 +20,10 @@ use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; use Config\Honeypot; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php index ad63d6225131..ea2ee644b135 100644 --- a/tests/system/Filters/InvalidCharsTest.php +++ b/tests/system/Filters/InvalidCharsTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -23,6 +20,9 @@ use CodeIgniter\Security\Exceptions\SecurityException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockAppConfig; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php index e8c0a40a7a8f..48ff8bb7d04f 100644 --- a/tests/system/Filters/SecureHeadersTest.php +++ b/tests/system/Filters/SecureHeadersTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Filters; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php index fc8977267810..89fab7512368 100644 --- a/tests/system/Format/FormatTest.php +++ b/tests/system/Format/FormatTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Format; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Format\Exceptions\FormatException; use CodeIgniter\HTTP\URI; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php index 4e203bd5c7c8..a479be9e8f63 100644 --- a/tests/system/Format/JSONFormatterTest.php +++ b/tests/system/Format/JSONFormatterTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Format; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; /** diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php index 2e1cb84d221f..0615a1eafd91 100644 --- a/tests/system/Format/XMLFormatterTest.php +++ b/tests/system/Format/XMLFormatterTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Format; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use DOMDocument; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php index c401ec1816f6..854d8430528b 100644 --- a/tests/system/HTTP/CLIRequestTest.php +++ b/tests/system/HTTP/CLIRequestTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * This should be the same as RequestTest, diff --git a/tests/system/HTTP/CURLRequestShareOptionsTest.php b/tests/system/HTTP/CURLRequestShareOptionsTest.php index 0f584d3c9e10..38612ad03e05 100644 --- a/tests/system/HTTP/CURLRequestShareOptionsTest.php +++ b/tests/system/HTTP/CURLRequestShareOptionsTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Test\Mock\MockCURLRequest; use Config\App; use Config\CURLRequest as ConfigCURLRequest; +use PHPUnit\Framework\Attributes\Group; /** * This test case is for the case where shareOptions is true. diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php index 575cb273080f..dc48eb621d80 100644 --- a/tests/system/HTTP/CURLRequestTest.php +++ b/tests/system/HTTP/CURLRequestTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\BackupGlobals; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Exceptions\HTTPException; @@ -23,6 +21,8 @@ use Config\App; use Config\CURLRequest as ConfigCURLRequest; use CURLFile; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 50f8a707d22a..50d93e8c0412 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\TestResponse; use Config\App; use Config\ContentSecurityPolicy as CSPConfig; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * Test the CSP policy directive creation. diff --git a/tests/system/HTTP/CorsTest.php b/tests/system/HTTP/CorsTest.php index 88b63a96cb11..9f2a7280bee4 100644 --- a/tests/system/HTTP/CorsTest.php +++ b/tests/system/HTTP/CorsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index 5116c47eb6da..20d9d1f39784 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Exceptions\DownloadException; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use DateTime; use DateTimeZone; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php index 6861a81dc343..a0d7bb1de771 100644 --- a/tests/system/HTTP/Files/FileCollectionTest.php +++ b/tests/system/HTTP/Files/FileCollectionTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HTTP\Files; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Mimes; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php index b33c5867cf50..c07116970b5a 100644 --- a/tests/system/HTTP/Files/FileMovingTest.php +++ b/tests/system/HTTP/Files/FileMovingTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\HTTP\Files; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php index 52b29fe44cb1..6ca5180ff838 100644 --- a/tests/system/HTTP/HeaderTest.php +++ b/tests/system/HTTP/HeaderTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Error; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php index ad6e3295f941..fa53060b6a83 100644 --- a/tests/system/HTTP/IncomingRequestDetectingTest.php +++ b/tests/system/HTTP/IncomingRequestDetectingTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index 7ac764b18d88..eb15b2c37c91 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -13,11 +13,6 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; @@ -26,6 +21,11 @@ use Config\App; use InvalidArgumentException; use JsonException; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use TypeError; /** diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index 304478338294..d16224367a6f 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php index 90cdf81ac378..18d546c0a9c6 100644 --- a/tests/system/HTTP/NegotiateTest.php +++ b/tests/system/HTTP/NegotiateTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/OutgoingRequestTest.php b/tests/system/HTTP/OutgoingRequestTest.php index c1645f9c1a71..37b22a6cf8c6 100644 --- a/tests/system/HTTP/OutgoingRequestTest.php +++ b/tests/system/HTTP/OutgoingRequestTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index cb0ae7024de8..e77c0ea060d3 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Logger; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use Config\Services; use LogicException; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use Tests\Support\Log\Handlers\TestHandler; diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index 2c96c2651f70..b1dc20121903 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Router\RouteCollection; @@ -26,6 +23,9 @@ use Config\Modules; use Config\Routing; use Config\Services; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php index 0dc74a5d12a0..e2073268d794 100644 --- a/tests/system/HTTP/RequestTest.php +++ b/tests/system/HTTP/RequestTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php index 5831540169d9..9782287fd70a 100644 --- a/tests/system/HTTP/ResponseCookieTest.php +++ b/tests/system/HTTP/ResponseCookieTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; @@ -21,6 +20,7 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Cookie as CookieConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php index 1d6e94de8985..cd78155bb656 100644 --- a/tests/system/HTTP/ResponseSendTest.php +++ b/tests/system/HTTP/ResponseSendTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Security\Exceptions\SecurityException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Services; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * This test suite has been created separately from diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php index d80db9c45083..bb939741dda1 100644 --- a/tests/system/HTTP/ResponseTest.php +++ b/tests/system/HTTP/ResponseTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; @@ -23,6 +21,8 @@ use Config\Services; use DateTime; use DateTimeZone; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php index bde5fe629e51..d14a6e5e4151 100644 --- a/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php +++ b/tests/system/HTTP/SiteURIFactoryDetectRoutePathTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/SiteURIFactoryTest.php b/tests/system/HTTP/SiteURIFactoryTest.php index 9b2acf06d51e..62e20639b5e0 100644 --- a/tests/system/HTTP/SiteURIFactoryTest.php +++ b/tests/system/HTTP/SiteURIFactoryTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index b529b215abf7..644aaa795b6d 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use BadMethodCallException; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php index 1ada5869ecb5..8a953ee3cab1 100644 --- a/tests/system/HTTP/URITest.php +++ b/tests/system/HTTP/URITest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php index a72ff9129f5e..9799a79c2851 100644 --- a/tests/system/HTTP/UserAgentTest.php +++ b/tests/system/HTTP/UserAgentTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\HTTP; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php index ead5b25643f2..ea7b379d0b44 100644 --- a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php +++ b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Helpers\Array; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php index dfd2ac994f98..2bb1c594def1 100644 --- a/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php +++ b/tests/system/Helpers/Array/ArrayHelperRecursiveDiffTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers\Array; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php index 5ed25d142be8..4529b4da6918 100644 --- a/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php +++ b/tests/system/Helpers/Array/ArrayHelperSortValuesByNaturalTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers\Array; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php index dc6289b6aa2e..a7ed8ae8ec8a 100644 --- a/tests/system/Helpers/ArrayHelperTest.php +++ b/tests/system/Helpers/ArrayHelperTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use ValueError; /** diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php index a872fb1ffe05..619a21717f86 100755 --- a/tests/system/Helpers/CookieHelperTest.php +++ b/tests/system/Helpers/CookieHelperTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\HTTP\IncomingRequest; @@ -26,6 +25,7 @@ use Config\Cookie; use Config\Cookie as CookieConfig; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php index cfbbbc5da25b..173a979e29e3 100644 --- a/tests/system/Helpers/DateHelperTest.php +++ b/tests/system/Helpers/DateHelperTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; use CodeIgniter\Test\CIUnitTestCase; use DateTimeZone; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index f0caa2264b01..403cfb14da50 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\visitor\vfsStreamStructureVisitor; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index 9c3a22d57527..a74582b67ebf 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -13,15 +13,15 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\HTTP\SiteURI; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\DocTypes; use Config\Filters; use Config\Services; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php index ecf576734790..b7159253706e 100755 --- a/tests/system/Helpers/HTMLHelperTest.php +++ b/tests/system/Helpers/HTMLHelperTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\DocTypes; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php index bb5cb8da21c8..f0df11977126 100755 --- a/tests/system/Helpers/InflectorHelperTest.php +++ b/tests/system/Helpers/InflectorHelperTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php index 68c133ea1d8f..9b3afa61992f 100755 --- a/tests/system/Helpers/NumberHelperTest.php +++ b/tests/system/Helpers/NumberHelperTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php index 59c85b9077ed..ba0c01849458 100644 --- a/tests/system/Helpers/SecurityHelperTest.php +++ b/tests/system/Helpers/SecurityHelperTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockSecurity; use Config\Security as SecurityConfig; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Config\Services; /** diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php index 382c68b3aafd..e3acd7bb9c50 100755 --- a/tests/system/Helpers/TextHelperTest.php +++ b/tests/system/Helpers/TextHelperTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php index abe001aa60af..1c7de84586e2 100644 --- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php +++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Helpers\URLHelper; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -25,6 +22,9 @@ use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * Test cases for all URL Helper functions diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index def34b04cd93..87c6a3940208 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -13,11 +13,6 @@ namespace CodeIgniter\Helpers\URLHelper; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -28,6 +23,11 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\App; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php index c688ba6fbcb4..2ae86cb883eb 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlCliTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlCliTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Helpers\URLHelper; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * Since base_url() only slightly modifies diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php index d07a9e50200f..cd9d1da66cde 100644 --- a/tests/system/Helpers/URLHelper/SiteUrlTest.php +++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Helpers\URLHelper; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -24,6 +21,9 @@ use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * Since base_url() only slightly modifies diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php index 681314127ea9..f0a52d104d64 100644 --- a/tests/system/Helpers/XMLHelperTest.php +++ b/tests/system/Helpers/XMLHelperTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php index 161535aa1d22..67efb3961b58 100644 --- a/tests/system/HomeTest.php +++ b/tests/system/HomeTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\FeatureTestTrait; use CodeIgniter\Test\TestResponse; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php index d97794cb160e..ee048a1a785c 100644 --- a/tests/system/Honeypot/HoneypotTest.php +++ b/tests/system/Honeypot/HoneypotTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Honeypot; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Filters\Filters; @@ -25,6 +23,8 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Honeypot as HoneypotConfig; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/HotReloader/DirectoryHasherTest.php b/tests/system/HotReloader/DirectoryHasherTest.php index f8dcecedf0e5..3ef02c1217a4 100644 --- a/tests/system/HotReloader/DirectoryHasherTest.php +++ b/tests/system/HotReloader/DirectoryHasherTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HotReloader; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php index 0a1e244c19e9..4342d53f92ee 100644 --- a/tests/system/I18n/TimeDifferenceTest.php +++ b/tests/system/I18n/TimeDifferenceTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\I18n; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Locale; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/I18n/TimeLegacyTest.php b/tests/system/I18n/TimeLegacyTest.php index 2f85b7d9122b..771890699ece 100644 --- a/tests/system/I18n/TimeLegacyTest.php +++ b/tests/system/I18n/TimeLegacyTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\I18n; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\I18n\Exceptions\I18nException; use CodeIgniter\Test\CIUnitTestCase; @@ -23,6 +21,8 @@ use DateTimeZone; use IntlDateFormatter; use Locale; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php index 606e3cd0d6e8..34516948ef65 100644 --- a/tests/system/I18n/TimeTest.php +++ b/tests/system/I18n/TimeTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\I18n; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\I18n\Exceptions\I18nException; use CodeIgniter\Test\CIUnitTestCase; @@ -23,6 +21,8 @@ use DateTimeZone; use IntlDateFormatter; use Locale; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php index cf02b4fb492c..7332eba9031f 100644 --- a/tests/system/Images/BaseHandlerTest.php +++ b/tests/system/Images/BaseHandlerTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Images; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\Images\Exceptions\ImageException; @@ -21,6 +20,7 @@ use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * Test the common image processing functionality. diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php index bab99482fe8f..db8297ae212f 100644 --- a/tests/system/Images/GDHandlerTest.php +++ b/tests/system/Images/GDHandlerTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Images; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Images\Handlers\BaseHandler; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * Unit testing for the GD image handler. diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php index 4e67fce70a4a..8ca59fd8dbbc 100644 --- a/tests/system/Images/ImageMagickHandlerTest.php +++ b/tests/system/Images/ImageMagickHandlerTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Images; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RequiresPhpExtension; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Images\Handlers\BaseHandler; @@ -23,6 +20,9 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Images; use Imagick; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; /** * Unit testing for the ImageMagick image handler. diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php index e1d782ea1a88..c4411dd7dedb 100644 --- a/tests/system/Images/ImageTest.php +++ b/tests/system/Images/ImageTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Images; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php index 69363c8fecae..2651413060c8 100644 --- a/tests/system/Language/LanguageTest.php +++ b/tests/system/Language/LanguageTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Language; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLanguage; use Config\Services; use MessageFormatter; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Language\SecondMockLanguage; /** diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php index dfb34b5c840f..3dc0b1ccee80 100644 --- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php +++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Log\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use CodeIgniter\Test\Mock\MockResponse; use Config\App; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php index 728ef653d2c1..609cea39af7d 100644 --- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php +++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Log\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Log\Exceptions\LogException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; /** diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php index eb7af4d53dbb..7cf11c1f3cf9 100644 --- a/tests/system/Log/Handlers/FileHandlerTest.php +++ b/tests/system/Log/Handlers/FileHandlerTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Log\Handlers; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockFileLogger; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Log\Handlers\TestHandler; /** diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index e909fccbad69..9464d4d286fd 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Log; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\FrameworkException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Exceptions\LogException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use Exception; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Log\Handlers\TestHandler; use TypeError; diff --git a/tests/system/Models/DataConverterModelTest.php b/tests/system/Models/DataConverterModelTest.php index 67df1ea3b356..cd50df0d8b00 100644 --- a/tests/system/Models/DataConverterModelTest.php +++ b/tests/system/Models/DataConverterModelTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Entity\CustomUser; use Tests\Support\Entity\User; use Tests\Support\Models\UserCastsTimestampModel; diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php index 1cc0b3245f2b..bb78ec46f00a 100644 --- a/tests/system/Models/DeleteModelTest.php +++ b/tests/system/Models/DeleteModelTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Exceptions\ModelException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\JobModel; use Tests\Support\Models\StringifyPkeyModel; use Tests\Support\Models\UserModel; diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php index d3a00ee0111c..d697437d3534 100644 --- a/tests/system/Models/EventsModelTest.php +++ b/tests/system/Models/EventsModelTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\EventModel; /** diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php index 362619855a59..b15857d4aaaf 100644 --- a/tests/system/Models/FindModelTest.php +++ b/tests/system/Models/FindModelTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Exceptions\ModelException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Entity\UserWithCasts; use Tests\Support\Models\JobModel; use Tests\Support\Models\SecondaryModel; diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php index f85f5d795813..d0e50768457a 100644 --- a/tests/system/Models/GeneralModelTest.php +++ b/tests/system/Models/GeneralModelTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use BadMethodCallException; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Model; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\JobModel; use Tests\Support\Models\UserModel; diff --git a/tests/system/Models/GetCompiledModelTest.php b/tests/system/Models/GetCompiledModelTest.php index 288c7b189fd4..77663bd49700 100644 --- a/tests/system/Models/GetCompiledModelTest.php +++ b/tests/system/Models/GetCompiledModelTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Exceptions\ModelException; use CodeIgniter\Model; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\UserObjModel; /** diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php index 6afd2260df7f..d4a680d7696b 100644 --- a/tests/system/Models/InsertModelTest.php +++ b/tests/system/Models/InsertModelTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; use CodeIgniter\I18n\Time; use CodeIgniter\Model; use Config\Database; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Entity\User; use Tests\Support\Models\JobModel; diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php index c05896406054..f595973ca13e 100644 --- a/tests/system/Models/MiscellaneousModelTest.php +++ b/tests/system/Models/MiscellaneousModelTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\I18n\Time; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\EntityModel; use Tests\Support\Models\JobModel; use Tests\Support\Models\SimpleEntity; diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php index 8af9677196c8..29f2959878e4 100644 --- a/tests/system/Models/SaveModelTest.php +++ b/tests/system/Models/SaveModelTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; use CodeIgniter\I18n\Time; use CodeIgniter\Model; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Models\EntityModel; use Tests\Support\Models\JobModel; diff --git a/tests/system/Models/TimestampModelTest.php b/tests/system/Models/TimestampModelTest.php index 36ea733cd643..8736691b2d4a 100644 --- a/tests/system/Models/TimestampModelTest.php +++ b/tests/system/Models/TimestampModelTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\I18n\Time; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Entity\User; use Tests\Support\Models\UserTimestampModel; diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php index c2f90705f998..c7c8b9ad51d4 100644 --- a/tests/system/Models/UpdateModelTest.php +++ b/tests/system/Models/UpdateModelTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; use Config\Database; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Entity\User; use Tests\Support\Entity\UUID; diff --git a/tests/system/Models/ValidationModelRuleGroupTest.php b/tests/system/Models/ValidationModelRuleGroupTest.php index 48bf900caa2a..4274d5d1578f 100644 --- a/tests/system/Models/ValidationModelRuleGroupTest.php +++ b/tests/system/Models/ValidationModelRuleGroupTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Model; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Config\Validation; use Tests\Support\Models\JobModel; diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php index 0abce78b7f51..d2c9c7d0dab8 100644 --- a/tests/system/Models/ValidationModelTest.php +++ b/tests/system/Models/ValidationModelTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Models; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Model; use Config\Validation; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Models\JobModel; use Tests\Support\Models\SimpleEntity; diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php index c0dd61b05186..8ac8683a4327 100644 --- a/tests/system/Pager/PagerRendererTest.php +++ b/tests/system/Pager/PagerRendererTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Pager; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\URI; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php index d3bec487a475..047637a2025f 100644 --- a/tests/system/Pager/PagerTest.php +++ b/tests/system/Pager/PagerTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Pager; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -25,6 +23,8 @@ use Config\App; use Config\Pager as PagerConfig; use Config\Services; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Publisher/ContentReplacerTest.php b/tests/system/Publisher/ContentReplacerTest.php index 6e667215da48..b5d0c1b4604d 100644 --- a/tests/system/Publisher/ContentReplacerTest.php +++ b/tests/system/Publisher/ContentReplacerTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Publisher/PublisherContentReplaceTest.php b/tests/system/Publisher/PublisherContentReplaceTest.php index 7c873602b1a5..3b612a93baee 100644 --- a/tests/system/Publisher/PublisherContentReplaceTest.php +++ b/tests/system/Publisher/PublisherContentReplaceTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php index 481ecb5403a2..c2eeb14d13a9 100644 --- a/tests/system/Publisher/PublisherInputTest.php +++ b/tests/system/Publisher/PublisherInputTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php index b79144006592..1d8c2858d8fb 100644 --- a/tests/system/Publisher/PublisherOutputTest.php +++ b/tests/system/Publisher/PublisherOutputTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use org\bovigo\vfs\vfsStream; use org\bovigo\vfs\vfsStreamDirectory; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php index 0f67e5e0056c..eaa326ee82eb 100644 --- a/tests/system/Publisher/PublisherRestrictionsTest.php +++ b/tests/system/Publisher/PublisherRestrictionsTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Publisher\Exceptions\PublisherException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * Publisher Restrictions Test diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php index 079e14a30692..5854e1c516d9 100644 --- a/tests/system/Publisher/PublisherSupportTest.php +++ b/tests/system/Publisher/PublisherSupportTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Publisher; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Publisher\Exceptions\PublisherException; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Publishers\TestPublisher; /** diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php index 717884a83250..dcf59b1c3c19 100644 --- a/tests/system/RESTful/ResourceControllerTest.php +++ b/tests/system/RESTful/ResourceControllerTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\RESTful; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\Services; use CodeIgniter\Format\JSONFormatter; @@ -30,6 +27,9 @@ use CodeIgniter\Test\Mock\MockCodeIgniter; use CodeIgniter\Test\Mock\MockResourceController; use Config\App; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Psr\Log\NullLogger; use Tests\Support\Models\UserModel; use Tests\Support\RESTful\Worker; diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php index 389f54ef38f6..42772edd09a7 100644 --- a/tests/system/RESTful/ResourcePresenterTest.php +++ b/tests/system/RESTful/ResourcePresenterTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\RESTful; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CodeIgniter; use CodeIgniter\Config\Services; use CodeIgniter\Model; @@ -24,6 +21,9 @@ use CodeIgniter\Test\Mock\MockCodeIgniter; use CodeIgniter\Test\Mock\MockResourcePresenter; use Config\App; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Tests\Support\Models\EntityModel; use Tests\Support\Models\UserModel; use Tests\Support\RESTful\Worker2; diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php index 9b438d821809..c60c978e4a3c 100644 --- a/tests/system/Router/AutoRouterImprovedTest.php +++ b/tests/system/Router/AutoRouterImprovedTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Router; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\PageNotFoundException; @@ -27,6 +25,8 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Router/DefinedRouteCollectorTest.php b/tests/system/Router/DefinedRouteCollectorTest.php index 351b02437696..ca10a2fd7b51 100644 --- a/tests/system/Router/DefinedRouteCollectorTest.php +++ b/tests/system/Router/DefinedRouteCollectorTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Router; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Method; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Router/RouteCollectionReverseRouteTest.php b/tests/system/Router/RouteCollectionReverseRouteTest.php index 34be8aea84d0..ebe344293f46 100644 --- a/tests/system/Router/RouteCollectionReverseRouteTest.php +++ b/tests/system/Router/RouteCollectionReverseRouteTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\Router; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\Method; use CodeIgniter\Router\Exceptions\RouterException; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php index 420ac9f607ea..89959cd5f33e 100644 --- a/tests/system/Router/RouteCollectionTest.php +++ b/tests/system/Router/RouteCollectionTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Router; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use App\Controllers\Product; use CodeIgniter\Config\Services; use CodeIgniter\controller; @@ -23,6 +21,8 @@ use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Controllers\Hello; /** diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php index a2fc16dbd1d5..bb5302e721dc 100644 --- a/tests/system/Router/RouterTest.php +++ b/tests/system/Router/RouterTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Router; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Exceptions\PageNotFoundException; @@ -27,6 +25,8 @@ use Config\App; use Config\Modules; use Config\Routing; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Filters\Customfilter; /** diff --git a/tests/system/Security/CheckPhpIniTest.php b/tests/system/Security/CheckPhpIniTest.php index 38d5ced76a3f..8636337f2893 100644 --- a/tests/system/Security/CheckPhpIniTest.php +++ b/tests/system/Security/CheckPhpIniTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Security; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockInputOutput; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php index 796b8f5ec22c..459de0a47fa7 100644 --- a/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFCookieRandomizeTokenTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Security; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Cookie; use CodeIgniter\HTTP\IncomingRequest; @@ -23,6 +22,7 @@ use CodeIgniter\Test\Mock\MockAppConfig; use CodeIgniter\Test\Mock\MockSecurity; use Config\Security as SecurityConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index bce3d3735063..d49973488b8e 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Security; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -35,6 +32,9 @@ use Config\Logger as LoggerConfig; use Config\Security as SecurityConfig; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use PHPUnit\Framework\Attributes\WithoutErrorHandler; /** diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index ee553b6db73a..501967c0c28e 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Security; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\HTTP\IncomingRequest; @@ -34,6 +31,9 @@ use Config\Logger as LoggerConfig; use Config\Security as SecurityConfig; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; /** * @internal diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php index bce6c47824d0..0ccc092e7e29 100644 --- a/tests/system/Security/SecurityTest.php +++ b/tests/system/Security/SecurityTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Security; -use PHPUnit\Framework\Attributes\BackupGlobals; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Request; @@ -26,6 +24,8 @@ use CodeIgniter\Test\Mock\MockSecurity; use Config\Security as SecurityConfig; use Config\Services; +use PHPUnit\Framework\Attributes\BackupGlobals; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php index 165bab9088f8..0b364c7f6559 100644 --- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php +++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Session\Handlers\Database; -use PHPUnit\Framework\Attributes\Group; use Config\Database as DatabaseConfig; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php index 69f052b5a59c..21fb96b96244 100644 --- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php +++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Session\Handlers\Database; -use PHPUnit\Framework\Attributes\Group; use Config\Database as DatabaseConfig; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Session/Handlers/Database/RedisHandlerTest.php b/tests/system/Session/Handlers/Database/RedisHandlerTest.php index eba8152ee587..f7e3a5558a13 100644 --- a/tests/system/Session/Handlers/Database/RedisHandlerTest.php +++ b/tests/system/Session/Handlers/Database/RedisHandlerTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Session\Handlers\Database; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RequiresPhpExtension; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Session\Handlers\RedisHandler; use CodeIgniter\Test\CIUnitTestCase; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; /** * @internal diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php index 40afe2dc789d..39479d03f21d 100644 --- a/tests/system/Session/SessionTest.php +++ b/tests/system/Session/SessionTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Session; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Session\Handlers\FileHandler; @@ -25,6 +22,9 @@ use Config\Cookie as CookieConfig; use Config\Logger as LoggerConfig; use Config\Session as SessionConfig; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; /** * @internal diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php index ab70dc4e3aff..19f5b9934db9 100644 --- a/tests/system/SparkTest.php +++ b/tests/system/SparkTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/SuperglobalsTest.php b/tests/system/SuperglobalsTest.php index 272f502a8ada..904e3e913d21 100644 --- a/tests/system/SuperglobalsTest.php +++ b/tests/system/SuperglobalsTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php index a48c20a89515..61d2e1ca1695 100644 --- a/tests/system/Test/BootstrapFCPATHTest.php +++ b/tests/system/Test/BootstrapFCPATHTest.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Test; use PHPUnit\Framework\Attributes\Group; + /** * Class BootstrapFCPATHTest * diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index 600359cc8112..8230dd9d6248 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -13,9 +13,6 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; -use PHPUnit\Framework\Attributes\PreserveGlobalState; -use PHPUnit\Framework\Attributes\Group; use App\Controllers\Home; use App\Controllers\NeverHeardOfIt; use CodeIgniter\Controller; @@ -24,6 +21,9 @@ use Config\App; use Config\Services; use Exception; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; use Tests\Support\Controllers\Newautorouting; use Tests\Support\Controllers\Popcorn; diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php index 0477fc0561fb..31d9b65342a4 100644 --- a/tests/system/Test/DOMParserTest.php +++ b/tests/system/Test/DOMParserTest.php @@ -13,8 +13,9 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; + /** * @internal */ diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php index 39243804a47c..46e7f7d95cfe 100644 --- a/tests/system/Test/FabricatorTest.php +++ b/tests/system/Test/FabricatorTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Config\Factories; use CodeIgniter\Model; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Models\EntityModel; use Tests\Support\Models\EventModel; use Tests\Support\Models\FabricatorModel; diff --git a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php index 1ad1be055569..3b8703f08ea8 100644 --- a/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php +++ b/tests/system/Test/FeatureTestAutoRoutingImprovedTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Events\Events; use Config\Feature; use Config\Services; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php index e7c658eda821..4fd921d6e9a6 100644 --- a/tests/system/Test/FeatureTestTraitTest.php +++ b/tests/system/Test/FeatureTestTraitTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Config\Factories; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\PageNotFoundException; @@ -24,6 +22,8 @@ use Config\App; use Config\Routing; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php index 7b8f123b9109..233e5c13cd22 100644 --- a/tests/system/Test/FilterTestTraitTest.php +++ b/tests/system/Test/FilterTestTraitTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\RequestInterface; use Config\Services; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Filters\Customfilter; /** diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php index 40559aeef3fb..83f695d8302e 100644 --- a/tests/system/Test/TestCaseEmissionsTest.php +++ b/tests/system/Test/TestCaseEmissionsTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\HTTP\Response; use Config\App; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * This test suite has been created separately from diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php index c64867f9da03..6905d825533a 100644 --- a/tests/system/Test/TestCaseTest.php +++ b/tests/system/Test/TestCaseTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\CLI\CLI; use CodeIgniter\Events\Events; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Test\TestForReflectionHelper; /** diff --git a/tests/system/Test/TestLoggerTest.php b/tests/system/Test/TestLoggerTest.php index d4b95bbfe02b..4c9f38df0dad 100644 --- a/tests/system/Test/TestLoggerTest.php +++ b/tests/system/Test/TestLoggerTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use Config\Logger; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php index 2145d174cd5a..7fedf05bab65 100644 --- a/tests/system/Test/TestResponseTest.php +++ b/tests/system/Test/TestResponseTest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\Test; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\Response; use Config\App; use Config\Services; use PHPUnit\Framework\AssertionFailedError; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php index 0d0b5d219dea..655cc21dfcfa 100644 --- a/tests/system/Throttle/ThrottleTest.php +++ b/tests/system/Throttle/ThrottleTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Throttle; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Cache\CacheInterface; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php index 399f1d96dd9a..aa46e639e180 100644 --- a/tests/system/Typography/TypographyTest.php +++ b/tests/system/Typography/TypographyTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Typography; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php index 9b587374eaf9..9e6b58cdc192 100644 --- a/tests/system/Validation/CreditCardRulesTest.php +++ b/tests/system/Validation/CreditCardRulesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php index d9656b02d777..d683320e968b 100644 --- a/tests/system/Validation/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/DatabaseRelatedRulesTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\StrictRules\DatabaseRelatedRulesTest as StrictDatabaseRelatedRulesTest; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/DotArrayFilterTest.php b/tests/system/Validation/DotArrayFilterTest.php index 6db223279f6e..e83b4fe9e566 100644 --- a/tests/system/Validation/DotArrayFilterTest.php +++ b/tests/system/Validation/DotArrayFilterTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php index 7bd681a3b074..6d59af537a06 100644 --- a/tests/system/Validation/FileRulesTest.php +++ b/tests/system/Validation/FileRulesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php index 827d74f2e09a..a952e25f8e7b 100644 --- a/tests/system/Validation/FormatRulesTest.php +++ b/tests/system/Validation/FormatRulesTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use Generator; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php index 3737bf7216d1..25b3510323bb 100644 --- a/tests/system/Validation/RulesTest.php +++ b/tests/system/Validation/RulesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Validation\TestRules; diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php index 867eefdf8aba..4705cdcb9c90 100644 --- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php +++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php index 556c40bf656c..1535d265f729 100644 --- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php @@ -13,7 +13,6 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Validation\Validation; @@ -21,6 +20,7 @@ use Config\Services; use InvalidArgumentException; use LogicException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php index f09e1416817f..07dfc44ad8ce 100644 --- a/tests/system/Validation/StrictRules/FileRulesTest.php +++ b/tests/system/Validation/StrictRules/FileRulesTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php index 1da8403017ea..998f8f324a16 100644 --- a/tests/system/Validation/StrictRules/FormatRulesTest.php +++ b/tests/system/Validation/StrictRules/FormatRulesTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\FormatRulesTest as TraditionalFormatRulesTest; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php index 0145459265ca..e211ed38e888 100644 --- a/tests/system/Validation/StrictRules/RulesTest.php +++ b/tests/system/Validation/StrictRules/RulesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Validation\RulesTest as TraditionalRulesTest; use CodeIgniter\Validation\Validation; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php index fd778e748b3d..ca0160ee44e2 100644 --- a/tests/system/Validation/StrictRules/ValidationTest.php +++ b/tests/system/Validation/StrictRules/ValidationTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Validation\StrictRules; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Validation\ValidationTest as TraditionalValidationTest; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; /** diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index 9e789edde1bc..b5493a682c8e 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -13,8 +13,6 @@ namespace CodeIgniter\Validation; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -23,6 +21,8 @@ use CodeIgniter\Validation\Exceptions\ValidationException; use Config\App; use Config\Services; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\ExpectationFailedException; use Tests\Support\Validation\TestRules; use Throwable; diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php index 79d561c6a0ae..27dd6512d174 100644 --- a/tests/system/View/CellTest.php +++ b/tests/system/View/CellTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\HTTP\Response; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockCache; use CodeIgniter\View\Exceptions\ViewException; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/View/ControlledCellTest.php b/tests/system/View/ControlledCellTest.php index f94aa47b7672..8448aed22ced 100644 --- a/tests/system/View/ControlledCellTest.php +++ b/tests/system/View/ControlledCellTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; use LogicException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\View\Cells\AdditionCell; use Tests\Support\View\Cells\AwesomeCell; use Tests\Support\View\Cells\BadCell; diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php index 2e3faae0dae7..6964575dd5c3 100644 --- a/tests/system/View/DecoratorsTest.php +++ b/tests/system/View/DecoratorsTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; +use PHPUnit\Framework\Attributes\Group; use Tests\Support\View\BadDecorator; use Tests\Support\View\WorldDecorator; diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php index f0270edb1c33..c11310299cc0 100644 --- a/tests/system/View/ParserFilterTest.php +++ b/tests/system/View/ParserFilterTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use Config\View; +use PHPUnit\Framework\Attributes\Group; /** * @internal diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php index 146d05cf2940..31b6ebba5b48 100644 --- a/tests/system/View/ParserPluginTest.php +++ b/tests/system/View/ParserPluginTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use PHPUnit\Framework\Attributes\PreserveGlobalState; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; +use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\Attributes\PreserveGlobalState; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; /** * @internal diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php index 48a9343e5d68..0cce9f722ebf 100644 --- a/tests/system/View/ParserTest.php +++ b/tests/system/View/ParserTest.php @@ -13,14 +13,14 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Entity\Entity; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; use Config\Services; use Config\View as ViewConfig; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php index d7572760838c..97fb1e2ed1a9 100644 --- a/tests/system/View/TableTest.php +++ b/tests/system/View/TableTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; -use PHPUnit\Framework\Attributes\Depends; -use PHPUnit\Framework\Attributes\DataProvider; use CodeIgniter\Database\MySQLi\Result; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockTable; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\Depends; +use PHPUnit\Framework\Attributes\Group; use stdClass; /** diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index a4c5e34af5f4..d1455a604f1b 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\View; -use PHPUnit\Framework\Attributes\Group; use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; use Config; +use PHPUnit\Framework\Attributes\Group; use RuntimeException; /** From b71b7ee9449973c744384868a97a46973e9a9b51 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 19:07:28 +0900 Subject: [PATCH 6846/8282] chore: add tests/ to paths --- .github/workflows/test-phpstan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml index a8e6eaefcb49..360b403ac923 100644 --- a/.github/workflows/test-phpstan.yml +++ b/.github/workflows/test-phpstan.yml @@ -10,6 +10,7 @@ on: paths: - 'app/**.php' - 'system/**.php' + - 'tests/**.php' - 'utils/**.php' - composer.json - phpstan.neon.dist @@ -23,6 +24,7 @@ on: paths: - 'app/**.php' - 'system/**.php' + - 'tests/**.php' - 'utils/**.php' - composer.json - phpstan.neon.dist From cfa7878089f0984dce127d34505b1da65ec6b626 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 19:08:15 +0900 Subject: [PATCH 6847/8282] chore: vendor/bin/phpstan analyze --generate-baseline phpstan-baseline.php --- phpstan-baseline.php | 63 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index fc9b102f8b3f..358e9633dbe0 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -1,5 +1,6 @@ '#^PHPDoc type array\\\\>\\> of property Config\\\\Filters\\:\\:\\$filters is not the same as PHPDoc type array of overridden property CodeIgniter\\\\Config\\\\Filters\\:\\:\\$filters\\.$#', 'count' => 1, @@ -10216,12 +10217,12 @@ 'path' => __DIR__ . '/tests/system/AutoReview/FrameworkCodeTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\AutoReview\\\\FrameworkCodeTest\\:\\:provideEachTestClassHasCorrectGroupAnnotation\\(\\) return type has no value type specified in iterable type iterable\\.$#', + 'message' => '#^Method CodeIgniter\\\\AutoReview\\\\FrameworkCodeTest\\:\\:provideEachTestClassHasCorrectGroupAttributeName\\(\\) return type has no value type specified in iterable type iterable\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/AutoReview/FrameworkCodeTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\AutoReview\\\\FrameworkCodeTest\\:\\:\\$recognizedGroupAnnotations type has no value type specified in iterable type array\\.$#', + 'message' => '#^Property CodeIgniter\\\\AutoReview\\\\FrameworkCodeTest\\:\\:\\$recognizedGroupAttributeNames type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/AutoReview/FrameworkCodeTest.php', ]; @@ -10966,7 +10967,7 @@ 'path' => __DIR__ . '/tests/system/Config/FactoriesTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Config/FactoriesTest\\.php\\:88\\:\\:\\$widgets has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Config/FactoriesTest\\.php\\:89\\:\\:\\$widgets has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Config/FactoriesTest.php', ]; @@ -14071,122 +14072,122 @@ 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$_options has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$_options has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$country has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$country has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$created_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$created_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$deleted has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$deleted has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$email has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$email has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$id has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$id has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$name has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$name has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:197\\:\\:\\$updated_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:198\\:\\:\\$updated_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$_options has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$_options has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$country has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$country has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$created_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$created_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$deleted has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$deleted has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$email has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$email has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$id has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$id has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$name has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$name has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:216\\:\\:\\$updated_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:217\\:\\:\\$updated_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$_options has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$_options has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$country has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$country has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$created_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$created_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$deleted has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$deleted has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$email has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$email has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$id has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$id has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$name has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$name has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:349\\:\\:\\$updated_at has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/Models/UpdateModelTest\\.php\\:350\\:\\:\\$updated_at has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/Models/UpdateModelTest.php', ]; @@ -15901,7 +15902,7 @@ 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:339\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#', + 'message' => '#^Method class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:toArray\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; @@ -15916,17 +15917,17 @@ 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:339\\:\\:\\$bar has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$bar has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:339\\:\\:\\$foo has no type specified\\.$#', + 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:340\\:\\:\\$foo has no type specified\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:369\\:\\:\\$attributes type has no value type specified in iterable type array\\.$#', + 'message' => '#^Property class@anonymous/tests/system/View/ParserTest\\.php\\:370\\:\\:\\$attributes type has no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/View/ParserTest.php', ]; From 2f72086ac3dc7acc60a68ac86bb0d57779828de7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 18:41:45 +0900 Subject: [PATCH 6848/8282] feat: add base RuntimeException and LogicException --- system/Exceptions/LogicException.php | 21 +++++++++++++++++++++ system/Exceptions/RuntimeException.php | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 system/Exceptions/LogicException.php create mode 100644 system/Exceptions/RuntimeException.php diff --git a/system/Exceptions/LogicException.php b/system/Exceptions/LogicException.php new file mode 100644 index 000000000000..2fe46792efcc --- /dev/null +++ b/system/Exceptions/LogicException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Exceptions; + +/** + * Exception that represents error in the program logic. + */ +class LogicException extends \LogicException implements ExceptionInterface +{ +} diff --git a/system/Exceptions/RuntimeException.php b/system/Exceptions/RuntimeException.php new file mode 100644 index 000000000000..c35d55ba9e45 --- /dev/null +++ b/system/Exceptions/RuntimeException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Exceptions; + +/** + * Exception thrown if an error which can only be found on runtime occurs. + */ +class RuntimeException extends \RuntimeException implements ExceptionInterface +{ +} From 50c43a3110e63727b8bb7448399f177069de0753 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 18:42:54 +0900 Subject: [PATCH 6849/8282] feat: add BadMethodCallException,BadFunctionCallException,InvalidArgumentException --- .../Exceptions/BadFunctionCallException.php | 22 +++++++++++++++++++ system/Exceptions/BadMethodCallException.php | 22 +++++++++++++++++++ .../Exceptions/InvalidArgumentException.php | 21 ++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 system/Exceptions/BadFunctionCallException.php create mode 100644 system/Exceptions/BadMethodCallException.php create mode 100644 system/Exceptions/InvalidArgumentException.php diff --git a/system/Exceptions/BadFunctionCallException.php b/system/Exceptions/BadFunctionCallException.php new file mode 100644 index 000000000000..84d9798dc0c4 --- /dev/null +++ b/system/Exceptions/BadFunctionCallException.php @@ -0,0 +1,22 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Exceptions; + +/** + * Exception thrown if a function is called in the wrong way, or the function + * does not exist. + */ +class BadFunctionCallException extends \BadFunctionCallException implements ExceptionInterface +{ +} diff --git a/system/Exceptions/BadMethodCallException.php b/system/Exceptions/BadMethodCallException.php new file mode 100644 index 000000000000..977e8ae721e2 --- /dev/null +++ b/system/Exceptions/BadMethodCallException.php @@ -0,0 +1,22 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Exceptions; + +/** + * Exception thrown if a method is called in the wrong way, or the method + * does not exist. + */ +class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface +{ +} diff --git a/system/Exceptions/InvalidArgumentException.php b/system/Exceptions/InvalidArgumentException.php new file mode 100644 index 000000000000..4790249e3f78 --- /dev/null +++ b/system/Exceptions/InvalidArgumentException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Exceptions; + +/** + * Exception thrown if an argument is not of the expected type. + */ +class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface +{ +} From 085eb2d76c85fa880870c507c81acf87e2bbb506 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 18:46:17 +0900 Subject: [PATCH 6850/8282] refactor: FrameworkException extends RuntimeException --- system/Exceptions/FrameworkException.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php index 1fe47be49a6b..0141b139de62 100644 --- a/system/Exceptions/FrameworkException.php +++ b/system/Exceptions/FrameworkException.php @@ -13,15 +13,13 @@ namespace CodeIgniter\Exceptions; -use RuntimeException; - /** * Class FrameworkException * * A collection of exceptions thrown by the framework * that can only be determined at run time. */ -class FrameworkException extends RuntimeException implements ExceptionInterface +class FrameworkException extends RuntimeException { use DebugTraceableTrait; From 5178dd171d4ee9ce43e024d684d5a10ddce63d36 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 18:50:22 +0900 Subject: [PATCH 6851/8282] feat: extends ExceptionInterface --- system/Exceptions/HTTPExceptionInterface.php | 2 +- system/Exceptions/HasExitCodeInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Exceptions/HTTPExceptionInterface.php b/system/Exceptions/HTTPExceptionInterface.php index 1974d63af6e5..b26f121fb9a6 100644 --- a/system/Exceptions/HTTPExceptionInterface.php +++ b/system/Exceptions/HTTPExceptionInterface.php @@ -16,6 +16,6 @@ /** * Interface for Exceptions that has exception code as HTTP status code. */ -interface HTTPExceptionInterface +interface HTTPExceptionInterface extends ExceptionInterface { } diff --git a/system/Exceptions/HasExitCodeInterface.php b/system/Exceptions/HasExitCodeInterface.php index 1557c82ad681..48d32655714c 100644 --- a/system/Exceptions/HasExitCodeInterface.php +++ b/system/Exceptions/HasExitCodeInterface.php @@ -16,7 +16,7 @@ /** * Interface for Exceptions that has exception code as exit code. */ -interface HasExitCodeInterface +interface HasExitCodeInterface extends ExceptionInterface { /** * Returns exit status code. From 9d2c903f7f42a45fcb74e71eab662c11e6b1c17f Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 19:06:44 +0900 Subject: [PATCH 6852/8282] refactor: change parent class --- system/CLI/Exceptions/CLIException.php | 2 +- system/Exceptions/DownloadException.php | 4 +--- system/Files/Exceptions/FileException.php | 5 ++--- system/Files/Exceptions/FileNotFoundException.php | 5 ++--- system/Format/Exceptions/FormatException.php | 5 ++--- system/Router/Exceptions/MethodNotFoundException.php | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/system/CLI/Exceptions/CLIException.php b/system/CLI/Exceptions/CLIException.php index fae92c001d75..304b2ea4f444 100644 --- a/system/CLI/Exceptions/CLIException.php +++ b/system/CLI/Exceptions/CLIException.php @@ -14,7 +14,7 @@ namespace CodeIgniter\CLI\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * CLIException diff --git a/system/Exceptions/DownloadException.php b/system/Exceptions/DownloadException.php index df78127d6d64..d4b224fdee4d 100644 --- a/system/Exceptions/DownloadException.php +++ b/system/Exceptions/DownloadException.php @@ -13,12 +13,10 @@ namespace CodeIgniter\Exceptions; -use RuntimeException; - /** * Class DownloadException */ -class DownloadException extends RuntimeException implements ExceptionInterface +class DownloadException extends RuntimeException { use DebugTraceableTrait; diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php index 5feb97929ead..8634b211afa4 100644 --- a/system/Files/Exceptions/FileException.php +++ b/system/Files/Exceptions/FileException.php @@ -14,10 +14,9 @@ namespace CodeIgniter\Files\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use CodeIgniter\Exceptions\ExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; -class FileException extends RuntimeException implements ExceptionInterface +class FileException extends RuntimeException { use DebugTraceableTrait; diff --git a/system/Files/Exceptions/FileNotFoundException.php b/system/Files/Exceptions/FileNotFoundException.php index 86b22625aa9e..46c2c1c6cfd5 100644 --- a/system/Files/Exceptions/FileNotFoundException.php +++ b/system/Files/Exceptions/FileNotFoundException.php @@ -14,10 +14,9 @@ namespace CodeIgniter\Files\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use CodeIgniter\Exceptions\ExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; -class FileNotFoundException extends RuntimeException implements ExceptionInterface +class FileNotFoundException extends RuntimeException { use DebugTraceableTrait; diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php index 5a8c2d2cfedb..46daad558c50 100644 --- a/system/Format/Exceptions/FormatException.php +++ b/system/Format/Exceptions/FormatException.php @@ -14,13 +14,12 @@ namespace CodeIgniter\Format\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use CodeIgniter\Exceptions\ExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * FormatException */ -class FormatException extends RuntimeException implements ExceptionInterface +class FormatException extends RuntimeException { use DebugTraceableTrait; diff --git a/system/Router/Exceptions/MethodNotFoundException.php b/system/Router/Exceptions/MethodNotFoundException.php index 6e82fb09583c..19e62eb02c6d 100644 --- a/system/Router/Exceptions/MethodNotFoundException.php +++ b/system/Router/Exceptions/MethodNotFoundException.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Router\Exceptions; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * @internal From 8e5e2078f56ea044cc33d589d8c8cd6288d66730 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 19:19:52 +0900 Subject: [PATCH 6853/8282] refactor: remove unneeded `implements ExceptionInterface` --- system/Filters/Exceptions/FilterException.php | 3 +-- system/Honeypot/Exceptions/HoneypotException.php | 3 +-- system/Images/Exceptions/ImageException.php | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php index 1226ba318429..3a4d914e3cc3 100644 --- a/system/Filters/Exceptions/FilterException.php +++ b/system/Filters/Exceptions/FilterException.php @@ -14,12 +14,11 @@ namespace CodeIgniter\Filters\Exceptions; use CodeIgniter\Exceptions\ConfigException; -use CodeIgniter\Exceptions\ExceptionInterface; /** * FilterException */ -class FilterException extends ConfigException implements ExceptionInterface +class FilterException extends ConfigException { /** * Thrown when the provided alias is not within diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php index ce743b8651b3..7ff493e4edf8 100644 --- a/system/Honeypot/Exceptions/HoneypotException.php +++ b/system/Honeypot/Exceptions/HoneypotException.php @@ -14,9 +14,8 @@ namespace CodeIgniter\Honeypot\Exceptions; use CodeIgniter\Exceptions\ConfigException; -use CodeIgniter\Exceptions\ExceptionInterface; -class HoneypotException extends ConfigException implements ExceptionInterface +class HoneypotException extends ConfigException { /** * Thrown when the template value of config is empty. diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php index 93491bfa9e1b..91bf416d20ac 100644 --- a/system/Images/Exceptions/ImageException.php +++ b/system/Images/Exceptions/ImageException.php @@ -13,10 +13,9 @@ namespace CodeIgniter\Images\Exceptions; -use CodeIgniter\Exceptions\ExceptionInterface; use CodeIgniter\Exceptions\FrameworkException; -class ImageException extends FrameworkException implements ExceptionInterface +class ImageException extends FrameworkException { /** * Thrown when the image is not found. From 2087c55a627390cead195630b84baa303bf08835 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 19:20:37 +0900 Subject: [PATCH 6854/8282] fix: parent exception classes --- system/Database/Exceptions/DatabaseException.php | 4 ++-- system/Exceptions/ConfigException.php | 2 +- system/Exceptions/CriticalError.php | 4 +--- system/Exceptions/PageNotFoundException.php | 3 +-- system/Exceptions/TestException.php | 2 +- system/HTTP/Exceptions/RedirectException.php | 4 ++-- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php index cdb8e22832ec..244d45d09894 100644 --- a/system/Database/Exceptions/DatabaseException.php +++ b/system/Database/Exceptions/DatabaseException.php @@ -14,9 +14,9 @@ namespace CodeIgniter\Database\Exceptions; use CodeIgniter\Exceptions\HasExitCodeInterface; -use Error; +use CodeIgniter\Exceptions\RuntimeException; -class DatabaseException extends Error implements ExceptionInterface, HasExitCodeInterface +class DatabaseException extends RuntimeException implements HasExitCodeInterface { public function getExitCode(): int { diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php index d8849b809c68..d8d27d094230 100644 --- a/system/Exceptions/ConfigException.php +++ b/system/Exceptions/ConfigException.php @@ -16,7 +16,7 @@ /** * Exception for automatic logging. */ -class ConfigException extends CriticalError implements HasExitCodeInterface +class ConfigException extends RuntimeException implements HasExitCodeInterface { use DebugTraceableTrait; diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php index 756393d5d95d..d3f6803b7925 100644 --- a/system/Exceptions/CriticalError.php +++ b/system/Exceptions/CriticalError.php @@ -13,11 +13,9 @@ namespace CodeIgniter\Exceptions; -use Error; - /** * Error: Critical conditions, like component unavailable, etc. */ -class CriticalError extends Error +class CriticalError extends RuntimeException { } diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php index b1af079e3a54..ba9b98c49350 100644 --- a/system/Exceptions/PageNotFoundException.php +++ b/system/Exceptions/PageNotFoundException.php @@ -14,9 +14,8 @@ namespace CodeIgniter\Exceptions; use Config\Services; -use OutOfBoundsException; -class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface, HTTPExceptionInterface +class PageNotFoundException extends RuntimeException implements HTTPExceptionInterface { use DebugTraceableTrait; diff --git a/system/Exceptions/TestException.php b/system/Exceptions/TestException.php index f533dc279335..fd70709a6cb2 100644 --- a/system/Exceptions/TestException.php +++ b/system/Exceptions/TestException.php @@ -16,7 +16,7 @@ /** * Exception for automatic logging. */ -class TestException extends CriticalError +class TestException extends LogicException { use DebugTraceableTrait; diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 5f2dcd05e3b7..318ffed42227 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -14,9 +14,9 @@ namespace CodeIgniter\HTTP\Exceptions; use CodeIgniter\Exceptions\HTTPExceptionInterface; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\ResponsableInterface; use CodeIgniter\HTTP\ResponseInterface; -use Exception; use InvalidArgumentException; use LogicException; use Throwable; @@ -24,7 +24,7 @@ /** * RedirectException */ -class RedirectException extends Exception implements ResponsableInterface, HTTPExceptionInterface +class RedirectException extends RuntimeException implements ResponsableInterface, HTTPExceptionInterface { /** * HTTP status code for redirects From 3540f97e9e935ab84bf9ccb7019bb34b4b9f609c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 20:23:13 +0900 Subject: [PATCH 6855/8282] refactor: use CodeIgniter\Exceptions\RuntimeException --- system/Autoloader/Autoloader.php | 2 +- system/Cache/Exceptions/CacheException.php | 2 +- system/Config/BaseConfig.php | 2 +- system/Database/Exceptions/DataException.php | 2 +- system/Database/Forge.php | 2 +- system/Database/MigrationRunner.php | 2 +- system/Debug/Timer.php | 2 +- system/Encryption/Exceptions/EncryptionException.php | 2 +- system/HTTP/CLIRequest.php | 2 +- system/HTTP/Files/UploadedFile.php | 2 ++ system/HTTP/Files/UploadedFileInterface.php | 2 +- system/Log/Logger.php | 2 +- system/Publisher/ContentReplacer.php | 2 +- system/Publisher/Publisher.php | 2 +- system/Test/Fabricator.php | 2 +- system/Test/FilterTestTrait.php | 2 +- system/View/View.php | 2 +- 17 files changed, 18 insertions(+), 16 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 78d31eae0d7f..3aef07ae635f 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Autoloader; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\RuntimeException; use Composer\Autoload\ClassLoader; use Composer\InstalledVersions; use Config\Autoload; @@ -24,7 +25,6 @@ use Kint; use Kint\Renderer\CliRenderer; use Kint\Renderer\RichRenderer; -use RuntimeException; /** * An autoloader that uses both PSR4 autoloading, and traditional classmaps. diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php index 852e6302ced1..774daa9965b2 100644 --- a/system/Cache/Exceptions/CacheException.php +++ b/system/Cache/Exceptions/CacheException.php @@ -15,7 +15,7 @@ use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\ExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * CacheException diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php index 8a82cbf7ce64..8f579ffc88f3 100644 --- a/system/Config/BaseConfig.php +++ b/system/Config/BaseConfig.php @@ -11,11 +11,11 @@ namespace CodeIgniter\Config; +use CodeIgniter\Exceptions\RuntimeException; use Config\Encryption; use Config\Modules; use ReflectionClass; use ReflectionException; -use RuntimeException; /** * Class BaseConfig diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php index 18a54171cc29..a7ccd8c6f5c3 100644 --- a/system/Database/Exceptions/DataException.php +++ b/system/Database/Exceptions/DataException.php @@ -14,7 +14,7 @@ namespace CodeIgniter\Database\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; class DataException extends RuntimeException implements ExceptionInterface { diff --git a/system/Database/Forge.php b/system/Database/Forge.php index 797b685e861c..ca0428d9f7b3 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -14,8 +14,8 @@ namespace CodeIgniter\Database; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\RuntimeException; use InvalidArgumentException; -use RuntimeException; use Throwable; /** diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php index 719d45c15592..bf890ff24305 100644 --- a/system/Database/MigrationRunner.php +++ b/system/Database/MigrationRunner.php @@ -16,11 +16,11 @@ use CodeIgniter\CLI\CLI; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\I18n\Time; use Config\Database; use Config\Migrations as MigrationsConfig; use Config\Services; -use RuntimeException; use stdClass; /** diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php index 0f2abdbea509..37e9901977e7 100644 --- a/system/Debug/Timer.php +++ b/system/Debug/Timer.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Debug; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * Class Timer diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php index c2220bb88cb4..e18899467bd5 100644 --- a/system/Encryption/Exceptions/EncryptionException.php +++ b/system/Encryption/Exceptions/EncryptionException.php @@ -15,7 +15,7 @@ use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\ExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * Encryption exception diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php index 0b2c57377e65..723c72b1ce98 100644 --- a/system/HTTP/CLIRequest.php +++ b/system/HTTP/CLIRequest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\RuntimeException; use Config\App; use Locale; -use RuntimeException; /** * Represents a request from the command-line. Provides additional diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php index 78643aa7166e..da029d7739ca 100644 --- a/system/HTTP/Files/UploadedFile.php +++ b/system/HTTP/Files/UploadedFile.php @@ -13,10 +13,12 @@ namespace CodeIgniter\HTTP\Files; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Files\File; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\Mimes; use Exception; +use InvalidArgumentException; /** * Value object representing a single file uploaded through an diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php index 12cc25a0d050..167b0aa2f4d6 100644 --- a/system/HTTP/Files/UploadedFileInterface.php +++ b/system/HTTP/Files/UploadedFileInterface.php @@ -13,8 +13,8 @@ namespace CodeIgniter\HTTP\Files; +use CodeIgniter\Exceptions\RuntimeException; use InvalidArgumentException; -use RuntimeException; /** * Value object representing a single file uploaded through an diff --git a/system/Log/Logger.php b/system/Log/Logger.php index 369db8ffb36d..6762e3380ecf 100644 --- a/system/Log/Logger.php +++ b/system/Log/Logger.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Log; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Log\Exceptions\LogException; use CodeIgniter\Log\Handlers\HandlerInterface; use Psr\Log\LoggerInterface; -use RuntimeException; use Stringable; use Throwable; diff --git a/system/Publisher/ContentReplacer.php b/system/Publisher/ContentReplacer.php index 72dd8ace43b8..6e8c01fa2e41 100644 --- a/system/Publisher/ContentReplacer.php +++ b/system/Publisher/ContentReplacer.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Publisher; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * Replace Text Content diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php index 90c966623b2a..bf81f6079b60 100644 --- a/system/Publisher/Publisher.php +++ b/system/Publisher/Publisher.php @@ -14,11 +14,11 @@ namespace CodeIgniter\Publisher; use CodeIgniter\Autoloader\FileLocatorInterface; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Files\FileCollection; use CodeIgniter\HTTP\URI; use CodeIgniter\Publisher\Exceptions\PublisherException; use Config\Publisher as PublisherConfig; -use RuntimeException; use Throwable; /** diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php index 8da0c60fc089..1f61efef5c62 100644 --- a/system/Test/Fabricator.php +++ b/system/Test/Fabricator.php @@ -15,13 +15,13 @@ use Closure; use CodeIgniter\Exceptions\FrameworkException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\I18n\Time; use CodeIgniter\Model; use Config\App; use Faker\Factory; use Faker\Generator; use InvalidArgumentException; -use RuntimeException; /** * Fabricator diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php index 93f273a39f1f..608e847413f3 100644 --- a/system/Test/FilterTestTrait.php +++ b/system/Test/FilterTestTrait.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Test; use Closure; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Filters\Exceptions\FilterException; use CodeIgniter\Filters\FilterInterface; use CodeIgniter\Filters\Filters; @@ -22,7 +23,6 @@ use CodeIgniter\Router\RouteCollection; use Config\Filters as FiltersConfig; use InvalidArgumentException; -use RuntimeException; /** * Filter Test Trait diff --git a/system/View/View.php b/system/View/View.php index cda3d64f6088..160f1c179278 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -15,12 +15,12 @@ use CodeIgniter\Autoloader\FileLocatorInterface; use CodeIgniter\Debug\Toolbar\Collectors\Views; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Filters\DebugToolbar; use CodeIgniter\View\Exceptions\ViewException; use Config\Toolbar; use Config\View as ViewConfig; use Psr\Log\LoggerInterface; -use RuntimeException; /** * Class View From 049fb2be4d18fe835a6e097fb435b2714ca84fa6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 20:32:01 +0900 Subject: [PATCH 6856/8282] refactor: use CodeIgniter\Exceptions\InvalidArgumentException --- system/Autoloader/Autoloader.php | 2 +- system/BaseModel.php | 2 +- system/CLI/CLI.php | 2 +- system/Cache/Handlers/BaseHandler.php | 2 +- system/Commands/Database/ShowTableInfo.php | 2 +- system/Config/DotEnv.php | 2 +- system/Config/Factories.php | 2 +- system/Cookie/Cookie.php | 2 +- system/Database/BaseBuilder.php | 2 +- system/Database/Config.php | 2 +- system/Database/Database.php | 2 +- system/Database/Forge.php | 2 +- system/Database/Postgre/Builder.php | 2 +- system/Database/SQLite3/Builder.php | 2 +- system/Database/Seeder.php | 2 +- system/Files/FileCollection.php | 2 +- system/HTTP/CURLRequest.php | 2 +- system/HTTP/Exceptions/RedirectException.php | 2 +- system/HTTP/Files/UploadedFile.php | 2 +- system/HTTP/Files/UploadedFileInterface.php | 2 +- system/HTTP/IncomingRequest.php | 2 +- system/HTTP/Message.php | 2 +- system/HTTP/MessageTrait.php | 2 +- system/HTTP/OutgoingRequestInterface.php | 2 +- system/HTTP/ResponseInterface.php | 2 +- system/HTTP/ResponseTrait.php | 2 +- system/HTTP/URI.php | 2 +- system/Helpers/Array/ArrayHelper.php | 2 +- system/Images/Handlers/BaseHandler.php | 2 +- system/Router/RouteCollection.php | 2 +- system/Security/Security.php | 2 +- system/Test/ControllerTestTrait.php | 2 +- system/Test/DOMParser.php | 2 +- system/Test/FilterTestTrait.php | 2 +- system/Test/Mock/MockInputOutput.php | 2 +- system/Validation/FileRules.php | 2 +- system/Validation/Rules.php | 2 +- system/Validation/Validation.php | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php index 3aef07ae635f..567d590fdae3 100644 --- a/system/Autoloader/Autoloader.php +++ b/system/Autoloader/Autoloader.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Autoloader; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use Composer\Autoload\ClassLoader; use Composer\InstalledVersions; @@ -21,7 +22,6 @@ use Config\Kint as KintConfig; use Config\Modules; use Config\Services; -use InvalidArgumentException; use Kint; use Kint\Renderer\CliRenderer; use Kint\Renderer\RichRenderer; diff --git a/system/BaseModel.php b/system/BaseModel.php index 9b8bb70ed482..eee042f6c38f 100644 --- a/system/BaseModel.php +++ b/system/BaseModel.php @@ -21,13 +21,13 @@ use CodeIgniter\Database\Query; use CodeIgniter\DataConverter\DataConverter; use CodeIgniter\Entity\Entity; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\ModelException; use CodeIgniter\I18n\Time; use CodeIgniter\Pager\Pager; use CodeIgniter\Validation\ValidationInterface; use Config\Feature; use Config\Services; -use InvalidArgumentException; use ReflectionClass; use ReflectionException; use ReflectionProperty; diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 865241b75cbf..dc9c9a971bb7 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -14,8 +14,8 @@ namespace CodeIgniter\CLI; use CodeIgniter\CLI\Exceptions\CLIException; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Services; -use InvalidArgumentException; use Throwable; /** diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php index 43d316f87b0d..b2c9778b4997 100644 --- a/system/Cache/Handlers/BaseHandler.php +++ b/system/Cache/Handlers/BaseHandler.php @@ -15,9 +15,9 @@ use Closure; use CodeIgniter\Cache\CacheInterface; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Cache; use Exception; -use InvalidArgumentException; /** * Base class for cache handling diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php index 05dcfe4d67a3..3e88e035980c 100644 --- a/system/Commands/Database/ShowTableInfo.php +++ b/system/Commands/Database/ShowTableInfo.php @@ -16,8 +16,8 @@ use CodeIgniter\CLI\BaseCommand; use CodeIgniter\CLI\CLI; use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Database; -use InvalidArgumentException; /** * Get table data if it exists in the database. diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php index db7152fd09d5..eb3e6c5e3c9d 100644 --- a/system/Config/DotEnv.php +++ b/system/Config/DotEnv.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Config; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * Environment-specific configuration diff --git a/system/Config/Factories.php b/system/Config/Factories.php index d98664a24a7b..dfd1c38b4f9a 100644 --- a/system/Config/Factories.php +++ b/system/Config/Factories.php @@ -14,8 +14,8 @@ namespace CodeIgniter\Config; use CodeIgniter\Database\ConnectionInterface; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Model; -use InvalidArgumentException; /** * Factories for creating instances. diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 78dc44258eb9..48e1ad7c2fbe 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -15,10 +15,10 @@ use ArrayAccess; use CodeIgniter\Cookie\Exceptions\CookieException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\I18n\Time; use Config\Cookie as CookieConfig; use DateTimeInterface; -use InvalidArgumentException; use LogicException; use ReturnTypeWillChange; diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php index f9ca1efd4144..79cffb9c5171 100644 --- a/system/Database/BaseBuilder.php +++ b/system/Database/BaseBuilder.php @@ -16,9 +16,9 @@ use Closure; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Exceptions\DataException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Traits\ConditionalTrait; use Config\Feature; -use InvalidArgumentException; /** * Class BaseBuilder diff --git a/system/Database/Config.php b/system/Database/Config.php index 03a0dd15743b..00d1b192cae3 100644 --- a/system/Database/Config.php +++ b/system/Database/Config.php @@ -14,8 +14,8 @@ namespace CodeIgniter\Database; use CodeIgniter\Config\BaseConfig; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Database as DbConfig; -use InvalidArgumentException; /** * Class Config diff --git a/system/Database/Database.php b/system/Database/Database.php index c2bc66d30d11..649d347ff045 100644 --- a/system/Database/Database.php +++ b/system/Database/Database.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Database; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * Database Connection Factory diff --git a/system/Database/Forge.php b/system/Database/Forge.php index ca0428d9f7b3..1aa313358885 100644 --- a/system/Database/Forge.php +++ b/system/Database/Forge.php @@ -14,8 +14,8 @@ namespace CodeIgniter\Database; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; -use InvalidArgumentException; use Throwable; /** diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php index 857760930275..10c87be53dd1 100644 --- a/system/Database/Postgre/Builder.php +++ b/system/Database/Postgre/Builder.php @@ -16,7 +16,7 @@ use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\RawSql; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * Builder for Postgre diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php index a59270bbc0de..87bc4d73a885 100644 --- a/system/Database/SQLite3/Builder.php +++ b/system/Database/SQLite3/Builder.php @@ -16,7 +16,7 @@ use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\RawSql; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * Builder for SQLite3 diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php index be7cfcdf8a8c..ee6f6d1081b1 100644 --- a/system/Database/Seeder.php +++ b/system/Database/Seeder.php @@ -14,10 +14,10 @@ namespace CodeIgniter\Database; use CodeIgniter\CLI\CLI; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Database; use Faker\Factory; use Faker\Generator; -use InvalidArgumentException; /** * Class Seeder diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php index b9456dcc15ba..8b13efa2a570 100644 --- a/system/Files/FileCollection.php +++ b/system/Files/FileCollection.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Files; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Files\Exceptions\FileException; use CodeIgniter\Files\Exceptions\FileNotFoundException; use Countable; use Generator; -use InvalidArgumentException; use IteratorAggregate; /** diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php index 4b1c9c625399..0bb5ad3ea6b1 100644 --- a/system/HTTP/CURLRequest.php +++ b/system/HTTP/CURLRequest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; use Config\CURLRequest as ConfigCURLRequest; -use InvalidArgumentException; /** * A lightweight HTTP client for sending synchronous HTTP requests via cURL. diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 318ffed42227..8d416fa4a5ee 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -14,10 +14,10 @@ namespace CodeIgniter\HTTP\Exceptions; use CodeIgniter\Exceptions\HTTPExceptionInterface; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\ResponsableInterface; use CodeIgniter\HTTP\ResponseInterface; -use InvalidArgumentException; use LogicException; use Throwable; diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php index da029d7739ca..fe19f0df0527 100644 --- a/system/HTTP/Files/UploadedFile.php +++ b/system/HTTP/Files/UploadedFile.php @@ -13,12 +13,12 @@ namespace CodeIgniter\HTTP\Files; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Files\File; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\Mimes; use Exception; -use InvalidArgumentException; /** * Value object representing a single file uploaded through an diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php index 167b0aa2f4d6..6e849d04a76b 100644 --- a/system/HTTP/Files/UploadedFileInterface.php +++ b/system/HTTP/Files/UploadedFileInterface.php @@ -13,8 +13,8 @@ namespace CodeIgniter\HTTP\Files; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; -use InvalidArgumentException; /** * Value object representing a single file uploaded through an diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php index ec13e40f6ff5..b5cec37232a9 100755 --- a/system/HTTP/IncomingRequest.php +++ b/system/HTTP/IncomingRequest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\Files\FileCollection; use CodeIgniter\HTTP\Files\UploadedFile; use Config\App; use Config\Services; -use InvalidArgumentException; use Locale; use stdClass; diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php index 71c4429f28ee..d83fcbb83230 100644 --- a/system/HTTP/Message.php +++ b/system/HTTP/Message.php @@ -13,7 +13,7 @@ namespace CodeIgniter\HTTP; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * An HTTP message diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php index 2f6e57a90c57..fc4af710c147 100644 --- a/system/HTTP/MessageTrait.php +++ b/system/HTTP/MessageTrait.php @@ -13,8 +13,8 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; -use InvalidArgumentException; /** * Message Trait diff --git a/system/HTTP/OutgoingRequestInterface.php b/system/HTTP/OutgoingRequestInterface.php index da9e36206c37..8e314a5be03e 100644 --- a/system/HTTP/OutgoingRequestInterface.php +++ b/system/HTTP/OutgoingRequestInterface.php @@ -13,7 +13,7 @@ namespace CodeIgniter\HTTP; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * Representation of an outgoing, client-side request. diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php index 68ec5c3fce7f..0f23f1354953 100644 --- a/system/HTTP/ResponseInterface.php +++ b/system/HTTP/ResponseInterface.php @@ -15,10 +15,10 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Pager\PagerInterface; use DateTime; -use InvalidArgumentException; /** * Representation of an outgoing, server-side response. diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php index 45f07d186170..726e85bae5a4 100644 --- a/system/HTTP/ResponseTrait.php +++ b/system/HTTP/ResponseTrait.php @@ -16,6 +16,7 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; use CodeIgniter\Cookie\Exceptions\CookieException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\I18n\Time; use CodeIgniter\Pager\PagerInterface; @@ -23,7 +24,6 @@ use Config\Cookie as CookieConfig; use DateTime; use DateTimeZone; -use InvalidArgumentException; /** * Response Trait diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index efa99cf778a8..75c677345482 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -14,9 +14,9 @@ namespace CodeIgniter\HTTP; use BadMethodCallException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; -use InvalidArgumentException; use Stringable; /** diff --git a/system/Helpers/Array/ArrayHelper.php b/system/Helpers/Array/ArrayHelper.php index 76b8e8aedfbe..b9c356d381c1 100644 --- a/system/Helpers/Array/ArrayHelper.php +++ b/system/Helpers/Array/ArrayHelper.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Helpers\Array; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; /** * @interal This is internal implementation for the framework. diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php index eb704b564670..a6607e04d160 100644 --- a/system/Images/Handlers/BaseHandler.php +++ b/system/Images/Handlers/BaseHandler.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Images\Handlers; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Images\Exceptions\ImageException; use CodeIgniter\Images\Image; use CodeIgniter\Images\ImageHandlerInterface; use Config\Images; -use InvalidArgumentException; /** * Base image handling implementation diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php index 3198d342aa9d..faf2af99b046 100644 --- a/system/Router/RouteCollection.php +++ b/system/Router/RouteCollection.php @@ -15,6 +15,7 @@ use Closure; use CodeIgniter\Autoloader\FileLocatorInterface; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Method; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\Router\Exceptions\RouterException; @@ -22,7 +23,6 @@ use Config\Modules; use Config\Routing; use Config\Services; -use InvalidArgumentException; /** * @todo Implement nested resource routing (See CakePHP) diff --git a/system/Security/Security.php b/system/Security/Security.php index 077b3b9cdbb0..54e3839845a8 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Security; use CodeIgniter\Cookie\Cookie; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Method; use CodeIgniter\HTTP\Request; @@ -24,7 +25,6 @@ use Config\Cookie as CookieConfig; use Config\Security as SecurityConfig; use ErrorException; -use InvalidArgumentException; use LogicException; /** diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php index ab1a1aef3907..7417e7307a08 100644 --- a/system/Test/ControllerTestTrait.php +++ b/system/Test/ControllerTestTrait.php @@ -12,13 +12,13 @@ namespace CodeIgniter\Test; use CodeIgniter\Controller; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\URI; use Config\App; use Config\Services; -use InvalidArgumentException; use Psr\Log\LoggerInterface; use Throwable; diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php index fe9ee1d58b2a..ae4d4e4ee2b4 100644 --- a/system/Test/DOMParser.php +++ b/system/Test/DOMParser.php @@ -14,10 +14,10 @@ namespace CodeIgniter\Test; use BadMethodCallException; +use CodeIgniter\Exceptions\InvalidArgumentException; use DOMDocument; use DOMNodeList; use DOMXPath; -use InvalidArgumentException; /** * Load a response into a DOMDocument for testing assertions based on that diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php index 608e847413f3..6c0a5d4670c0 100644 --- a/system/Test/FilterTestTrait.php +++ b/system/Test/FilterTestTrait.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Test; use Closure; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Filters\Exceptions\FilterException; use CodeIgniter\Filters\FilterInterface; @@ -22,7 +23,6 @@ use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\Router\RouteCollection; use Config\Filters as FiltersConfig; -use InvalidArgumentException; /** * Filter Test Trait diff --git a/system/Test/Mock/MockInputOutput.php b/system/Test/Mock/MockInputOutput.php index 750f142a00e7..ff7044e07ba5 100644 --- a/system/Test/Mock/MockInputOutput.php +++ b/system/Test/Mock/MockInputOutput.php @@ -14,9 +14,9 @@ namespace CodeIgniter\Test\Mock; use CodeIgniter\CLI\InputOutput; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\Filters\CITestStreamFilter; use CodeIgniter\Test\PhpStreamWrapper; -use InvalidArgumentException; use LogicException; final class MockInputOutput extends InputOutput diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php index dd8c4290e11d..2171858c1582 100644 --- a/system/Validation/FileRules.php +++ b/system/Validation/FileRules.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Validation; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\RequestInterface; use Config\Mimes; -use InvalidArgumentException; /** * File validation rules diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php index 272b2dcf61fe..aa031e216271 100644 --- a/system/Validation/Rules.php +++ b/system/Validation/Rules.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Validation; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Helpers\Array\ArrayHelper; use Config\Database; -use InvalidArgumentException; /** * Validation Rules. diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index eb87ef3fa776..82fc749f9cf3 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -15,6 +15,7 @@ use Closure; use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Method; @@ -23,7 +24,6 @@ use CodeIgniter\View\RendererInterface; use Config\Services; use Config\Validation as ValidationConfig; -use InvalidArgumentException; use LogicException; use TypeError; From 4b8a50e6939d503e01147c8d612b9ad5572425f8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 20:32:26 +0900 Subject: [PATCH 6857/8282] refactor: use CodeIgniter\Exceptions\LogicException --- system/CodeIgniter.php | 2 +- system/Cookie/Cookie.php | 2 +- system/Database/MySQLi/Connection.php | 2 +- system/HTTP/Exceptions/RedirectException.php | 2 +- system/Security/Security.php | 2 +- system/Test/ConfigFromArrayTrait.php | 2 +- system/Test/Mock/MockInputOutput.php | 2 +- system/Validation/Validation.php | 2 +- system/View/Cells/Cell.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 1758228076ab..1ea1d0e2f610 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -16,6 +16,7 @@ use CodeIgniter\Debug\Timer; use CodeIgniter\Events\Events; use CodeIgniter\Exceptions\FrameworkException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Exceptions\PageNotFoundException; use CodeIgniter\Filters\Filters; use CodeIgniter\HTTP\CLIRequest; @@ -41,7 +42,6 @@ use Kint\Renderer\CliRenderer; use Kint\Renderer\RichRenderer; use Locale; -use LogicException; use Throwable; /** diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 48e1ad7c2fbe..7da90654ed9b 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -16,10 +16,10 @@ use ArrayAccess; use CodeIgniter\Cookie\Exceptions\CookieException; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\I18n\Time; use Config\Cookie as CookieConfig; use DateTimeInterface; -use LogicException; use ReturnTypeWillChange; /** diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php index b25f2e1af390..e8db25c76640 100644 --- a/system/Database/MySQLi/Connection.php +++ b/system/Database/MySQLi/Connection.php @@ -15,7 +15,7 @@ use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\Exceptions\DatabaseException; -use LogicException; +use CodeIgniter\Exceptions\LogicException; use mysqli; use mysqli_result; use mysqli_sql_exception; diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index 8d416fa4a5ee..a13bc933a095 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -15,10 +15,10 @@ use CodeIgniter\Exceptions\HTTPExceptionInterface; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\ResponsableInterface; use CodeIgniter\HTTP\ResponseInterface; -use LogicException; use Throwable; /** diff --git a/system/Security/Security.php b/system/Security/Security.php index 54e3839845a8..03e8b8da9e2c 100644 --- a/system/Security/Security.php +++ b/system/Security/Security.php @@ -15,6 +15,7 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Method; use CodeIgniter\HTTP\Request; @@ -25,7 +26,6 @@ use Config\Cookie as CookieConfig; use Config\Security as SecurityConfig; use ErrorException; -use LogicException; /** * Class Security diff --git a/system/Test/ConfigFromArrayTrait.php b/system/Test/ConfigFromArrayTrait.php index 3652fa1074a1..9dd2ac0c4de7 100644 --- a/system/Test/ConfigFromArrayTrait.php +++ b/system/Test/ConfigFromArrayTrait.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Test; -use LogicException; +use CodeIgniter\Exceptions\LogicException; trait ConfigFromArrayTrait { diff --git a/system/Test/Mock/MockInputOutput.php b/system/Test/Mock/MockInputOutput.php index ff7044e07ba5..fb76781a177e 100644 --- a/system/Test/Mock/MockInputOutput.php +++ b/system/Test/Mock/MockInputOutput.php @@ -15,9 +15,9 @@ use CodeIgniter\CLI\InputOutput; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Test\Filters\CITestStreamFilter; use CodeIgniter\Test\PhpStreamWrapper; -use LogicException; final class MockInputOutput extends InputOutput { diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index 82fc749f9cf3..d01262640709 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -16,6 +16,7 @@ use Closure; use CodeIgniter\Database\BaseConnection; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Method; @@ -24,7 +25,6 @@ use CodeIgniter\View\RendererInterface; use Config\Services; use Config\Validation as ValidationConfig; -use LogicException; use TypeError; /** diff --git a/system/View/Cells/Cell.php b/system/View/Cells/Cell.php index ddf7ef4ccf63..e60493804002 100644 --- a/system/View/Cells/Cell.php +++ b/system/View/Cells/Cell.php @@ -13,8 +13,8 @@ namespace CodeIgniter\View\Cells; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Traits\PropertiesTrait; -use LogicException; use ReflectionClass; use Stringable; From 13106b84c19e129b551893e296527be7954e32bc Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 20:34:45 +0900 Subject: [PATCH 6858/8282] refactor: use CodeIgniter\Exceptions\BadMethodCallException --- system/Database/BasePreparedQuery.php | 2 +- system/Database/MySQLi/PreparedQuery.php | 2 +- system/Database/OCI8/PreparedQuery.php | 2 +- system/Database/Postgre/PreparedQuery.php | 2 +- system/Database/PreparedQueryInterface.php | 2 +- system/Database/SQLSRV/PreparedQuery.php | 2 +- system/Database/SQLite3/PreparedQuery.php | 2 +- system/HTTP/SiteURI.php | 2 +- system/HTTP/URI.php | 2 +- system/Model.php | 2 +- system/Test/DOMParser.php | 2 +- system/Test/Mock/MockTable.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php index 8c4f252cfb7e..95e7c0df0c47 100644 --- a/system/Database/BasePreparedQuery.php +++ b/system/Database/BasePreparedQuery.php @@ -14,9 +14,9 @@ namespace CodeIgniter\Database; use ArgumentCountError; -use BadMethodCallException; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Events\Events; +use CodeIgniter\Exceptions\BadMethodCallException; use ErrorException; /** diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php index e9a6c6d10e30..2ff2f6638259 100644 --- a/system/Database/MySQLi/PreparedQuery.php +++ b/system/Database/MySQLi/PreparedQuery.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\MySQLi; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\BadMethodCallException; use mysqli; use mysqli_result; use mysqli_sql_exception; diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php index c267f8061377..a6b6c73c0348 100644 --- a/system/Database/OCI8/PreparedQuery.php +++ b/system/Database/OCI8/PreparedQuery.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\OCI8; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\BadMethodCallException; /** * Prepared query for OCI8 diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php index 832108675ab9..06e7ffbb1f4e 100644 --- a/system/Database/Postgre/PreparedQuery.php +++ b/system/Database/Postgre/PreparedQuery.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\Postgre; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\BadMethodCallException; use Exception; use PgSql\Connection as PgSqlConnection; use PgSql\Result as PgSqlResult; diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php index d9e11cd520d6..6ac69904e7f9 100644 --- a/system/Database/PreparedQueryInterface.php +++ b/system/Database/PreparedQueryInterface.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Database; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; /** * @template TConnection diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php index f3a4a14c2bc6..1f9dad6217e8 100755 --- a/system/Database/SQLSRV/PreparedQuery.php +++ b/system/Database/SQLSRV/PreparedQuery.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\SQLSRV; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\BadMethodCallException; /** * Prepared query for Postgre diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php index 21dc4c2fdeff..654afa1ce36e 100644 --- a/system/Database/SQLite3/PreparedQuery.php +++ b/system/Database/SQLite3/PreparedQuery.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Database\SQLite3; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Exceptions\BadMethodCallException; use Exception; use SQLite3; use SQLite3Result; diff --git a/system/HTTP/SiteURI.php b/system/HTTP/SiteURI.php index def61b65e17b..20bec2972122 100644 --- a/system/HTTP/SiteURI.php +++ b/system/HTTP/SiteURI.php @@ -13,7 +13,7 @@ namespace CodeIgniter\HTTP; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php index 75c677345482..e3062d30dd7c 100644 --- a/system/HTTP/URI.php +++ b/system/HTTP/URI.php @@ -13,7 +13,7 @@ namespace CodeIgniter\HTTP; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\App; diff --git a/system/Model.php b/system/Model.php index b3ecfc653943..ee165c68371c 100644 --- a/system/Model.php +++ b/system/Model.php @@ -13,7 +13,6 @@ namespace CodeIgniter; -use BadMethodCallException; use Closure; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\BaseConnection; @@ -23,6 +22,7 @@ use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Database\Query; use CodeIgniter\Entity\Entity; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\ModelException; use CodeIgniter\Validation\ValidationInterface; use Config\Database; diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php index ae4d4e4ee2b4..f46ce1d65206 100644 --- a/system/Test/DOMParser.php +++ b/system/Test/DOMParser.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Test; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\InvalidArgumentException; use DOMDocument; use DOMNodeList; diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php index 1976aaed7be1..a7edc359e4f8 100644 --- a/system/Test/Mock/MockTable.php +++ b/system/Test/Mock/MockTable.php @@ -13,7 +13,7 @@ namespace CodeIgniter\Test\Mock; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\View\Table; class MockTable extends Table From 82eaa32d65a094cbeed0b72e41117e1da025d109 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 21:16:27 +0900 Subject: [PATCH 6859/8282] refactor: use CodeIgniter\Exceptions\BadFunctionCallException --- system/Helpers/number_helper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 96468ddcdea3..a0d0496452c3 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -11,6 +11,8 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Exceptions\BadFunctionCallException; + // CodeIgniter Number Helpers if (! function_exists('number_to_size')) { From 3fa8a261779fdac2f9cabf5bdee8265510dfa74e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 22:41:02 +0900 Subject: [PATCH 6860/8282] fix: replace \Exception with RuntimeException --- system/Cache/ResponseCache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php index 388931813c7c..35c2617c8cb5 100644 --- a/system/Cache/ResponseCache.php +++ b/system/Cache/ResponseCache.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Cache; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Header; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\ResponseInterface; use Config\Cache as CacheConfig; -use Exception; /** * Web Page Caching @@ -131,7 +131,7 @@ public function get($request, ResponseInterface $response): ?ResponseInterface || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers']) ) { - throw new Exception('Error unserializing page cache'); + throw new RuntimeException('Error unserializing page cache'); } $headers = $cachedResponse['headers']; From 3a35769b197bf8104a252c30afbd3149593dcc56 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 22:42:41 +0900 Subject: [PATCH 6861/8282] fix: replace \Exception with BadMethodCallException --- system/Cache/Handlers/BaseHandler.php | 3 ++- system/Cache/Handlers/MemcachedHandler.php | 3 ++- system/Cache/Handlers/WincacheHandler.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php index b2c9778b4997..9c98bedc7693 100644 --- a/system/Cache/Handlers/BaseHandler.php +++ b/system/Cache/Handlers/BaseHandler.php @@ -15,6 +15,7 @@ use Closure; use CodeIgniter\Cache\CacheInterface; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Cache; use Exception; @@ -108,6 +109,6 @@ public function remember(string $key, int $ttl, Closure $callback) */ public function deleteMatching(string $pattern) { - throw new Exception('The deleteMatching method is not implemented.'); + throw new BadMethodCallException('The deleteMatching method is not implemented.'); } } diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php index e1048004077a..a0d487126cf4 100644 --- a/system/Cache/Handlers/MemcachedHandler.php +++ b/system/Cache/Handlers/MemcachedHandler.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache\Handlers; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\CriticalError; use CodeIgniter\I18n\Time; use Config\Cache; @@ -197,7 +198,7 @@ public function delete(string $key) */ public function deleteMatching(string $pattern) { - throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.'); + throw new BadMethodCallException('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.'); } /** diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php index 0ddee50a7fde..d4d97701b135 100644 --- a/system/Cache/Handlers/WincacheHandler.php +++ b/system/Cache/Handlers/WincacheHandler.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Cache\Handlers; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\I18n\Time; use Config\Cache; -use Exception; /** * Cache handler for WinCache from Microsoft & IIS. @@ -80,7 +80,7 @@ public function delete(string $key) */ public function deleteMatching(string $pattern) { - throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.'); + throw new BadMethodCallException('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.'); } /** From d33d3c7fd6eae429d5c44ca17b3f0123be0dae5c Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 27 Jan 2024 22:43:09 +0900 Subject: [PATCH 6862/8282] fix: replace \TypeError with InvalidArgumentException --- system/Validation/Validation.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index d01262640709..3cdf2f2ee22d 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -25,7 +25,6 @@ use CodeIgniter\View\RendererInterface; use Config\Services; use Config\Validation as ValidationConfig; -use TypeError; /** * Validator @@ -540,12 +539,12 @@ public function withRequest(RequestInterface $request): ValidationInterface * * @return $this * - * @throws TypeError + * @throws InvalidArgumentException */ public function setRule(string $field, ?string $label, $rules, array $errors = []) { if (! is_array($rules) && ! is_string($rules)) { - throw new TypeError('$rules must be of type string|array'); + throw new InvalidArgumentException('$rules must be of type string|array'); } $ruleSet = [ From 08fea02f2c82732d2ed31085fc28b4220c8a9df0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Jan 2024 09:54:00 +0900 Subject: [PATCH 6863/8282] docs: fix class Doc comments --- system/Exceptions/ConfigException.php | 3 ++- system/Exceptions/TestException.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php index d8d27d094230..b30818124901 100644 --- a/system/Exceptions/ConfigException.php +++ b/system/Exceptions/ConfigException.php @@ -14,7 +14,8 @@ namespace CodeIgniter\Exceptions; /** - * Exception for automatic logging. + * Exception thrown if the value of the Config class is invalid or the type is + * incorrect. */ class ConfigException extends RuntimeException implements HasExitCodeInterface { diff --git a/system/Exceptions/TestException.php b/system/Exceptions/TestException.php index fd70709a6cb2..4487ae1e1815 100644 --- a/system/Exceptions/TestException.php +++ b/system/Exceptions/TestException.php @@ -14,7 +14,7 @@ namespace CodeIgniter\Exceptions; /** - * Exception for automatic logging. + * Exception thrown when there is an error with the test code. */ class TestException extends LogicException { From 616e0f5964409ec9820f6126aa04972c8efe5079 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Jan 2024 10:15:25 +0900 Subject: [PATCH 6864/8282] test: update expectException() --- tests/system/Validation/ValidationTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php index b5493a682c8e..64c42a088681 100644 --- a/tests/system/Validation/ValidationTest.php +++ b/tests/system/Validation/ValidationTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Validation; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURI; @@ -26,7 +27,6 @@ use PHPUnit\Framework\ExpectationFailedException; use Tests\Support\Validation\TestRules; use Throwable; -use TypeError; /** * @internal @@ -197,7 +197,7 @@ public function testSetRuleOverwritesRuleReverse(): void public function testSetRuleRulesFormat(bool $expected, $rules): void { if (! $expected) { - $this->expectException(TypeError::class); + $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('$rules must be of type string|array'); } From 832c77ff1aa46e86901faef779462b3bbb7dc414 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Jan 2024 10:45:00 +0900 Subject: [PATCH 6865/8282] refactor: remove unneeded `implements ExceptionInterface` --- system/Cache/Exceptions/CacheException.php | 3 +-- system/Encryption/Exceptions/EncryptionException.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php index 774daa9965b2..650dad64d649 100644 --- a/system/Cache/Exceptions/CacheException.php +++ b/system/Cache/Exceptions/CacheException.php @@ -14,13 +14,12 @@ namespace CodeIgniter\Cache\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use CodeIgniter\Exceptions\ExceptionInterface; use CodeIgniter\Exceptions\RuntimeException; /** * CacheException */ -class CacheException extends RuntimeException implements ExceptionInterface +class CacheException extends RuntimeException { use DebugTraceableTrait; diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php index e18899467bd5..9a0935d7d91d 100644 --- a/system/Encryption/Exceptions/EncryptionException.php +++ b/system/Encryption/Exceptions/EncryptionException.php @@ -14,13 +14,12 @@ namespace CodeIgniter\Encryption\Exceptions; use CodeIgniter\Exceptions\DebugTraceableTrait; -use CodeIgniter\Exceptions\ExceptionInterface; use CodeIgniter\Exceptions\RuntimeException; /** * Encryption exception */ -class EncryptionException extends RuntimeException implements ExceptionInterface +class EncryptionException extends RuntimeException { use DebugTraceableTrait; From b91b905a6e101a829137adb8c7593558ff56a7af Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Jan 2024 10:45:36 +0900 Subject: [PATCH 6866/8282] feat: add domain-level ExceptionInterface If there are more than one Exception class in the domain, provide a domain-level interface for capture of all exceptions. --- .../Files/Exceptions/ExceptionInterface.php | 24 +++++++++++++++++++ system/HTTP/Exceptions/ExceptionInterface.php | 24 +++++++++++++++++++ .../Router/Exceptions/ExceptionInterface.php | 24 +++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 system/Files/Exceptions/ExceptionInterface.php create mode 100644 system/HTTP/Exceptions/ExceptionInterface.php create mode 100644 system/Router/Exceptions/ExceptionInterface.php diff --git a/system/Files/Exceptions/ExceptionInterface.php b/system/Files/Exceptions/ExceptionInterface.php new file mode 100644 index 000000000000..346ff1624e12 --- /dev/null +++ b/system/Files/Exceptions/ExceptionInterface.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Files\Exceptions; + +/** + * Provides a domain-level interface for broad capture + * of all Files-related exceptions. + * + * catch (\CodeIgniter\Files\Exceptions\ExceptionInterface) { ... } + */ +interface ExceptionInterface extends \CodeIgniter\Exceptions\ExceptionInterface +{ +} diff --git a/system/HTTP/Exceptions/ExceptionInterface.php b/system/HTTP/Exceptions/ExceptionInterface.php new file mode 100644 index 000000000000..984a94972364 --- /dev/null +++ b/system/HTTP/Exceptions/ExceptionInterface.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\HTTP\Exceptions; + +/** + * Provides a domain-level interface for broad capture + * of all HTTP-related exceptions. + * + * catch (\CodeIgniter\HTTP\Exceptions\ExceptionInterface) { ... } + */ +interface ExceptionInterface extends \CodeIgniter\Exceptions\ExceptionInterface +{ +} diff --git a/system/Router/Exceptions/ExceptionInterface.php b/system/Router/Exceptions/ExceptionInterface.php new file mode 100644 index 000000000000..49ed7cc11a78 --- /dev/null +++ b/system/Router/Exceptions/ExceptionInterface.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Router\Exceptions; + +/** + * Provides a domain-level interface for broad capture + * of all Router-related exceptions. + * + * catch (\CodeIgniter\Router\Exceptions\ExceptionInterface) { ... } + */ +interface ExceptionInterface extends \CodeIgniter\Exceptions\ExceptionInterface +{ +} From cff68f1c81846fef9eaee4d4cd1e2988c86d0d41 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 28 Jan 2024 10:48:56 +0900 Subject: [PATCH 6867/8282] feat: implements domain-level ExceptionInterface --- system/Database/Exceptions/DatabaseException.php | 2 +- system/Files/Exceptions/FileException.php | 2 +- system/Files/Exceptions/FileNotFoundException.php | 2 +- system/HTTP/Exceptions/HTTPException.php | 2 +- system/HTTP/Exceptions/RedirectException.php | 2 +- system/Router/Exceptions/MethodNotFoundException.php | 2 +- system/Router/Exceptions/RouterException.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php index 244d45d09894..77b170e0b407 100644 --- a/system/Database/Exceptions/DatabaseException.php +++ b/system/Database/Exceptions/DatabaseException.php @@ -16,7 +16,7 @@ use CodeIgniter\Exceptions\HasExitCodeInterface; use CodeIgniter\Exceptions\RuntimeException; -class DatabaseException extends RuntimeException implements HasExitCodeInterface +class DatabaseException extends RuntimeException implements ExceptionInterface, HasExitCodeInterface { public function getExitCode(): int { diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php index 8634b211afa4..3202978c3af6 100644 --- a/system/Files/Exceptions/FileException.php +++ b/system/Files/Exceptions/FileException.php @@ -16,7 +16,7 @@ use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\RuntimeException; -class FileException extends RuntimeException +class FileException extends RuntimeException implements ExceptionInterface { use DebugTraceableTrait; diff --git a/system/Files/Exceptions/FileNotFoundException.php b/system/Files/Exceptions/FileNotFoundException.php index 46c2c1c6cfd5..4c043f9ab02c 100644 --- a/system/Files/Exceptions/FileNotFoundException.php +++ b/system/Files/Exceptions/FileNotFoundException.php @@ -16,7 +16,7 @@ use CodeIgniter\Exceptions\DebugTraceableTrait; use CodeIgniter\Exceptions\RuntimeException; -class FileNotFoundException extends RuntimeException +class FileNotFoundException extends RuntimeException implements ExceptionInterface { use DebugTraceableTrait; diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php index 946af3d9fb15..146a565b8c77 100644 --- a/system/HTTP/Exceptions/HTTPException.php +++ b/system/HTTP/Exceptions/HTTPException.php @@ -18,7 +18,7 @@ /** * Things that can go wrong with HTTP */ -class HTTPException extends FrameworkException +class HTTPException extends FrameworkException implements ExceptionInterface { /** * For CurlRequest diff --git a/system/HTTP/Exceptions/RedirectException.php b/system/HTTP/Exceptions/RedirectException.php index a13bc933a095..0ee895fbb688 100644 --- a/system/HTTP/Exceptions/RedirectException.php +++ b/system/HTTP/Exceptions/RedirectException.php @@ -24,7 +24,7 @@ /** * RedirectException */ -class RedirectException extends RuntimeException implements ResponsableInterface, HTTPExceptionInterface +class RedirectException extends RuntimeException implements ExceptionInterface, ResponsableInterface, HTTPExceptionInterface { /** * HTTP status code for redirects diff --git a/system/Router/Exceptions/MethodNotFoundException.php b/system/Router/Exceptions/MethodNotFoundException.php index 19e62eb02c6d..2dabad79b6a1 100644 --- a/system/Router/Exceptions/MethodNotFoundException.php +++ b/system/Router/Exceptions/MethodNotFoundException.php @@ -18,6 +18,6 @@ /** * @internal */ -final class MethodNotFoundException extends RuntimeException +final class MethodNotFoundException extends RuntimeException implements ExceptionInterface { } diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php index fe21b53d32b7..378647289a72 100644 --- a/system/Router/Exceptions/RouterException.php +++ b/system/Router/Exceptions/RouterException.php @@ -18,7 +18,7 @@ /** * RouterException */ -class RouterException extends FrameworkException +class RouterException extends FrameworkException implements ExceptionInterface { /** * Thrown when the actual parameter type does not match From fa0fea5610e9113ad020bdb3ce3cc6738be0eec8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 14:57:02 +0900 Subject: [PATCH 6868/8282] refactor: use CodeIgniter\Exceptions\InvalidArgumentException --- system/Helpers/text_helper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php index 7f5fb2cf2d3f..8ce3677b0eee 100755 --- a/system/Helpers/text_helper.php +++ b/system/Helpers/text_helper.php @@ -11,6 +11,7 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\ForeignCharacters; // CodeIgniter Text Helpers From 8e75308f86373b22c9f5b9c061a4fc705f775c8b Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 15:00:02 +0900 Subject: [PATCH 6869/8282] test: use odeIgniter\Exceptions\RuntimeException --- system/HTTP/Files/UploadedFile.php | 2 -- tests/_support/Autoloader/FatalLocator.php | 2 +- tests/_support/Commands/AppInfo.php | 2 +- tests/_support/Config/Services.php | 2 +- tests/_support/Controllers/Popcorn.php | 2 +- tests/system/Autoloader/AutoloaderTest.php | 2 +- tests/system/CLI/CLITest.php | 2 +- tests/system/CommonFunctionsTest.php | 2 +- tests/system/CommonHelperTest.php | 2 +- tests/system/Config/BaseConfigTest.php | 2 +- tests/system/Config/ServicesTest.php | 2 +- tests/system/Database/Live/ForgeTest.php | 2 +- tests/system/Debug/ExceptionHandlerTest.php | 2 +- tests/system/Debug/ExceptionsTest.php | 2 +- tests/system/Debug/TimerTest.php | 2 +- tests/system/Format/JSONFormatterTest.php | 2 +- tests/system/View/ViewTest.php | 2 +- 17 files changed, 16 insertions(+), 18 deletions(-) diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php index fe19f0df0527..78643aa7166e 100644 --- a/system/HTTP/Files/UploadedFile.php +++ b/system/HTTP/Files/UploadedFile.php @@ -13,8 +13,6 @@ namespace CodeIgniter\HTTP\Files; -use CodeIgniter\Exceptions\InvalidArgumentException; -use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Files\File; use CodeIgniter\HTTP\Exceptions\HTTPException; use Config\Mimes; diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php index 578bd02ad9ae..0b98fddc6eca 100644 --- a/tests/_support/Autoloader/FatalLocator.php +++ b/tests/_support/Autoloader/FatalLocator.php @@ -14,7 +14,7 @@ namespace Tests\Support\Autoloader; use CodeIgniter\Autoloader\FileLocator; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * Class FatalLocator diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php index ae609514ad54..767523071466 100644 --- a/tests/_support/Commands/AppInfo.php +++ b/tests/_support/Commands/AppInfo.php @@ -16,7 +16,7 @@ use CodeIgniter\CLI\BaseCommand; use CodeIgniter\CLI\CLI; use CodeIgniter\CodeIgniter; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; class AppInfo extends BaseCommand { diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php index 809fd9bad173..712c79004a0b 100644 --- a/tests/_support/Config/Services.php +++ b/tests/_support/Config/Services.php @@ -13,11 +13,11 @@ namespace Tests\Support\Config; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\SiteURIFactory; use CodeIgniter\HTTP\URI; use Config\App; use Config\Services as BaseServices; -use RuntimeException; /** * Services Class diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php index 2223a3c3108a..f736f0dcc50f 100644 --- a/tests/_support/Controllers/Popcorn.php +++ b/tests/_support/Controllers/Popcorn.php @@ -15,7 +15,7 @@ use CodeIgniter\API\ResponseTrait; use CodeIgniter\Controller; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * This is a testing only controller, intended to blow up in multiple diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 647b041d5f78..094b4cfd6b38 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -16,6 +16,7 @@ use App\Controllers\Home; use Closure; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; use Config\Autoload; @@ -25,7 +26,6 @@ use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\PreserveGlobalState; use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use RuntimeException; use UnnamespacedClass; /** diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index fc62e5888e53..80a55ade45cf 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -13,13 +13,13 @@ namespace CodeIgniter\CLI; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\PhpStreamWrapper; use CodeIgniter\Test\StreamFilterTrait; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; use ReflectionProperty; -use RuntimeException; /** * @internal diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 226f9f79c776..fbf3f3fe9ab2 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -15,6 +15,7 @@ use CodeIgniter\Config\BaseService; use CodeIgniter\Config\Factories; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\HTTP\IncomingRequest; @@ -46,7 +47,6 @@ use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\PreserveGlobalState; use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use RuntimeException; use stdClass; use Tests\Support\Models\JobModel; diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php index 819b5c582d4c..0f91f1088073 100644 --- a/tests/system/CommonHelperTest.php +++ b/tests/system/CommonHelperTest.php @@ -14,12 +14,12 @@ namespace CodeIgniter; use CodeIgniter\Autoloader\FileLocator; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; use PHPUnit\Framework\Attributes\CoversFunction; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; -use RuntimeException; use Tests\Support\Autoloader\FatalLocator; /** diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 68776b671fda..8a169801b32f 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Config; use CodeIgniter\Autoloader\FileLocator; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use Config\Modules; use Encryption; @@ -22,7 +23,6 @@ use PHPUnit\Framework\Attributes\RunInSeparateProcess; use PHPUnit\Framework\MockObject\MockObject; use RegistrarConfig; -use RuntimeException; use SimpleConfig; use Tests\Support\Config\BadRegistrar; use Tests\Support\Config\TestRegistrar; diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 17b97dd2e259..5ab4026a5c92 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -20,6 +20,7 @@ use CodeIgniter\Debug\Timer; use CodeIgniter\Debug\Toolbar; use CodeIgniter\Email\Email; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Filters\Filters; use CodeIgniter\Format\Format; use CodeIgniter\Honeypot\Honeypot; @@ -49,7 +50,6 @@ use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\PreserveGlobalState; use PHPUnit\Framework\Attributes\RunInSeparateProcess; -use RuntimeException; use Tests\Support\Config\Services; /** diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index 7fccd6b1d298..aa415a9d72a5 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -15,12 +15,12 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; use LogicException; use PHPUnit\Framework\Attributes\Group; -use RuntimeException; use stdClass; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php index 85eaed74621b..0d6ba9499ec3 100644 --- a/tests/system/Debug/ExceptionHandlerTest.php +++ b/tests/system/Debug/ExceptionHandlerTest.php @@ -15,13 +15,13 @@ use App\Controllers\Home; use CodeIgniter\Exceptions\PageNotFoundException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\IniTestTrait; use CodeIgniter\Test\StreamFilterTrait; use Config\Exceptions as ExceptionsConfig; use Config\Services; use PHPUnit\Framework\Attributes\Group; -use RuntimeException; /** * @internal diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php index aa3c2d8b49a6..0a760b79aa61 100644 --- a/tests/system/Debug/ExceptionsTest.php +++ b/tests/system/Debug/ExceptionsTest.php @@ -16,13 +16,13 @@ use CodeIgniter\Entity\Exceptions\CastException; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\Exceptions\PageNotFoundException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; use Config\Exceptions as ExceptionsConfig; use ErrorException; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\RequiresPhp; -use RuntimeException; /** * @internal diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php index eb3cb243b398..d76e35583305 100644 --- a/tests/system/Debug/TimerTest.php +++ b/tests/system/Debug/TimerTest.php @@ -14,9 +14,9 @@ namespace CodeIgniter\Debug; use ArgumentCountError; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\Attributes\Group; -use RuntimeException; /** * @internal diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php index a479be9e8f63..7ac97091a4c7 100644 --- a/tests/system/Format/JSONFormatterTest.php +++ b/tests/system/Format/JSONFormatterTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Format; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\Attributes\Group; -use RuntimeException; /** * @internal diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php index d1455a604f1b..98ce11245a4d 100644 --- a/tests/system/View/ViewTest.php +++ b/tests/system/View/ViewTest.php @@ -15,11 +15,11 @@ use CodeIgniter\Autoloader\FileLocator; use CodeIgniter\Config\Services; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; use Config; use PHPUnit\Framework\Attributes\Group; -use RuntimeException; /** * @internal From 8de2d7004ff8417ae7df2edb87c7a4e182df0058 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 15:02:09 +0900 Subject: [PATCH 6870/8282] test: use CodeIgniter\Exceptions\InvalidArgumentException --- tests/system/AutoReview/ComposerJsonTest.php | 2 +- tests/system/Autoloader/AutoloaderTest.php | 2 +- tests/system/Config/FactoriesTest.php | 2 +- tests/system/Database/Builder/InsertTest.php | 2 +- tests/system/HTTP/IncomingRequestTest.php | 2 +- tests/system/HTTP/MessageTest.php | 2 +- tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php | 2 +- tests/system/Helpers/TextHelperTest.php | 2 +- tests/system/Helpers/URLHelper/MiscUrlTest.php | 2 +- tests/system/Models/UpdateModelTest.php | 2 +- tests/system/Validation/FileRulesTest.php | 2 +- .../system/Validation/StrictRules/DatabaseRelatedRulesTest.php | 2 +- tests/system/Validation/StrictRules/FileRulesTest.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php index 995ef99f4f2b..e7ca88f688c2 100644 --- a/tests/system/AutoReview/ComposerJsonTest.php +++ b/tests/system/AutoReview/ComposerJsonTest.php @@ -13,7 +13,7 @@ namespace CodeIgniter\AutoReview; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; use JsonException; use PHPUnit\Framework\Attributes\CoversNothing; use PHPUnit\Framework\Attributes\Group; diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 094b4cfd6b38..b0dab8d8d841 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -16,13 +16,13 @@ use App\Controllers\Home; use Closure; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\ReflectionHelper; use Config\Autoload; use Config\Modules; use Config\Services; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\PreserveGlobalState; use PHPUnit\Framework\Attributes\RunInSeparateProcess; diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php index 11a5e77a433e..4bebc304f4fa 100644 --- a/tests/system/Config/FactoriesTest.php +++ b/tests/system/Config/FactoriesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Config; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; use Config\App; use Config\Database; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Depends; use PHPUnit\Framework\Attributes\Group; use ReflectionClass; diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php index e021472b72fc..ca778a098408 100644 --- a/tests/system/Database/Builder/InsertTest.php +++ b/tests/system/Database/Builder/InsertTest.php @@ -16,9 +16,9 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Query; use CodeIgniter\Database\RawSql; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockConnection; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; /** diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index eb15b2c37c91..2bbe52897eb5 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -15,11 +15,11 @@ use CodeIgniter\Config\Factories; use CodeIgniter\Exceptions\ConfigException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\HTTP\Files\UploadedFile; use CodeIgniter\Test\CIUnitTestCase; use Config\App; -use InvalidArgumentException; use JsonException; use PHPUnit\Framework\Attributes\BackupGlobals; use PHPUnit\Framework\Attributes\DataProvider; diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php index d16224367a6f..79bfb2dcdf6f 100644 --- a/tests/system/HTTP/MessageTest.php +++ b/tests/system/HTTP/MessageTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; diff --git a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php index ea7b379d0b44..0641c41b2bd0 100644 --- a/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php +++ b/tests/system/Helpers/Array/ArrayHelperDotKeyExistsTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers\Array; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; /** diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php index e3acd7bb9c50..4033e3c72e1a 100755 --- a/tests/system/Helpers/TextHelperTest.php +++ b/tests/system/Helpers/TextHelperTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Helpers; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; /** diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index 87c6a3940208..da25199bf957 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -15,6 +15,7 @@ use CodeIgniter\Config\Factories; use CodeIgniter\Config\Services; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\SiteURIFactory; use CodeIgniter\HTTP\UserAgent; @@ -22,7 +23,6 @@ use CodeIgniter\Superglobals; use CodeIgniter\Test\CIUnitTestCase; use Config\App; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\BackupGlobals; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php index c7c8b9ad51d4..2f9cac3958df 100644 --- a/tests/system/Models/UpdateModelTest.php +++ b/tests/system/Models/UpdateModelTest.php @@ -16,8 +16,8 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Exceptions\DataException; use CodeIgniter\Entity\Entity; +use CodeIgniter\Exceptions\InvalidArgumentException; use Config\Database; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; use stdClass; diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php index 6d59af537a06..ec016ee0dbeb 100644 --- a/tests/system/Validation/FileRulesTest.php +++ b/tests/system/Validation/FileRulesTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\Validation; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; use Config\Services; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php index 1535d265f729..5f8472ec29f0 100644 --- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php +++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\Validation\StrictRules; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use CodeIgniter\Validation\Validation; use Config\Database; use Config\Services; -use InvalidArgumentException; use LogicException; use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php index 07dfc44ad8ce..ab31b5cff06b 100644 --- a/tests/system/Validation/StrictRules/FileRulesTest.php +++ b/tests/system/Validation/StrictRules/FileRulesTest.php @@ -13,10 +13,10 @@ namespace CodeIgniter\Validation\StrictRules; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Validation\Validation; use Config\Services; -use InvalidArgumentException; use PHPUnit\Framework\Attributes\Group; use Tests\Support\Validation\TestRules; From 29b8597bf7c87959771d43b4efaeb861b069cb33 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 15:03:11 +0900 Subject: [PATCH 6871/8282] test: use CodeIgniter\Exceptions\LogicException --- tests/system/Cookie/CookieTest.php | 2 +- tests/system/Database/Live/ForgeTest.php | 2 +- tests/system/HTTP/RedirectExceptionTest.php | 2 +- tests/system/View/ControlledCellTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php index 51016ca0061e..444812c31485 100644 --- a/tests/system/Cookie/CookieTest.php +++ b/tests/system/Cookie/CookieTest.php @@ -14,11 +14,11 @@ namespace CodeIgniter\Cookie; use CodeIgniter\Cookie\Exceptions\CookieException; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Test\CIUnitTestCase; use Config\Cookie as CookieConfig; use DateTimeImmutable; use DateTimeZone; -use LogicException; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php index aa415a9d72a5..53c6a2144819 100644 --- a/tests/system/Database/Live/ForgeTest.php +++ b/tests/system/Database/Live/ForgeTest.php @@ -15,11 +15,11 @@ use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Forge; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use Config\Database; -use LogicException; use PHPUnit\Framework\Attributes\Group; use stdClass; use Tests\Support\Database\Seeds\CITestSeeder; diff --git a/tests/system/HTTP/RedirectExceptionTest.php b/tests/system/HTTP/RedirectExceptionTest.php index e77c0ea060d3..b1f325199cc6 100644 --- a/tests/system/HTTP/RedirectExceptionTest.php +++ b/tests/system/HTTP/RedirectExceptionTest.php @@ -13,12 +13,12 @@ namespace CodeIgniter\HTTP; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\HTTP\Exceptions\RedirectException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Logger; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use Config\Services; -use LogicException; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\TestCase; use Tests\Support\Log\Handlers\TestHandler; diff --git a/tests/system/View/ControlledCellTest.php b/tests/system/View/ControlledCellTest.php index 8448aed22ced..96e3be2e3115 100644 --- a/tests/system/View/ControlledCellTest.php +++ b/tests/system/View/ControlledCellTest.php @@ -13,9 +13,9 @@ namespace CodeIgniter\View; +use CodeIgniter\Exceptions\LogicException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\View\Exceptions\ViewException; -use LogicException; use PHPUnit\Framework\Attributes\Group; use Tests\Support\View\Cells\AdditionCell; use Tests\Support\View\Cells\AwesomeCell; From aae19e6b73433fd4345561cd3216a6d9a9a75508 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 15:03:58 +0900 Subject: [PATCH 6872/8282] test: use CodeIgniter\Exceptions\BadMethodCallException --- tests/system/Database/Live/PreparedQueryTest.php | 2 +- tests/system/HTTP/SiteURITest.php | 2 +- tests/system/Models/GeneralModelTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php index fd3b6cedb403..b44e127283c6 100644 --- a/tests/system/Database/Live/PreparedQueryTest.php +++ b/tests/system/Database/Live/PreparedQueryTest.php @@ -13,11 +13,11 @@ namespace CodeIgniter\Database\Live; -use BadMethodCallException; use CodeIgniter\Database\BasePreparedQuery; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\Query; use CodeIgniter\Database\ResultInterface; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\DatabaseTestTrait; use PHPUnit\Framework\Attributes\Group; diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php index 644aaa795b6d..6aca302e7cc7 100644 --- a/tests/system/HTTP/SiteURITest.php +++ b/tests/system/HTTP/SiteURITest.php @@ -13,7 +13,7 @@ namespace CodeIgniter\HTTP; -use BadMethodCallException; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Exceptions\ConfigException; use CodeIgniter\HTTP\Exceptions\HTTPException; use CodeIgniter\Test\CIUnitTestCase; diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php index d0e50768457a..c0d3d806dbdd 100644 --- a/tests/system/Models/GeneralModelTest.php +++ b/tests/system/Models/GeneralModelTest.php @@ -13,8 +13,8 @@ namespace CodeIgniter\Models; -use BadMethodCallException; use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\Model; use CodeIgniter\Test\CIUnitTestCase; use PHPUnit\Framework\Attributes\Group; From ac9a7164486c7cd4fc0d14a1d70a294675df0328 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 15:04:45 +0900 Subject: [PATCH 6873/8282] test: use narrower exceptions --- .../system/Cache/Handlers/MemcachedHandlerTest.php | 3 ++- tests/system/Cache/ResponseCacheTest.php | 4 ++-- tests/system/Log/LoggerTest.php | 6 +++--- tests/system/Test/ControllerTestTraitTest.php | 13 ++++++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index 4aad8288401c..2e3c69895d21 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -14,6 +14,7 @@ namespace CodeIgniter\Cache\Handlers; use CodeIgniter\CLI\CLI; +use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\I18n\Time; use Config\Cache; use Exception; @@ -125,7 +126,7 @@ public function testDelete(): void public function testDeleteMatching(): void { // Not implemented for Memcached, should throw an exception - $this->expectException(Exception::class); + $this->expectException(BadMethodCallException::class); $this->handler->deleteMatching('key*'); } diff --git a/tests/system/Cache/ResponseCacheTest.php b/tests/system/Cache/ResponseCacheTest.php index b0b73855231a..4888c78bfbcb 100644 --- a/tests/system/Cache/ResponseCacheTest.php +++ b/tests/system/Cache/ResponseCacheTest.php @@ -13,6 +13,7 @@ namespace CodeIgniter\Cache; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\IncomingRequest; use CodeIgniter\HTTP\Response; @@ -23,7 +24,6 @@ use Config\App as AppConfig; use Config\Cache as CacheConfig; use ErrorException; -use Exception; use PHPUnit\Framework\Attributes\BackupGlobals; use PHPUnit\Framework\Attributes\Group; @@ -245,7 +245,7 @@ public function testUnserializeError(): void public function testInvalidCacheError(): void { - $this->expectException(Exception::class); + $this->expectException(RuntimeException::class); $this->expectExceptionMessage('Error unserializing page cache'); $cache = mock(CacheFactory::class); diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php index 9464d4d286fd..09efa7be4a1d 100644 --- a/tests/system/Log/LoggerTest.php +++ b/tests/system/Log/LoggerTest.php @@ -14,11 +14,11 @@ namespace CodeIgniter\Log; use CodeIgniter\Exceptions\FrameworkException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\I18n\Time; use CodeIgniter\Log\Exceptions\LogException; use CodeIgniter\Test\CIUnitTestCase; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; -use Exception; use PHPUnit\Framework\Attributes\Group; use Tests\Support\Log\Handlers\TestHandler; use TypeError; @@ -241,8 +241,8 @@ public function testLogInterpolatesExceptions(): void $expected = 'ERROR - ' . Time::now()->format('Y-m-d') . ' --> [ERROR] These are not the droids you are looking for'; try { - throw new Exception('These are not the droids you are looking for'); - } catch (Exception $e) { + throw new RuntimeException('These are not the droids you are looking for'); + } catch (RuntimeException $e) { $logger->log('error', '[ERROR] {exception}', ['exception' => $e]); } diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index 8230dd9d6248..43fdf7a23b23 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -16,11 +16,12 @@ use App\Controllers\Home; use App\Controllers\NeverHeardOfIt; use CodeIgniter\Controller; +use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Log\Logger; use CodeIgniter\Test\Mock\MockLogger as LoggerConfig; use Config\App; use Config\Services; -use Exception; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\Attributes\PreserveGlobalState; use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses; @@ -50,7 +51,8 @@ protected function setUp(): void public function testBadController(): void { - $this->expectException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); + $logger = new Logger(new LoggerConfig()); $this->withURI('http://example.com') ->withLogger($logger) @@ -60,7 +62,8 @@ public function testBadController(): void public function testBadControllerMethod(): void { - $this->expectException('InvalidArgumentException'); + $this->expectException(InvalidArgumentException::class); + $logger = new Logger(new LoggerConfig()); $this->withURI('http://example.com') ->withLogger($logger) @@ -261,12 +264,12 @@ public function testUsesRequestBody(): void $this->controller = new class () extends Controller { public function throwsBody(): never { - throw new Exception($this->request->getBody()); + throw new RuntimeException($this->request->getBody()); } }; $this->controller->initController($this->request, $this->response, $this->logger); - $this->expectException(Exception::class); + $this->expectException(RuntimeException::class); $this->expectExceptionMessage('banana'); $this->withBody('banana')->execute('throwsBody'); From afe99687a8291b1bda90321ff181a134a37fe8bf Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 16:07:56 +0900 Subject: [PATCH 6874/8282] refactor: use CodeIgniter\Exceptions\InvalidArgumentException --- system/Common.php | 1 + system/Helpers/filesystem_helper.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/system/Common.php b/system/Common.php index f96e9f100f00..96f9d5bb756f 100644 --- a/system/Common.php +++ b/system/Common.php @@ -20,6 +20,7 @@ use CodeIgniter\Database\BaseConnection; use CodeIgniter\Database\ConnectionInterface; use CodeIgniter\Debug\Timer; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\HTTPException; diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php index 2b86654c960e..1ffabc34b056 100644 --- a/system/Helpers/filesystem_helper.php +++ b/system/Helpers/filesystem_helper.php @@ -11,6 +11,8 @@ * the LICENSE file that was distributed with this source code. */ +use CodeIgniter\Exceptions\InvalidArgumentException; + // CodeIgniter File System Helpers if (! function_exists('directory_map')) { From 55128157b6f561597765eadd527c9b169025f481 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 29 Jan 2024 16:08:24 +0900 Subject: [PATCH 6875/8282] refactor: use CodeIgniter\Exceptions\RuntimeException --- system/Common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/system/Common.php b/system/Common.php index 96f9d5bb756f..56cbe0cd5233 100644 --- a/system/Common.php +++ b/system/Common.php @@ -21,6 +21,7 @@ use CodeIgniter\Database\ConnectionInterface; use CodeIgniter\Debug\Timer; use CodeIgniter\Exceptions\InvalidArgumentException; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Files\Exceptions\FileNotFoundException; use CodeIgniter\HTTP\CLIRequest; use CodeIgniter\HTTP\Exceptions\HTTPException; From 99e2ba3ccaa3a815b3150c2af0e3d9811808123b Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 11:46:45 +0900 Subject: [PATCH 6876/8282] refactor: use CodeIgniter\Exceptions\RuntimeException --- system/Commands/Utilities/Optimize.php | 2 +- system/HTTP/Exceptions/BadRequestException.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Commands/Utilities/Optimize.php b/system/Commands/Utilities/Optimize.php index fa7612d524a6..46b24efb2da9 100644 --- a/system/Commands/Utilities/Optimize.php +++ b/system/Commands/Utilities/Optimize.php @@ -17,8 +17,8 @@ use CodeIgniter\Autoloader\FileLocatorCached; use CodeIgniter\CLI\BaseCommand; use CodeIgniter\CLI\CLI; +use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\Publisher\Publisher; -use RuntimeException; /** * Optimize for production. diff --git a/system/HTTP/Exceptions/BadRequestException.php b/system/HTTP/Exceptions/BadRequestException.php index c87f4de294e2..35933dcc1f5c 100644 --- a/system/HTTP/Exceptions/BadRequestException.php +++ b/system/HTTP/Exceptions/BadRequestException.php @@ -14,7 +14,7 @@ namespace CodeIgniter\HTTP\Exceptions; use CodeIgniter\Exceptions\HTTPExceptionInterface; -use RuntimeException; +use CodeIgniter\Exceptions\RuntimeException; /** * 400 Bad Request From 60fddfe7c31e7c41cdff0755dc9eb422834005c2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 11:47:22 +0900 Subject: [PATCH 6877/8282] refactor: use CodeIgniter\Exceptions\InvalidArgumentException --- system/Config/BaseService.php | 2 +- system/DataCaster/Cast/BaseCast.php | 2 +- system/DataCaster/Cast/DatetimeCast.php | 2 +- system/DataCaster/DataCaster.php | 2 +- system/Test/Fabricator.php | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php index cd770dc667ed..551261eda215 100644 --- a/system/Config/BaseService.php +++ b/system/Config/BaseService.php @@ -29,6 +29,7 @@ use CodeIgniter\Debug\Toolbar; use CodeIgniter\Email\Email; use CodeIgniter\Encryption\EncrypterInterface; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Filters\Filters; use CodeIgniter\Format\Format; use CodeIgniter\Honeypot\Honeypot; @@ -78,7 +79,6 @@ use Config\Toolbar as ConfigToolbar; use Config\Validation as ConfigValidation; use Config\View as ConfigView; -use InvalidArgumentException; /** * Services Configuration file. diff --git a/system/DataCaster/Cast/BaseCast.php b/system/DataCaster/Cast/BaseCast.php index c3df0efee103..2a3ca1971674 100644 --- a/system/DataCaster/Cast/BaseCast.php +++ b/system/DataCaster/Cast/BaseCast.php @@ -13,7 +13,7 @@ namespace CodeIgniter\DataCaster\Cast; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; abstract class BaseCast implements CastInterface { diff --git a/system/DataCaster/Cast/DatetimeCast.php b/system/DataCaster/Cast/DatetimeCast.php index 83e66d02217c..b6fa97f9ddda 100644 --- a/system/DataCaster/Cast/DatetimeCast.php +++ b/system/DataCaster/Cast/DatetimeCast.php @@ -14,8 +14,8 @@ namespace CodeIgniter\DataCaster\Cast; use CodeIgniter\Database\BaseConnection; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\I18n\Time; -use InvalidArgumentException; /** * Class DatetimeCast diff --git a/system/DataCaster/DataCaster.php b/system/DataCaster/DataCaster.php index 854a0b50b32c..daeba4b0c0bc 100644 --- a/system/DataCaster/DataCaster.php +++ b/system/DataCaster/DataCaster.php @@ -26,7 +26,7 @@ use CodeIgniter\DataCaster\Cast\URICast; use CodeIgniter\Entity\Cast\CastInterface as EntityCastInterface; use CodeIgniter\Entity\Exceptions\CastException; -use InvalidArgumentException; +use CodeIgniter\Exceptions\InvalidArgumentException; final class DataCaster { diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php index 1f61efef5c62..70f3c3adcc72 100644 --- a/system/Test/Fabricator.php +++ b/system/Test/Fabricator.php @@ -15,13 +15,14 @@ use Closure; use CodeIgniter\Exceptions\FrameworkException; +use CodeIgniter\Exceptions\InvalidArgumentException; use CodeIgniter\Exceptions\RuntimeException; use CodeIgniter\I18n\Time; use CodeIgniter\Model; use Config\App; use Faker\Factory; use Faker\Generator; -use InvalidArgumentException; +use InvalidArgumentException as BaseInvalidArgumentException; /** * Fabricator @@ -359,7 +360,7 @@ protected function guessFormatter($field): string $this->faker->getFormatter($field); return $field; - } catch (InvalidArgumentException) { + } catch (BaseInvalidArgumentException) { // No match, keep going } From f1359ddc136cead22b4b55db2162f20160c83b78 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 16 Apr 2024 13:44:00 +0900 Subject: [PATCH 6878/8282] docs: add user guide --- user_guide_src/source/changelogs/v4.6.0.rst | 64 +++++++++++++++++++ user_guide_src/source/general/errors.rst | 30 ++++++++- .../source/installation/upgrade_460.rst | 9 +++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.6.0.rst b/user_guide_src/source/changelogs/v4.6.0.rst index becb1ec0688c..99d7476299f0 100644 --- a/user_guide_src/source/changelogs/v4.6.0.rst +++ b/user_guide_src/source/changelogs/v4.6.0.rst @@ -23,6 +23,26 @@ BREAKING Behavior Changes ================ +.. _v460-behavior-changes-exceptions: + +Exceptions +---------- + +The exception class has been redesigned. See :ref:`exception-design` for details. +The following breaking changes have been made accordingly: + +- ``Validation::setRule()`` now throws ``CodeIgniter\Exceptions\InvalidArgumentException`` + instead of ``TypeError``. + +- ``CriticalError`` now extends ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``Error``. +- ``DatabaseException`` now extends ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``Error``. +- ``ConfigException`` now extends ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``CodeIgniter\Exceptions\CriticalError``. +- ``TestException`` now extends ``CodeIgniter\Exceptions\LogicException`` + instead of ``CodeIgniter\Exceptions\CriticalError``. + Interface Changes ================= @@ -46,6 +66,24 @@ Removed Deprecated Items Enhancements ************ +Exceptions +========== + +The exception class has been redesigned. See :ref:`exception-design` for details. +The following new Exception classes have been added accordingly: + +- ``CodeIgniter\Exceptions\LogicException`` +- ``CodeIgniter\Exceptions\RuntimeException`` +- ``CodeIgniter\Exceptions\BadFunctionCallException`` +- ``CodeIgniter\Exceptions\BadMethodCallException`` +- ``CodeIgniter\Exceptions\InvalidArgumentException`` + +The following new Exception interfaces have been added: + +- ``CodeIgniter\Files\Exceptions\ExceptionInterface`` +- ``CodeIgniter\HTTP\Exceptions\ExceptionInterface`` +- ``CodeIgniter\Router\Exceptions\ExceptionInterface`` + Commands ======== @@ -84,6 +122,32 @@ Message Changes Changes ******* +Exceptions +========== + +The exception classes have been redesigned. See :ref:`exception-design` for details. +The following changes have been made accordingly: + +- The ``deleteMatching()`` method in Cache Handler classes now throws + ``CodeIgniter\Exceptions\BadMethodCallException`` instead of ``Exception``. +- ``Cache\ResponseCache::get()`` now throws ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``Exception``. +- Classes that threw ``RuntimeException`` have been changed to throw + ``CodeIgniter\Exceptions\RuntimeException``. +- Classes that threw ``InvalidArgumentException`` have been changed to throw + ``CodeIgniter\Exceptions\InvalidArgumentException``. +- Classes that threw ``LogicException`` have been changed to throw + ``CodeIgniter\Exceptions\LogicException``. +- Classes that threw ``BadMethodCallException`` have been changed to throw + ``CodeIgniter\Exceptions\BadMethodCallException``. +- Classes that threw ``BadFunctionCallException`` have been changed to throw + ``CodeIgniter\Exceptions\BadFunctionCallException``. + +- ``RedirectException`` now extends ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``Exception``. +- ``PageNotFoundException`` now extends ``CodeIgniter\Exceptions\RuntimeException`` + instead of ``OutOfBoundsException``. + ************ Deprecations ************ diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 2b6eafce8c33..3d95498a7a28 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -121,7 +121,35 @@ setting the environment variable ``CODEIGNITER_SCREAM_DEPRECATIONS`` to a truthy Framework Exceptions ==================== -The following framework exceptions are available: +.. _exception-design: + +Exception Design +---------------- + +Staring with v4.6.0, all Exception classes that the framework throws: + +- implement ``CodeIgniter\Exceptions\ExceptionInterface`` +- extend ``CodeIgniter\Exceptions\LogicException`` or ``CodeIgniter\Exceptions\RuntimeException`` + +.. note:: The framework only throws the above kind of exception classes, but PHP + or other libraries that are used may throw other exceptions. + +There are two base Exception classes that the framework throws: + +LogicException +-------------- + +``CodeIgniter\Exceptions\LogicException`` extends ``\LogicException``. +This exception represents error in the program logic. This kind of exception +should lead directly to a fix in your code. + +RuntimeException +---------------- + +``CodeIgniter\Exceptions\RuntimeException`` extends ``\RuntimeException``. +This exception is thrown if an error which can only be found on runtime occurs. + +The following framework exceptions are also available: PageNotFoundException --------------------- diff --git a/user_guide_src/source/installation/upgrade_460.rst b/user_guide_src/source/installation/upgrade_460.rst index 4344f7565b55..94f69a2322f9 100644 --- a/user_guide_src/source/installation/upgrade_460.rst +++ b/user_guide_src/source/installation/upgrade_460.rst @@ -20,6 +20,15 @@ Mandatory File Changes Breaking Changes **************** +Exception Changes +================= + +Some classes have changed the exception classes that are thrown. Some exception +classes have changed parent classes. +See :ref:`ChangeLog ` for details. + +If you have code that catches these exceptions, change the exception classes. + Removed Deprecated Items ======================== From e1d3516208e6ed6a58e13e8a6cae76cc8c42c388 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 6 May 2024 19:27:45 +0900 Subject: [PATCH 6879/8282] refactor: by rector --- tests/system/Cache/Handlers/MemcachedHandlerTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php index 2e3c69895d21..991e31d1b75c 100644 --- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php +++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php @@ -17,7 +17,6 @@ use CodeIgniter\Exceptions\BadMethodCallException; use CodeIgniter\I18n\Time; use Config\Cache; -use Exception; use PHPUnit\Framework\Attributes\Group; /** From 2f9f9d69a09154d7351ce780a9b246b9f5f43069 Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 6 May 2024 13:15:55 +0200 Subject: [PATCH 6880/8282] docs: Small typo in libraries/file_collections.rst Small typo in libraries/file_collections.rst --- user_guide_src/source/libraries/file_collections.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index 4b54f0ab07a8..a60784d32372 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -13,7 +13,7 @@ locating and working with groups of files across the filesystem. Basic Usage *********** -At its most basic, ``FileCollection`` is an index +At its most basic, ``FileCollection`` is an array of files you set or build: .. literalinclude:: files/011.php From c1395479e88969f0e1e809ec058438d37764546b Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 6 May 2024 13:29:56 +0200 Subject: [PATCH 6881/8282] docs: Small typos in libraries/honeypot.rst Small typos in libraries/honeypot.rst --- user_guide_src/source/libraries/honeypot.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst index e034e0dc08db..c6ebf14af0ce 100644 --- a/user_guide_src/source/libraries/honeypot.rst +++ b/user_guide_src/source/libraries/honeypot.rst @@ -3,7 +3,7 @@ Honeypot Class ############## The Honeypot Class makes it possible to determine when a Bot makes a request to a CodeIgniter4 application, -if it's enabled in **app\Config\Filters.php** file. This is done by attaching form fields to any form, +if it's enabled in **app/Config/Filters.php** file. This is done by attaching form fields to any form, and this form field is hidden from a human but accessible to a Bot. When data is entered into the field, it's assumed the request is coming from a Bot, and you can throw a ``HoneypotException``. @@ -22,7 +22,7 @@ from the ``$globals`` array, like: A sample Honeypot filter is bundled, as **system/Filters/Honeypot.php**. If it is not suitable, make your own at **app/Filters/Honeypot.php**, -and modify the ``$aliases`` in the configuration appropriately. +and modify the ``$aliases`` in **app/Config/Filters.php** appropriately. ******************** Customizing Honeypot @@ -37,4 +37,4 @@ Honeypot can be customized. The fields below can be set either in * ``$template`` - form field template used for the honeypot; default is ``''`` * ``$container`` - container tag for the template; default is ``'
        {template}
        '``. If you enables CSP, you can remove ``style="display:none"``. -* ``$containerId`` - [Since v4.3.0] this setting is used only when you enables CSP. You can change the id attribute for the container tag; default is ``'hpc'`` +* ``$containerId`` - [Since v4.3.0] this setting is used only when you enable CSP. You can change the id attribute for the container tag; default is ``'hpc'`` From 737846eea1c4c6198478df2cf784a4dd1fe67c47 Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Wed, 8 May 2024 00:05:19 +0800 Subject: [PATCH 6882/8282] enable `ordered_attributes` --- .php-cs-fixer.dist.php | 1 + .php-cs-fixer.no-header.php | 1 + .php-cs-fixer.tests.php | 1 + .php-cs-fixer.user-guide.php | 1 + 4 files changed, 4 insertions(+) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 478b266693e8..4ce5e25fbc1d 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -44,6 +44,7 @@ $overrides = [ // for updating to coding-standard 'modernize_strpos' => true, + 'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'], 'php_unit_attributes' => true, ]; diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php index f46f526120e0..e7d9647e317e 100644 --- a/.php-cs-fixer.no-header.php +++ b/.php-cs-fixer.no-header.php @@ -32,6 +32,7 @@ $overrides = [ // for updating to coding-standard 'modernize_strpos' => true, + 'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'], 'php_unit_attributes' => true, ]; diff --git a/.php-cs-fixer.tests.php b/.php-cs-fixer.tests.php index 404959f26fce..1b4bfd71e30d 100644 --- a/.php-cs-fixer.tests.php +++ b/.php-cs-fixer.tests.php @@ -37,6 +37,7 @@ 'void_return' => true, // for updating to coding-standard 'modernize_strpos' => true, + 'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'], 'php_unit_attributes' => true, ]; diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php index 5356cef28d93..3be7cd45c708 100644 --- a/.php-cs-fixer.user-guide.php +++ b/.php-cs-fixer.user-guide.php @@ -41,6 +41,7 @@ ], // for updating to coding-standard 'modernize_strpos' => true, + 'ordered_attributes' => ['order' => [], 'sort_algorithm' => 'alpha'], 'php_unit_attributes' => true, ]; From 13015dbb94da4e8b0732c89ee55906dd7f7f78db Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Wed, 8 May 2024 00:05:51 +0800 Subject: [PATCH 6883/8282] run `composer cs-fix` --- tests/system/Autoloader/AutoloaderTest.php | 2 +- tests/system/CodeIgniterTest.php | 2 +- tests/system/Commands/GenerateKeyTest.php | 2 +- tests/system/CommonFunctionsSendTest.php | 2 +- tests/system/CommonFunctionsTest.php | 18 +++--- tests/system/CommonHelperTest.php | 2 +- tests/system/Config/BaseConfigTest.php | 6 +- tests/system/Config/DotEnvTest.php | 4 +- tests/system/Config/ServicesTest.php | 14 ++--- tests/system/DebugTraceableTraitTest.php | 2 +- tests/system/Events/EventsTest.php | 2 +- tests/system/Filters/HoneypotTest.php | 4 +- tests/system/Filters/InvalidCharsTest.php | 2 +- .../system/HTTP/ContentSecurityPolicyTest.php | 62 +++++++++---------- tests/system/HTTP/DownloadResponseTest.php | 2 +- tests/system/HTTP/IncomingRequestTest.php | 2 +- tests/system/HTTP/RedirectResponseTest.php | 14 ++--- tests/system/HTTP/ResponseSendTest.php | 6 +- tests/system/Helpers/FormHelperTest.php | 6 +- .../system/Helpers/URLHelper/MiscUrlTest.php | 8 +-- .../system/RESTful/ResourceControllerTest.php | 4 +- .../system/RESTful/ResourcePresenterTest.php | 4 +- .../SecurityCSRFSessionRandomizeTokenTest.php | 4 +- .../Security/SecurityCSRFSessionTest.php | 4 +- tests/system/Session/SessionTest.php | 4 +- tests/system/Test/ControllerTestTraitTest.php | 4 +- tests/system/Test/TestCaseEmissionsTest.php | 4 +- tests/system/View/ParserPluginTest.php | 4 +- 28 files changed, 97 insertions(+), 97 deletions(-) diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php index 647b041d5f78..04dfe04e991f 100644 --- a/tests/system/Autoloader/AutoloaderTest.php +++ b/tests/system/Autoloader/AutoloaderTest.php @@ -392,8 +392,8 @@ public function testAutoloaderLoadsNonClassFiles(): void $loader->unregister(); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testLoadHelpers(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php index b3908b462777..a550e098e9b0 100644 --- a/tests/system/CodeIgniterTest.php +++ b/tests/system/CodeIgniterTest.php @@ -40,9 +40,9 @@ /** * @internal */ -#[RunTestsInSeparateProcesses] #[BackupGlobals(true)] #[Group('Others')] +#[RunTestsInSeparateProcesses] final class CodeIgniterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php index 85bd0f9078c2..289a294f5d0c 100644 --- a/tests/system/Commands/GenerateKeyTest.php +++ b/tests/system/Commands/GenerateKeyTest.php @@ -88,8 +88,8 @@ public function testGenerateKeyShowsEncodedKey(): void $this->assertStringContainsString('hex2bin:', $this->getBuffer()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testGenerateKeyCreatesNewKey(): void { command('key:generate'); diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php index 8af14200ea7f..46871c6284df 100644 --- a/tests/system/CommonFunctionsSendTest.php +++ b/tests/system/CommonFunctionsSendTest.php @@ -39,8 +39,8 @@ protected function setUp(): void * Make sure cookies are set by RedirectResponse this way * See https://github.com/codeigniter4/CodeIgniter4/issues/1393 */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRedirectResponseCookiesSent(): void { $loginTime = time(); diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php index 226f9f79c776..fbbece86ddd1 100644 --- a/tests/system/CommonFunctionsTest.php +++ b/tests/system/CommonFunctionsTest.php @@ -272,8 +272,8 @@ public function testEscapeRecursiveArrayRaw(): void $this->assertSame($data, esc($data, 'raw')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSessionInstance(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -285,8 +285,8 @@ public function testSessionInstance(): void $this->assertInstanceOf(Session::class, session()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSessionVariable(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -300,8 +300,8 @@ public function testSessionVariable(): void $this->assertSame('Hi there', session('notbogus')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSessionVariableNotThere(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -426,8 +426,8 @@ public function testModelExistsAbsoluteClassname(): void $this->assertInstanceOf(JobModel::class, model(JobModel::class)); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testOldInput(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -463,8 +463,8 @@ public function testOldInput(): void $this->assertSame('fritz', old('zibble')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testOldInputSerializeData(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -501,8 +501,8 @@ public function testOldInputSerializeData(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testOldInputArray(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -620,8 +620,8 @@ public function testRedirectResponseCookies1(): void $this->assertTrue($answer1->hasCookie('login_time')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testTrace(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -645,8 +645,8 @@ public function testViewNotSaveData(): void $this->assertStringContainsString('

        is_not

        ', view('\Tests\Support\View\Views\simples')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testForceHttpsNullRequestAndResponse(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -761,8 +761,8 @@ public function testDWithCSP(): void Kint::$cli_detection = $cliDetection; } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testTraceWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php index 819b5c582d4c..90b417d41639 100644 --- a/tests/system/CommonHelperTest.php +++ b/tests/system/CommonHelperTest.php @@ -25,8 +25,8 @@ /** * @internal */ -#[Group('Others')] #[CoversFunction('helper')] +#[Group('Others')] final class CommonHelperTest extends CIUnitTestCase { private array $dummyHelpers = [ diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php index 68776b671fda..c8e27dce75ef 100644 --- a/tests/system/Config/BaseConfigTest.php +++ b/tests/system/Config/BaseConfigTest.php @@ -101,8 +101,8 @@ public function testUseDefaultValueTypeStringValue(): void $this->assertSame('123456', $config->password); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testServerValues(): void { $_SERVER = [ @@ -195,8 +195,8 @@ public function testSetsDefaultValues(): void $this->assertSame('bar', $config->second); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -208,8 +208,8 @@ public function testSetsDefaultValuesEncryptionUsingHex2Bin(): void $this->assertSame('OpenSSL', $config->driver); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSetDefaultValuesEncryptionUsingBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php index 8ffc4c5dafbc..db54d2663820 100644 --- a/tests/system/Config/DotEnvTest.php +++ b/tests/system/Config/DotEnvTest.php @@ -89,8 +89,8 @@ public static function provideLoadsVars(): iterable ]; } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testLoadsHex2Bin(): void { $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env'); @@ -101,8 +101,8 @@ public function testLoadsHex2Bin(): void $this->assertSame('OpenSSL', getenv('encryption.driver')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testLoadsBase64(): void { $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env'); diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php index 17b97dd2e259..7825687841c7 100644 --- a/tests/system/Config/ServicesTest.php +++ b/tests/system/Config/ServicesTest.php @@ -243,24 +243,24 @@ public function testNewViewcell(): void $this->assertInstanceOf(Cell::class, $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testNewSession(): void { $actual = Services::session(); $this->assertInstanceOf(Session::class, $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testNewSessionWithNullConfig(): void { $actual = Services::session(null, false); $this->assertInstanceOf(Session::class, $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testCallStatic(): void { // __callStatic should kick in for this but fail @@ -271,8 +271,8 @@ public function testCallStatic(): void $this->assertInstanceOf(Session::class, $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testCallStaticDirectly(): void { // $actual = \CodeIgniter\Config\Services::SeSsIoN(null, false); // original @@ -280,8 +280,8 @@ public function testCallStaticDirectly(): void $this->assertInstanceOf(Session::class, $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testMockInjection(): void { Services::injectMock('response', new MockResponse(new App())); @@ -300,8 +300,8 @@ public function testMockInjection(): void $this->assertSame($response, $response3); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testReset(): void { Services::injectMock('response', new MockResponse(new App())); @@ -317,8 +317,8 @@ public function testReset(): void $this->assertNotSame($response2, $response); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testResetSingle(): void { Services::injectMock('response', new MockResponse(new App())); diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php index bd41fda23e33..26161d8de683 100644 --- a/tests/system/DebugTraceableTraitTest.php +++ b/tests/system/DebugTraceableTraitTest.php @@ -22,8 +22,8 @@ /** * @internal */ -#[Group('Others')] #[CoversClass(DebugTraceableTrait::class)] +#[Group('Others')] final class DebugTraceableTraitTest extends CIUnitTestCase { public function testFactoryInstanceReturnsWhereItIsRaised(): void diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php index 8ea4fc54f4ce..a2de4fb2f432 100644 --- a/tests/system/Events/EventsTest.php +++ b/tests/system/Events/EventsTest.php @@ -49,8 +49,8 @@ protected function tearDown(): void Events::simulate(false); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testInitialize(): void { /** diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php index ee7b37a8df73..50909abe5a3e 100644 --- a/tests/system/Filters/HoneypotTest.php +++ b/tests/system/Filters/HoneypotTest.php @@ -94,8 +94,8 @@ public function testBeforeClean(): void $this->assertSame($expected, $request); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testAfter(): void { $this->config->globals = [ @@ -114,8 +114,8 @@ public function testAfter(): void $this->assertStringContainsString($this->honey->name, $this->response->getBody()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testAfterNotApplicable(): void { $this->config->globals = [ diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php index ea2ee644b135..a0546ef586bc 100644 --- a/tests/system/Filters/InvalidCharsTest.php +++ b/tests/system/Filters/InvalidCharsTest.php @@ -112,8 +112,8 @@ public function testBeforeInvalidControlCharCausesException(): void $this->invalidChars->before($this->request); } - #[DoesNotPerformAssertions] #[DataProvider('provideCheckControlStringWithLineBreakAndTabReturnsTheString')] + #[DoesNotPerformAssertions] public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string $input): void { $_GET['val'] = $input; diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php index 50d93e8c0412..31c915b09b1b 100644 --- a/tests/system/HTTP/ContentSecurityPolicyTest.php +++ b/tests/system/HTTP/ContentSecurityPolicyTest.php @@ -72,8 +72,8 @@ protected function work(string $parm = 'Hello') return $buffer; } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testExistence(): void { $this->prepare(); @@ -82,8 +82,8 @@ public function testExistence(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testReportOnly(): void { $this->prepare(); @@ -93,8 +93,8 @@ public function testReportOnly(): void $this->assertHeaderEmitted('Content-Security-Policy:'); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testDefaults(): void { $this->prepare(); @@ -110,8 +110,8 @@ public function testDefaults(): void $this->assertStringContainsString("style-src 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testChildSrc(): void { $this->prepare(); @@ -125,8 +125,8 @@ public function testChildSrc(): void $this->assertStringContainsString("child-src 'self' good.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testConnectSrc(): void { $this->prepare(); @@ -139,8 +139,8 @@ public function testConnectSrc(): void $this->assertStringContainsString("connect-src 'self' iffy.com maybe.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testFontSrc(): void { $this->prepare(); @@ -155,8 +155,8 @@ public function testFontSrc(): void $this->assertStringContainsString('font-src fontsrus.com;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testFormAction(): void { $this->prepare(); @@ -171,8 +171,8 @@ public function testFormAction(): void $this->assertStringNotContainsString("form-action 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testFrameAncestor(): void { $this->prepare(); @@ -186,8 +186,8 @@ public function testFrameAncestor(): void $this->assertStringContainsString("frame-ancestors 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testFrameSrc(): void { $this->prepare(); @@ -201,8 +201,8 @@ public function testFrameSrc(): void $this->assertStringContainsString("frame-src 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testImageSrc(): void { $this->prepare(); @@ -216,8 +216,8 @@ public function testImageSrc(): void $this->assertStringContainsString("img-src 'self' cdn.cloudy.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testMediaSrc(): void { $this->prepare(); @@ -231,8 +231,8 @@ public function testMediaSrc(): void $this->assertStringContainsString("media-src 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testManifestSrc(): void { $this->prepare(); @@ -246,8 +246,8 @@ public function testManifestSrc(): void $this->assertStringContainsString('manifest-src cdn.cloudy.com;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testPluginType(): void { $this->prepare(); @@ -261,8 +261,8 @@ public function testPluginType(): void $this->assertStringContainsString("plugin-types 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testPluginArray(): void { $this->prepare(); @@ -274,8 +274,8 @@ public function testPluginArray(): void $this->assertStringContainsString('plugin-types application/x-shockwave-flash application/wacky-hacky;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testObjectSrc(): void { $this->prepare(); @@ -289,8 +289,8 @@ public function testObjectSrc(): void $this->assertStringContainsString("object-src 'self' cdn.cloudy.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testScriptSrc(): void { $this->prepare(); @@ -304,8 +304,8 @@ public function testScriptSrc(): void $this->assertStringContainsString("script-src 'self' cdn.cloudy.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testStyleSrc(): void { $this->prepare(); @@ -319,8 +319,8 @@ public function testStyleSrc(): void $this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBaseURIDefault(): void { $this->prepare(); @@ -330,8 +330,8 @@ public function testBaseURIDefault(): void $this->assertStringContainsString("base-uri 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBaseURI(): void { $this->prepare(); @@ -342,8 +342,8 @@ public function testBaseURI(): void $this->assertStringContainsString('base-uri example.com;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBaseURIRich(): void { $this->prepare(); @@ -354,8 +354,8 @@ public function testBaseURIRich(): void $this->assertStringContainsString("base-uri 'self' example.com;", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testDefaultSrc(): void { $this->prepare(); @@ -368,8 +368,8 @@ public function testDefaultSrc(): void $this->assertStringContainsString('default-src iffy.com;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testReportURI(): void { $this->prepare(); @@ -381,8 +381,8 @@ public function testReportURI(): void $this->assertStringContainsString('report-uri http://example.com/csptracker;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSandboxFlags(): void { $this->prepare(); @@ -395,8 +395,8 @@ public function testSandboxFlags(): void $this->assertStringContainsString('sandbox allow-popups allow-top-navigation;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testUpgradeInsecureRequests(): void { $this->prepare(); @@ -407,8 +407,8 @@ public function testUpgradeInsecureRequests(): void $this->assertStringContainsString('upgrade-insecure-requests;', $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBodyEmpty(): void { $this->prepare(); @@ -418,8 +418,8 @@ public function testBodyEmpty(): void $this->assertSame($body, $this->response->getBody()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBodyScriptNonce(): void { $this->prepare(); @@ -493,8 +493,8 @@ public function testBodyStyleNonceDisableAutoNonce(): void $result->assertHeader('Content-Security-Policy'); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testBodyStyleNonce(): void { $this->prepare(); @@ -530,8 +530,8 @@ public function testBodyStyleNonceCustomStyleTag(): void $this->assertStringContainsString('nonce=', $response->getBody()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeaderWrongCaseNotFound(): void { $this->prepare(); @@ -541,8 +541,8 @@ public function testHeaderWrongCaseNotFound(): void $this->assertNull($result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeaderIgnoreCase(): void { $this->prepare(); @@ -552,8 +552,8 @@ public function testHeaderIgnoreCase(): void $this->assertStringContainsString("base-uri 'self';", $result); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testCSPDisabled(): void { $this->prepare(false); @@ -581,8 +581,8 @@ public function testGetStyleNonce(): void $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled(): void { $this->prepare(); diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php index 20d9d1f39784..2f27bc4651ea 100644 --- a/tests/system/HTTP/DownloadResponseTest.php +++ b/tests/system/HTTP/DownloadResponseTest.php @@ -319,8 +319,8 @@ public function testPretendOutput(): void $this->assertSame(file_get_contents(__FILE__), $actual); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRealOutput(): void { $response = new DownloadResponse('unit-test.php', false); diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php index eb15b2c37c91..f76ea4a0c7cf 100644 --- a/tests/system/HTTP/IncomingRequestTest.php +++ b/tests/system/HTTP/IncomingRequestTest.php @@ -148,8 +148,8 @@ public function testCanGetOldInputArrayWithSESSION(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492 */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testCanGetOldInputArrayWithSessionService(): void { $locations = [ diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php index b1dc20121903..a800ce0afb2b 100644 --- a/tests/system/HTTP/RedirectResponseTest.php +++ b/tests/system/HTTP/RedirectResponseTest.php @@ -131,8 +131,8 @@ public function testRedirectRelativeConvertsToFullURI(): void $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testWithInput(): void { $_SESSION = []; @@ -149,8 +149,8 @@ public function testWithInput(): void $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testWithValidationErrors(): void { $_SESSION = []; @@ -167,8 +167,8 @@ public function testWithValidationErrors(): void $this->assertArrayHasKey('_ci_validation_errors', $_SESSION); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testWith(): void { $_SESSION = []; @@ -181,8 +181,8 @@ public function testWith(): void $this->assertArrayHasKey('foo', $_SESSION); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRedirectBack(): void { $_SERVER['HTTP_REFERER'] = 'http://somewhere.com'; @@ -196,8 +196,8 @@ public function testRedirectBack(): void $this->assertSame('http://somewhere.com', $returned->header('location')->getValue()); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRedirectBackMissing(): void { $_SESSION = []; @@ -212,8 +212,8 @@ public function testRedirectBackMissing(): void /** * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119 */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRedirectRouteBaseUrl(): void { $config = new App(); @@ -249,8 +249,8 @@ public function testWithCookies(): void $this->assertTrue($response->hasCookie('foo', 'bar')); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testWithCookiesWithEmptyCookies(): void { $_SESSION = []; diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php index cd78155bb656..d910b2de5c29 100644 --- a/tests/system/HTTP/ResponseSendTest.php +++ b/tests/system/HTTP/ResponseSendTest.php @@ -45,8 +45,8 @@ final class ResponseSendTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeadersMissingDate(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -81,8 +81,8 @@ public function testHeadersMissingDate(): void * This test does not test that CSP is handled properly - * it makes sure that sending gives CSP a chance to do its thing. */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeadersWithCSP(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -120,8 +120,8 @@ public function testHeadersWithCSP(): void * * @see https://github.com/codeigniter4/CodeIgniter4/issues/1393 */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testRedirectResponseCookies(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php index a74582b67ebf..35ed834a174c 100644 --- a/tests/system/Helpers/FormHelperTest.php +++ b/tests/system/Helpers/FormHelperTest.php @@ -955,8 +955,8 @@ public function testSetCheckboxWithUnchecked(): void ); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSetRadioFromSessionOldInput(): void { $_SESSION = [ @@ -973,8 +973,8 @@ public function testSetRadioFromSessionOldInput(): void unset($_SESSION['_ci_old_input']); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSetRadioFromPost(): void { $_POST['bar'] = 'baz'; @@ -984,8 +984,8 @@ public function testSetRadioFromPost(): void $this->assertSame('', set_radio('bar', 'boop', true)); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testSetRadioFromPostWithValueZero(): void { $_POST['bar'] = '0'; diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php index 87c6a3940208..d38db01c56bf 100644 --- a/tests/system/Helpers/URLHelper/MiscUrlTest.php +++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php @@ -58,9 +58,9 @@ protected function tearDown(): void $_SERVER = []; } - #[RunInSeparateProcess] - #[PreserveGlobalState(false)] #[Group('SeparateProcess')] + #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testPreviousURLUsesSessionFirst(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -93,9 +93,9 @@ private function createRequest(string $uri): void Factories::injectMock('config', 'App', $this->config); } - #[RunInSeparateProcess] - #[PreserveGlobalState(false)] #[Group('SeparateProcess')] + #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testPreviousURLUsesRefererIfNeeded(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php index dcf59b1c3c19..000abee6e317 100644 --- a/tests/system/RESTful/ResourceControllerTest.php +++ b/tests/system/RESTful/ResourceControllerTest.php @@ -42,9 +42,9 @@ * * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class ResourceControllerTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php index 42772edd09a7..5d98dee4e583 100644 --- a/tests/system/RESTful/ResourcePresenterTest.php +++ b/tests/system/RESTful/ResourcePresenterTest.php @@ -36,9 +36,9 @@ * * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class ResourcePresenterTest extends CIUnitTestCase { private CodeIgniter $codeigniter; diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php index d49973488b8e..7e8f753d08e0 100644 --- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php +++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php @@ -40,9 +40,9 @@ /** * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase { /** diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php index 501967c0c28e..771193bc3171 100644 --- a/tests/system/Security/SecurityCSRFSessionTest.php +++ b/tests/system/Security/SecurityCSRFSessionTest.php @@ -38,9 +38,9 @@ /** * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class SecurityCSRFSessionTest extends CIUnitTestCase { /** diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php index 39479d03f21d..9faadb66b219 100644 --- a/tests/system/Session/SessionTest.php +++ b/tests/system/Session/SessionTest.php @@ -29,9 +29,9 @@ /** * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class SessionTest extends CIUnitTestCase { protected function setUp(): void diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php index 8230dd9d6248..8708bcce2008 100644 --- a/tests/system/Test/ControllerTestTraitTest.php +++ b/tests/system/Test/ControllerTestTraitTest.php @@ -32,9 +32,9 @@ * * @internal */ -#[RunTestsInSeparateProcesses] -#[PreserveGlobalState(false)] #[Group('SeparateProcess')] +#[PreserveGlobalState(false)] +#[RunTestsInSeparateProcesses] final class ControllerTestTraitTest extends CIUnitTestCase { use ControllerTestTrait; diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php index 83f695d8302e..e46a4bf5581d 100644 --- a/tests/system/Test/TestCaseEmissionsTest.php +++ b/tests/system/Test/TestCaseEmissionsTest.php @@ -43,8 +43,8 @@ final class TestCaseEmissionsTest extends CIUnitTestCase * The tests includes a basic sanity check, to make sure that * the body we thought would be sent actually was. */ - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeadersEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. @@ -73,8 +73,8 @@ public function testHeadersEmitted(): void $this->assertHeaderEmitted('set-cookie: FOO=bar', true); } - #[RunInSeparateProcess] #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testHeadersNotEmitted(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php index 31b6ebba5b48..e37aab0e2309 100644 --- a/tests/system/View/ParserPluginTest.php +++ b/tests/system/View/ParserPluginTest.php @@ -46,9 +46,9 @@ public function testCurrentURL(): void $this->assertSame(current_url(), $this->parser->renderString($template)); } - #[RunInSeparateProcess] - #[PreserveGlobalState(false)] #[Group('SeparateProcess')] + #[PreserveGlobalState(false)] + #[RunInSeparateProcess] public function testPreviousURL(): void { // Workaround for errors on PHPUnit 10 and PHP 8.3. From e132901016f90ecfb52fc3b7b891bc340639876b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 08:55:57 +0900 Subject: [PATCH 6884/8282] chore: remove sqlsrv ext version Use the latest. --- .github/workflows/test-phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml index afc6d56ace2c..ba566ce5c9d1 100644 --- a/.github/workflows/test-phpunit.yml +++ b/.github/workflows/test-phpunit.yml @@ -114,7 +114,7 @@ jobs: enable-artifact-upload: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }} enable-coverage: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }} enable-profiling: ${{ matrix.php-version == needs.coverage-php-version.outputs.version }} - extra-extensions: mysqli, oci8, pgsql, sqlsrv-5.10.1, sqlite3 + extra-extensions: mysqli, oci8, pgsql, sqlsrv, sqlite3 extra-composer-options: ${{ matrix.composer-option }} separate-process-tests: From be71fbb726d67213fd3f51e7733d48a7ead0600e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 08:56:38 +0900 Subject: [PATCH 6885/8282] chore: add db extentions --- .github/workflows/test-psalm.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml index 98ca5c44c5b3..a623109fbb15 100644 --- a/.github/workflows/test-psalm.yml +++ b/.github/workflows/test-psalm.yml @@ -34,8 +34,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.1' - tools: phpstan, phpunit - extensions: intl, json, mbstring, xml, oci8 + extensions: intl, json, mbstring, xml, mysqli, oci8, pgsql, sqlsrv, sqlite3 coverage: none env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7485e25ec1f9aa61c8b61f136c41891abbefa6c5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:01:02 +0900 Subject: [PATCH 6886/8282] docs: update comment --- app/Config/Exceptions.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php index c240675efb37..4e3396346b80 100644 --- a/app/Config/Exceptions.php +++ b/app/Config/Exceptions.php @@ -60,12 +60,10 @@ class Exceptions extends BaseConfig /** * -------------------------------------------------------------------------- - * LOG DEPRECATIONS INSTEAD OF THROWING? + * WHETHER TO THROW AN EXCEPTION ON DEPRECATED ERRORS * -------------------------------------------------------------------------- - * By default, CodeIgniter converts deprecations into exceptions. Also, - * starting in PHP 8.1 will cause a lot of deprecated usage warnings. - * Use this option to temporarily cease the warnings and instead log those. - * This option also works for user deprecations. + * If set to `true`, DEPRECATED errors are only logged and no exceptions are + * thrown. This option also works for user deprecations. */ public bool $logDeprecations = true; From da1203aa007563d2d3f50750705e71d1629a6d23 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:01:31 +0900 Subject: [PATCH 6887/8282] docs: update "Logging Deprecation Warnings" It was a bit misleading. Now by default, CI4 does not throw Exceptions for deprecation errors. --- user_guide_src/source/general/errors.rst | 24 ++++++++++++++++---- user_guide_src/source/general/errors/012.php | 7 +++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 2b6eafce8c33..061676aff050 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -94,12 +94,26 @@ Logging Deprecation Warnings .. versionadded:: 4.3.0 -By default, all errors reported by ``error_reporting()`` will be thrown as an ``ErrorException`` object. These -include both ``E_DEPRECATED`` and ``E_USER_DEPRECATED`` errors. With the surge in use of PHP 8.1+, many users -may see exceptions thrown for `passing null to non-nullable arguments of internal functions `_. -To ease the migration to PHP 8.1, you can instruct CodeIgniter to log the deprecations instead of throwing them. +Prior to v4.3.0, all errors reported by ``error_reporting()`` will be thrown as +an ``ErrorException`` object. -First, make sure your copy of ``Config\Exceptions`` is updated with the two new properties and set as follows: +But with the surge in use of PHP 8.1+, many users may see exceptions thrown for +`passing null to non-nullable arguments of internal functions `_. + +To ease the migration to PHP 8.1, starting with v4.3.0, CodeIgniter has the feature +that only logs the deprecation errors (``E_DEPRECATED`` and ``E_USER_DEPRECATED``) +without throwing them as exceptions. + +By default, CodeIgniter will only log deprecations without throwing exceptions in +development environment. In production environment, no logging is done and no +exceptions are thrown. + +Configuration +^^^^^^^^^^^^^ + +The settings for this feature are as follows. +First, make sure your copy of ``Config\Exceptions`` is updated with the two new +properties and set as follows: .. literalinclude:: errors/012.php diff --git a/user_guide_src/source/general/errors/012.php b/user_guide_src/source/general/errors/012.php index 1b773613143c..4c534b21bc1b 100644 --- a/user_guide_src/source/general/errors/012.php +++ b/user_guide_src/source/general/errors/012.php @@ -7,8 +7,9 @@ class Exceptions extends BaseConfig { - // ... other properties - - public bool $logDeprecations = true; + // ... + public bool $logDeprecations = true; // If set to false, an exception will be thrown. + // ... public string $deprecationLogLevel = LogLevel::WARNING; // this should be one of the log levels supported by PSR-3 + // ... } From 185e41bc95e0963c8bd52055827e42e961346620 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:04:27 +0900 Subject: [PATCH 6888/8282] docs: update comment --- user_guide_src/source/general/errors/012.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors/012.php b/user_guide_src/source/general/errors/012.php index 4c534b21bc1b..2c81e8784757 100644 --- a/user_guide_src/source/general/errors/012.php +++ b/user_guide_src/source/general/errors/012.php @@ -10,6 +10,6 @@ class Exceptions extends BaseConfig // ... public bool $logDeprecations = true; // If set to false, an exception will be thrown. // ... - public string $deprecationLogLevel = LogLevel::WARNING; // this should be one of the log levels supported by PSR-3 + public string $deprecationLogLevel = LogLevel::WARNING; // This should be one of the log levels supported by PSR-3. // ... } From 53fccdc831f3afe7ac9045230f4afb4a611cb256 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:17:03 +0900 Subject: [PATCH 6889/8282] docs: update sample config --- user_guide_src/source/general/errors/013.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/general/errors/013.php b/user_guide_src/source/general/errors/013.php index 23352f0ef54e..b099c6d19b3c 100644 --- a/user_guide_src/source/general/errors/013.php +++ b/user_guide_src/source/general/errors/013.php @@ -6,7 +6,8 @@ class Logger extends BaseConfig { - // .. other properties - - public $threshold = 5; // originally 4 but changed to 5 to log the warnings from the deprecations + // ... + // This must contain the log level (5 for LogLevel::WARNING) corresponding to $deprecationLogLevel. + public $threshold = (ENVIRONMENT === 'production') ? 4 : 9; + // ... } From 02c71f9c306e47ac500104b5495f6d86bcd743bf Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:20:10 +0900 Subject: [PATCH 6890/8282] docs: update description --- user_guide_src/source/general/errors.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst index 061676aff050..87ce25fb75a8 100644 --- a/user_guide_src/source/general/errors.rst +++ b/user_guide_src/source/general/errors.rst @@ -123,7 +123,8 @@ it accordingly. .. literalinclude:: errors/013.php -After that, subsequent deprecations will be logged instead of thrown. +After that, subsequent deprecations will be logged as configured without throwing +as exceptions. This feature also works with user deprecations: From a4e5a8a4d37575a230625a3ac2884d5d18d74a04 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:46:27 +0900 Subject: [PATCH 6891/8282] docs: add namespace to sample code --- user_guide_src/source/libraries/files/014.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_guide_src/source/libraries/files/014.php b/user_guide_src/source/libraries/files/014.php index cbd6f90e5388..fb11f62d31e6 100644 --- a/user_guide_src/source/libraries/files/014.php +++ b/user_guide_src/source/libraries/files/014.php @@ -1,5 +1,7 @@ Date: Wed, 8 May 2024 10:46:54 +0900 Subject: [PATCH 6892/8282] docs: add empty line --- user_guide_src/source/libraries/file_collections.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index 4b54f0ab07a8..15ff9dc048b5 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -44,7 +44,9 @@ define() ======== Allows child classes to define their own initial files. This method is called by the constructor and allows -predefined collections without having to use their methods. Example: +predefined collections without having to use their methods. + +Example: .. literalinclude:: files/014.php From a0a5c8eb1e1181b3bac120763db0a0c9981798b4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:47:56 +0900 Subject: [PATCH 6893/8282] docs: improve description --- user_guide_src/source/libraries/file_collections.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index 15ff9dc048b5..25ce4e4c0632 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -50,8 +50,9 @@ Example: .. literalinclude:: files/014.php -Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without -having to re-call the collection methods every time. +Now you may use the ``ConfigCollection`` anywhere in your project to access all +PHP files in **app/Config/** without having to re-call the collection methods +every time. set(array $files) ================= From a56b5f38f9033f6e5bfb71aa67aafe05c5869c6e Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:50:14 +0900 Subject: [PATCH 6894/8282] docs: break long lines --- .../source/libraries/file_collections.rst | 55 +++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index 25ce4e4c0632..7ad0eea4cc92 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -2,8 +2,9 @@ File Collections ################ -Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate -locating and working with groups of files across the filesystem. +Working with groups of files can be cumbersome, so the framework supplies the +``FileCollection`` class to facilitate locating and working with groups of files +across the filesystem. .. contents:: :local: @@ -18,13 +19,15 @@ of files you set or build: .. literalinclude:: files/011.php -After you have input the files you would like to work with you may remove files or use the filtering commands to remove -or retain files matching a certain regex or glob-style pattern: +After you have input the files you would like to work with you may remove files +or use the filtering commands to remove or retain files matching a certain regex +or glob-style pattern: .. literalinclude:: files/012.php -When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of -``FileCollection`` being countable and iterable to work directly with each ``File``: +When your collection is complete, you can use ``get()`` to retrieve the final +list of file paths, or take advantage of ``FileCollection`` being countable and +iterable to work directly with each ``File``: .. literalinclude:: files/013.php @@ -37,14 +40,16 @@ Starting a Collection __construct(string[] $files = []) ================================= -The constructor accepts an optional array of file paths to use as the initial collection. These are passed to -``add()`` so any files supplied by child classes in the ``$files`` will remain. +The constructor accepts an optional array of file paths to use as the initial +collection. These are passed to ``add()`` so any files supplied by child classes +in the ``$files`` will remain. define() ======== -Allows child classes to define their own initial files. This method is called by the constructor and allows -predefined collections without having to use their methods. +Allows child classes to define their own initial files. This method is called by +the constructor and allows predefined collections without having to use their +methods. Example: @@ -57,8 +62,9 @@ every time. set(array $files) ================= -Sets the list of input files to the provided string array of file paths. This will remove any existing -files from the collection, so ``$collection->set([])`` is essentially a hard reset. +Sets the list of input files to the provided string array of file paths. This +will remove any existing files from the collection, so ``$collection->set([])`` +is essentially a hard reset. *************** Inputting Files @@ -67,13 +73,14 @@ Inputting Files add(string[]|string $paths, bool $recursive = true) =================================================== -Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive`` -will include sub-directories. +Adds all files indicated by the path or array of paths. If the path resolves to +a directory then ``$recursive`` will include sub-directories. addFile(string $file) / addFiles(array $files) ============================================== -Adds the file or files to the current list of input files. Files are absolute paths to actual files. +Adds the file or files to the current list of input files. Files are absolute +paths to actual files. removeFile(string $file) / removeFiles(array $files) ==================================================== @@ -85,8 +92,8 @@ addDirectory(string $directory, bool $recursive = false) addDirectories(array $directories, bool $recursive = false) =========================================================== -Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are -absolute paths to actual directories. +Adds all files from the directory or directories, optionally recursing into +sub-directories. Directories are absolute paths to actual directories. *************** Filtering Files @@ -97,11 +104,12 @@ removePattern(string $pattern, string $scope = null) retainPattern(string $pattern, string $scope = null) ==================================================== -Filters the current file list through the pattern (and optional scope), removing or retaining matched -files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar -to ``glob()`` (like ``*.css``). -If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files -outside of ``$scope`` are always retained). When no scope is provided then all files are subject. +Filters the current file list through the pattern (and optional scope), removing +or retaining matched files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) +or a pseudo-regex similar to ``glob()`` (like ``*.css``). If a ``$scope`` is +provided then only files in or under that directory will be considered (i.e. files +outside of ``$scope`` are always retained). When no scope is provided then all +files are subject. Examples: @@ -116,4 +124,5 @@ get(): string[] Returns an array of all the loaded input files. -.. note:: ``FileCollection`` is an ``IteratorAggregate`` so you can work with it directly (e.g. ``foreach ($collection as $file)``). +.. note:: ``FileCollection`` is an ``IteratorAggregate`` so you can work with it + directly (e.g. ``foreach ($collection as $file)``). From 3dc1a097ef0662f86fe7379a09d9d5e5781ad786 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:52:02 +0900 Subject: [PATCH 6895/8282] docs: add empty lines --- .../source/libraries/file_collections.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index 7ad0eea4cc92..a9871f259fa8 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -105,11 +105,14 @@ retainPattern(string $pattern, string $scope = null) ==================================================== Filters the current file list through the pattern (and optional scope), removing -or retaining matched files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) -or a pseudo-regex similar to ``glob()`` (like ``*.css``). If a ``$scope`` is -provided then only files in or under that directory will be considered (i.e. files -outside of ``$scope`` are always retained). When no scope is provided then all -files are subject. +or retaining matched files. + +``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex +similar to ``glob()`` (like ``*.css``). + +If a ``$scope`` is provided then only files in or under that directory will be +considered (i.e. files outside of ``$scope`` are always retained). When no scope +is provided then all files are subject. Examples: From 003a3ed2d555071275673184c0240d0cfccc4ef0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:53:08 +0900 Subject: [PATCH 6896/8282] docs: improve code samples --- user_guide_src/source/libraries/file_collections.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/file_collections.rst b/user_guide_src/source/libraries/file_collections.rst index a9871f259fa8..e0050b87e247 100644 --- a/user_guide_src/source/libraries/file_collections.rst +++ b/user_guide_src/source/libraries/file_collections.rst @@ -107,8 +107,8 @@ retainPattern(string $pattern, string $scope = null) Filters the current file list through the pattern (and optional scope), removing or retaining matched files. -``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex -similar to ``glob()`` (like ``*.css``). +``$pattern`` may be a complete regex (like ``'#\A[A-Za-z]+\.php\z#'``) or a +pseudo-regex similar to ``glob()`` (like ``'*.css'``). If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files outside of ``$scope`` are always retained). When no scope From 0125bc766ee690d6073182ee962708d78dc8fcf6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 10:56:47 +0900 Subject: [PATCH 6897/8282] docs: improve sample code --- user_guide_src/source/libraries/files/012.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/files/012.php b/user_guide_src/source/libraries/files/012.php index db0f881014c0..b87efe4a692a 100644 --- a/user_guide_src/source/libraries/files/012.php +++ b/user_guide_src/source/libraries/files/012.php @@ -1,6 +1,6 @@ removeFile(APPPATH . 'Filters/DevelopToolbar'); +$files->removeFile(APPPATH . 'Filters/DevelopToolbar.php'); $files->removePattern('#\.gitkeep#'); $files->retainPattern('*.php'); From 460d3dfe3859f4bf85f9d5bcc83b67952b881735 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 11:31:29 +0900 Subject: [PATCH 6898/8282] test: add test file for testing --- tests/_support/Files/baker/fig_3.php.txt | 0 tests/system/Files/FileCollectionTest.php | 13 +++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 tests/_support/Files/baker/fig_3.php.txt diff --git a/tests/_support/Files/baker/fig_3.php.txt b/tests/_support/Files/baker/fig_3.php.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php index 51e8b10e9955..81005356fee3 100644 --- a/tests/system/Files/FileCollectionTest.php +++ b/tests/system/Files/FileCollectionTest.php @@ -175,6 +175,7 @@ public function testAddStringDirectoryRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $files->add(SUPPORTPATH . 'Files'); @@ -227,6 +228,7 @@ public function testAddArrayRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', SUPPORTPATH . 'Log/Handlers/TestHandler.php', ]; @@ -392,6 +394,7 @@ public function testAddDirectoryRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->addDirectory(SUPPORTPATH . 'Files', true); @@ -407,6 +410,7 @@ public function testAddDirectories(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->addDirectories([ @@ -425,6 +429,7 @@ public function testAddDirectoriesRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', SUPPORTPATH . 'Log/Handlers/TestHandler.php', ]; @@ -471,6 +476,7 @@ public function testRemovePatternPseudo(): void $expected = [ $this->directory . 'apple.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->removePattern('*_*.php'); @@ -485,6 +491,7 @@ public function testRemovePatternScope(): void $expected = [ SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->removePattern('*.php', $this->directory); @@ -512,6 +519,7 @@ public function testRetainPatternRegex(): void $expected = [ $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->retainPattern('#[a-z]+_.*#'); @@ -541,6 +549,7 @@ public function testRetainPatternScope(): void $expected = [ $this->directory . 'fig_3.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $collection->retainPattern('*_?.php', $this->directory); @@ -553,7 +562,7 @@ public function testCount(): void $collection = new FileCollection(); $collection->addDirectory(SUPPORTPATH . 'Files', true); - $this->assertCount(4, $collection); + $this->assertCount(5, $collection); } public function testIterable(): void @@ -568,6 +577,6 @@ public function testIterable(): void $count++; } - $this->assertSame($count, 4); + $this->assertSame($count, 5); } } From 700612c927e2f47faef86f48593b7d902901c75c Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 11:35:12 +0900 Subject: [PATCH 6899/8282] fix: FileCollection pseudo-regex --- system/Files/FileCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php index b9456dcc15ba..f1310795867d 100644 --- a/system/Files/FileCollection.php +++ b/system/Files/FileCollection.php @@ -105,7 +105,7 @@ final protected static function matchFiles(array $files, string $pattern): array ['\#', '\.', '.*', '.'], $pattern ); - $pattern = "#{$pattern}#"; + $pattern = "#\\A{$pattern}\\z#"; } return array_filter($files, static fn ($value) => (bool) preg_match($pattern, basename($value))); From 79e33165bfab4043d3d40e11869189dfe61f313b Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 14:54:36 +0900 Subject: [PATCH 6900/8282] test: fix model for Model casting --- tests/_support/Models/UserCastsTimestampModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/_support/Models/UserCastsTimestampModel.php b/tests/_support/Models/UserCastsTimestampModel.php index c19353f01319..30f6b3e6b6f7 100644 --- a/tests/_support/Models/UserCastsTimestampModel.php +++ b/tests/_support/Models/UserCastsTimestampModel.php @@ -28,8 +28,8 @@ class UserCastsTimestampModel extends Model 'id' => 'int', 'name' => 'base64', 'email' => 'json-array', - 'created_at' => 'datetime', - 'updated_at' => 'datetime', + 'created_at' => '?datetime', + 'updated_at' => '?datetime', ]; protected array $castHandlers = [ 'base64' => CastBase64::class, From 79ad7f1f640713d7d65934dd480ad4dabb84cc30 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 14:55:20 +0900 Subject: [PATCH 6901/8282] fix: InvalidArgumentException Invalid parameter: nullable --- system/DataCaster/DataCaster.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/DataCaster/DataCaster.php b/system/DataCaster/DataCaster.php index 854a0b50b32c..29de3987faa9 100644 --- a/system/DataCaster/DataCaster.php +++ b/system/DataCaster/DataCaster.php @@ -159,7 +159,7 @@ public function castAs(mixed $value, string $field, string $method = 'get'): mix $params = array_map('trim', explode(',', $matches[2])); } - if ($isNullable) { + if ($isNullable && ! $this->strict) { $params[] = 'nullable'; } From 28bb81591be2efc90c839f2618899b3edb51b518 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 15:07:06 +0900 Subject: [PATCH 6902/8282] test: update other test assertions --- tests/system/Helpers/FilesystemHelperTest.php | 19 ++++++++++++++----- tests/system/Publisher/PublisherInputTest.php | 2 ++ .../system/Publisher/PublisherOutputTest.php | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index 403cfb14da50..5896552a240b 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -429,15 +429,24 @@ public function testGetFilenamesWithSymlinks(): void public function testGetDirFileInfo(): void { - $file = SUPPORTPATH . 'Files/baker/banana.php'; - $info = get_file_info($file); + $file1 = SUPPORTPATH . 'Files/baker/banana.php'; + $info1 = get_file_info($file1); + $file2 = SUPPORTPATH . 'Files/baker/fig_3.php.txt'; + $info2 = get_file_info($file2); $expected = [ 'banana.php' => [ 'name' => 'banana.php', - 'server_path' => $file, - 'size' => $info['size'], - 'date' => $info['date'], + 'server_path' => $file1, + 'size' => $info1['size'], + 'date' => $info1['date'], + 'relative_path' => realpath(__DIR__ . '/../../_support/Files/baker'), + ], + 'fig_3.php.txt' => [ + 'name' => 'fig_3.php.txt', + 'server_path' => $file2, + 'size' => $info2['size'], + 'date' => $info2['date'], 'relative_path' => realpath(__DIR__ . '/../../_support/Files/baker'), ], ]; diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php index c2eeb14d13a9..1336137defd4 100644 --- a/tests/system/Publisher/PublisherInputTest.php +++ b/tests/system/Publisher/PublisherInputTest.php @@ -86,6 +86,7 @@ public function testAddPathDirectoryRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', ]; $publisher->addPath('Files'); @@ -121,6 +122,7 @@ public function testAddPathsRecursive(): void $this->directory . 'fig_3.php', $this->directory . 'prune_ripe.php', SUPPORTPATH . 'Files/baker/banana.php', + SUPPORTPATH . 'Files/baker/fig_3.php.txt', SUPPORTPATH . 'Log/Handlers/TestHandler.php', ]; diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php index 1d8c2858d8fb..e03335e86fe6 100644 --- a/tests/system/Publisher/PublisherOutputTest.php +++ b/tests/system/Publisher/PublisherOutputTest.php @@ -161,6 +161,7 @@ public function testMerge(): void $this->root->url() . '/able/fig_3.php', $this->root->url() . '/able/prune_ripe.php', $this->root->url() . '/baker/banana.php', + $this->root->url() . '/baker/fig_3.php.txt', ]; $this->assertFileDoesNotExist($this->root->url() . '/able/fig_3.php'); @@ -183,6 +184,7 @@ public function testMergeReplace(): void $this->root->url() . '/able/fig_3.php', $this->root->url() . '/able/prune_ripe.php', $this->root->url() . '/baker/banana.php', + $this->root->url() . '/baker/fig_3.php.txt', ]; $result = $publisher->addPath('/')->merge(true); @@ -200,6 +202,7 @@ public function testMergeCollides(): void $this->root->url() . '/able/apple.php', $this->root->url() . '/able/prune_ripe.php', $this->root->url() . '/baker/banana.php', + $this->root->url() . '/baker/fig_3.php.txt', ]; mkdir($this->root->url() . '/able/fig_3.php'); From 19694721bc9f957cdfb545b18aaf86d44e03b1ad Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 15:22:10 +0900 Subject: [PATCH 6903/8282] test: add test cases for finding returns null --- .../system/Models/DataConverterModelTest.php | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/system/Models/DataConverterModelTest.php b/tests/system/Models/DataConverterModelTest.php index cd50df0d8b00..4dd6da072f5e 100644 --- a/tests/system/Models/DataConverterModelTest.php +++ b/tests/system/Models/DataConverterModelTest.php @@ -43,6 +43,16 @@ public function testFindAsArray(): void $this->seeInDatabase('user', ['name' => 'Sm9obiBTbWl0aA==']); } + public function testFindAsArrayReturnsNull(): void + { + $this->createModel(UserCastsTimestampModel::class); + $this->db->table('user')->truncate(); + + $user = $this->model->find(1); + + $this->assertNull($user); + } + /** * @return int|string Insert ID */ @@ -102,6 +112,16 @@ public function testFindAllAsArray(): void $this->assertInstanceOf(Time::class, $users[1]['created_at']); } + public function testFindAllAsArrayReturnsNull(): void + { + $this->createModel(UserCastsTimestampModel::class); + $this->db->table('user')->truncate(); + + $users = $this->model->findAll(); + + $this->assertSame([], $users); + } + private function prepareTwoRecords(): void { $this->prepareOneRecord(); @@ -170,6 +190,16 @@ public function testFirstAsArray(): void $this->assertInstanceOf(Time::class, $user['created_at']); } + public function testFirstAsArrayReturnsNull(): void + { + $this->createModel(UserCastsTimestampModel::class); + $this->db->table('user')->truncate(); + + $user = $this->model->first(); + + $this->assertNull($user); + } + public function testFirstAsObject(): void { $this->prepareTwoRecords(); From 5c05447288f7c02a26d306f75c934b0a10ff3ee9 Mon Sep 17 00:00:00 2001 From: Aleksey Grunin <49051631+avegacms@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:19:59 +0600 Subject: [PATCH 6904/8282] Fix bug #8806 Bug: when the query ($this->first()) result returns NULL we get TypeError --- system/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Model.php b/system/Model.php index b3ecfc653943..c4ca9b6cc6e9 100644 --- a/system/Model.php +++ b/system/Model.php @@ -318,7 +318,7 @@ protected function doFirst() $row = $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType); - if ($useCast) { + if ($useCast && $row !== null) { $row = $this->convertToReturnType($row, $returnType); $this->tempReturnType = $returnType; From 4639608862523fb2b042ee13d4d54c0eca3b5b10 Mon Sep 17 00:00:00 2001 From: Aleksey Grunin <49051631+avegacms@users.noreply.github.com> Date: Fri, 19 Apr 2024 21:21:27 +0600 Subject: [PATCH 6905/8282] Update Model.php Fix TypeError error in the methods: doFind and doFirst when using casts --- system/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Model.php b/system/Model.php index c4ca9b6cc6e9..03ca7525ec76 100644 --- a/system/Model.php +++ b/system/Model.php @@ -210,7 +210,7 @@ protected function doFind(bool $singleton, $id = null) $row = $builder->get()->getResult($this->tempReturnType); } - if ($useCast) { + if ($useCast && $row !== null) { $row = $this->convertToReturnType($row, $returnType); $this->tempReturnType = $returnType; From 7eb76047cea048a98ba9168bcbcd67c3e44016a6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 15:35:55 +0900 Subject: [PATCH 6906/8282] test: sort file info by array key It may fail unless sorting. --- tests/system/Helpers/FilesystemHelperTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php index 5896552a240b..ad169cf3b58b 100644 --- a/tests/system/Helpers/FilesystemHelperTest.php +++ b/tests/system/Helpers/FilesystemHelperTest.php @@ -451,7 +451,10 @@ public function testGetDirFileInfo(): void ], ]; - $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files/baker')); + $result = get_dir_file_info(SUPPORTPATH . 'Files/baker'); + ksort($result); + + $this->assertSame($expected, $result); } public function testGetDirFileInfoNested(): void From 573676cc6282c068a0394130f54c521dfafca536 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:13:35 +0900 Subject: [PATCH 6907/8282] test: call PhpStreamWrapper::restore() as soon as possible If it is not called, assertions may not work correctly. --- tests/system/CLI/CLITest.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index fc62e5888e53..2dfe15b20799 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -76,9 +76,9 @@ public function testWaitZero(): void $time = time(); CLI::wait(0); - $this->assertCloseEnough(0, time() - $time); - PhpStreamWrapper::restore(); + + $this->assertCloseEnough(0, time() - $time); } public function testPrompt(): void @@ -90,9 +90,9 @@ public function testPrompt(): void $output = CLI::prompt('What is your favorite color?'); - $this->assertSame($expected, $output); - PhpStreamWrapper::restore(); + + $this->assertSame($expected, $output); } public function testPromptByMultipleKeys(): void @@ -105,14 +105,13 @@ public function testPromptByMultipleKeys(): void $options = ['Playing game', 'Sleep', 'Badminton']; $output = CLI::promptByMultipleKeys('Select your hobbies:', $options); + PhpStreamWrapper::restore(); + $expected = [ 0 => 'Playing game', 1 => 'Sleep', ]; - $this->assertSame($expected, $output); - - PhpStreamWrapper::restore(); } public function testNewLine(): void From 7e918badffcd16ea16b1f2afe15dad6c39b82fa2 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:18:16 +0900 Subject: [PATCH 6908/8282] docs: fix typos in comment --- system/CLI/CLI.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 865241b75cbf..f6646749f9df 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -343,9 +343,9 @@ public static function promptByMultipleKeys(string $text, array $options): array // find max from input $maxInput = max($inputToArray); - // return the prompt again if $input contain(s) non-numeric charachter, except a comma. - // And if max from $options less than max from input - // it is mean user tried to access null value in $options + // return the prompt again if $input contain(s) non-numeric character, except a comma. + // And if max from $options less than max from input, + // it means user tried to access null value in $options if (! $pattern || $maxOptions < $maxInput) { static::error('Please select correctly.'); CLI::newLine(); From 35a295c6147ee9a680d7b7f5ab49d8d5b34c147f Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:11:34 +0900 Subject: [PATCH 6909/8282] test: add test cases --- tests/system/CLI/CLITest.php | 110 +++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php index 2dfe15b20799..0a4e36316dbe 100644 --- a/tests/system/CLI/CLITest.php +++ b/tests/system/CLI/CLITest.php @@ -95,6 +95,80 @@ public function testPrompt(): void $this->assertSame($expected, $output); } + public function testPromptInputNothing(): void + { + PhpStreamWrapper::register(); + + $input = ''; + PhpStreamWrapper::setContent($input); + + $output = CLI::prompt('What is your favorite color?', 'red'); + + PhpStreamWrapper::restore(); + + $this->assertSame('red', $output); + } + + public function testPromptInputZero(): void + { + PhpStreamWrapper::register(); + + $input = '0'; + PhpStreamWrapper::setContent($input); + + $output = CLI::prompt('What is your favorite number?', '7'); + + PhpStreamWrapper::restore(); + + $this->assertSame('0', $output); + } + + public function testPromptByKey(): void + { + PhpStreamWrapper::register(); + + $input = '1'; + PhpStreamWrapper::setContent($input); + + $options = ['Playing game', 'Sleep', 'Badminton']; + $output = CLI::promptByKey('Select your hobbies:', $options); + + PhpStreamWrapper::restore(); + + $this->assertSame($input, $output); + } + + public function testPromptByKeyInputNothing(): void + { + PhpStreamWrapper::register(); + + $input = ''; // This is when you press the Enter key. + PhpStreamWrapper::setContent($input); + + $options = ['Playing game', 'Sleep', 'Badminton']; + $output = CLI::promptByKey('Select your hobbies:', $options); + + PhpStreamWrapper::restore(); + + $expected = '0'; + $this->assertSame($expected, $output); + } + + public function testPromptByKeyInputZero(): void + { + PhpStreamWrapper::register(); + + $input = '0'; + PhpStreamWrapper::setContent($input); + + $options = ['Playing game', 'Sleep', 'Badminton']; + $output = CLI::promptByKey('Select your hobbies:', $options); + + PhpStreamWrapper::restore(); + + $this->assertSame($input, $output); + } + public function testPromptByMultipleKeys(): void { PhpStreamWrapper::register(); @@ -114,6 +188,42 @@ public function testPromptByMultipleKeys(): void $this->assertSame($expected, $output); } + public function testPromptByMultipleKeysInputNothing(): void + { + PhpStreamWrapper::register(); + + $input = ''; // This is when you press the Enter key. + PhpStreamWrapper::setContent($input); + + $options = ['Playing game', 'Sleep', 'Badminton']; + $output = CLI::promptByMultipleKeys('Select your hobbies:', $options); + + PhpStreamWrapper::restore(); + + $expected = [ + 0 => 'Playing game', + ]; + $this->assertSame($expected, $output); + } + + public function testPromptByMultipleKeysInputZero(): void + { + PhpStreamWrapper::register(); + + $input = '0'; + PhpStreamWrapper::setContent($input); + + $options = ['Playing game', 'Sleep', 'Badminton']; + $output = CLI::promptByMultipleKeys('Select your hobbies:', $options); + + PhpStreamWrapper::restore(); + + $expected = [ + 0 => 'Playing game', + ]; + $this->assertSame($expected, $output); + } + public function testNewLine(): void { $this->expectOutputString(''); From 56f9c2dfe94f6aa8dbfeedc3d17b8114adf5d099 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:37:48 +0900 Subject: [PATCH 6910/8282] fix: TypeError in promptByMultipleKeys() --- system/CLI/CLI.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index f6646749f9df..790af4b7a788 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -330,7 +330,9 @@ public static function promptByMultipleKeys(string $text, array $options): array CLI::write($text); CLI::printKeysAndValues($options); CLI::newLine(); - $input = static::prompt($extraOutput) ?: 0; // 0 is default + + $input = static::prompt($extraOutput); + $input = ($input === '') ? '0' : $input; // 0 is default // validation while (true) { @@ -349,7 +351,9 @@ public static function promptByMultipleKeys(string $text, array $options): array if (! $pattern || $maxOptions < $maxInput) { static::error('Please select correctly.'); CLI::newLine(); - $input = static::prompt($extraOutput) ?: 0; + + $input = static::prompt($extraOutput); + $input = ($input === '') ? '0' : $input; } else { break; } From 94703ba5765849d171559b8871e6109a317d1da9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:39:08 +0900 Subject: [PATCH 6911/8282] fix: CLI::prompt() may incorrectly return default value See CLITest::testPromptInputZero(). --- system/CLI/CLI.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php index 790af4b7a788..7badf1807dcd 100644 --- a/system/CLI/CLI.php +++ b/system/CLI/CLI.php @@ -258,7 +258,8 @@ public static function prompt(string $field, $options = null, $validation = null static::fwrite(STDOUT, $field . (trim($field) !== '' ? ' ' : '') . $extraOutput . ': '); // Read the input from keyboard. - $input = trim(static::$io->input()) ?: (string) $default; + $input = trim(static::$io->input()); + $input = ($input === '') ? (string) $default : $input; if ($validation !== []) { while (! static::validate('"' . trim($field) . '"', $input, $validation)) { From e772b9d06c8bd1ece519e11ede69f6f57a094e5d Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 8 May 2024 17:59:14 +0900 Subject: [PATCH 6912/8282] chore: update phpstan-baseline --- phpstan-baseline.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 358e9633dbe0..c9b399ed3a8e 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -378,7 +378,7 @@ ]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', - 'count' => 5, + 'count' => 2, 'path' => __DIR__ . '/system/CLI/CLI.php', ]; $ignoreErrors[] = [ From 5cd7ff266f1a0a4d1fda40700c6e20ed99b31b13 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 10:24:16 +0900 Subject: [PATCH 6913/8282] docs: break long lines --- user_guide_src/source/libraries/uploaded_files.rst | 6 ++++-- user_guide_src/source/libraries/validation.rst | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 118af85e86ee..fab3b714d76c 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -2,8 +2,10 @@ Working with Uploaded Files ########################### -CodeIgniter makes working with files uploaded through a form much simpler and more secure than using PHP's ``$_FILES`` -array directly. This extends the :doc:`File class ` and thus gains all of the features of that class. +CodeIgniter makes working with files uploaded through a form much simpler and +more secure than using PHP's ``$_FILES`` array directly. This extends the +:doc:`File class ` and thus gains all of the features of that +class. .. note:: This is not the same as the File Uploading class in CodeIgniter 3. This provides a raw interface to the uploaded files with a few small features. diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 19f0e0058a31..8fa91533c16b 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -1044,9 +1044,10 @@ file validation. files. Therefore, adding any general rules, like ``permit_empty``, to file validation rules array or string, the file validation will not work correctly. -Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global, the name of the input field will -need to be used twice. Once to specify the field name as you would for any other rule, but again as the first parameter of all -file upload related rules:: +Since the value of a file upload HTML field doesn't exist, and is stored in the +``$_FILES`` global, the name of the input field will need to be used twice. Once +to specify the field name as you would for any other rule, but again as the first +parameter of all file upload related rules:: // In the HTML From 251f3aacea47b75f385073430ecc797e2f067510 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 10:32:02 +0900 Subject: [PATCH 6914/8282] chore: change section title --- user_guide_src/source/libraries/uploaded_files.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index fab3b714d76c..7dd9ef5d6988 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -14,9 +14,11 @@ class. :local: :depth: 2 -*********** -The Process -*********** +.. _file-upload-form-tutorial: + +************************* +File Upload Form Tutorial +************************* Uploading a file involves the following general process: From 2c5b554d8ef88327700cae8a1163fb39e39d5503 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 10:54:37 +0900 Subject: [PATCH 6915/8282] docs: remove unnecessary / in directory paths --- user_guide_src/source/libraries/uploaded_files.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 7dd9ef5d6988..d2928bc4aa99 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -37,7 +37,7 @@ Creating the Upload Form ======================== Using a text editor, create a form called **upload_form.php**. In it, place -this code and save it to your **app/Views/** directory: +this code and save it to your **app/Views** directory: .. literalinclude:: uploaded_files/001.php @@ -51,7 +51,7 @@ The Success Page ================ Using a text editor, create a form called **upload_success.php**. In it, -place this code and save it to your **app/Views/** directory:: +place this code and save it to your **app/Views** directory:: @@ -77,7 +77,7 @@ The Controller ============== Using a text editor, create a controller called **Upload.php**. In it, place -this code and save it to your **app/Controllers/** directory: +this code and save it to your **app/Controllers** directory: .. literalinclude:: uploaded_files/002.php From 28ed8c9253e12a7d3398290070c5a2d9ebfaaec8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 10:55:49 +0900 Subject: [PATCH 6916/8282] docs: add empty line --- user_guide_src/source/libraries/uploaded_files.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index d2928bc4aa99..ec139b59ae64 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -43,7 +43,9 @@ this code and save it to your **app/Views** directory: You'll notice we are using a form helper to create the opening form tag. File uploads require a multipart form, so the helper creates the proper -syntax for you. You'll also notice we have an ``$errors`` variable. This is +syntax for you. + +You'll also notice we have an ``$errors`` variable. This is so we can show error messages in the event the user does something wrong. From 312a951ed4029cf2308432b9eb65f1259345ffe5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 10:56:06 +0900 Subject: [PATCH 6917/8282] docs: add descriptions --- .../source/libraries/uploaded_files.rst | 16 +++++++++++++--- user_guide_src/source/libraries/validation.rst | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index ec139b59ae64..ef1bc6b592f6 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -83,9 +83,19 @@ this code and save it to your **app/Controllers** directory: .. literalinclude:: uploaded_files/002.php -.. note:: Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global, - only :ref:`rules-for-file-uploads` can be used to validate upload file with :doc:`validation`. - The rule ``required`` also can't be used, so use ``uploaded`` instead. +Since the value of a file upload HTML field doesn't exist, and is stored in the +``$_FILES`` global, only :ref:`rules-for-file-uploads` can be used to validate +upload file with :doc:`validation`. + +The rule ``required`` cannot be used either, so if the file is required, use +the rule ``uploaded`` instead. + +Note that an empty array (``[]``) is passed as the first argument to +``$this->validateData()``. It is because the file validation rules get the data +for the uploaded file directly from the Request object. + +If the form has fields other than file upload, pass the field data as the first +argument. The Routes ========== diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 8fa91533c16b..3b16ad588d87 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -885,6 +885,8 @@ Available Rules .. literalinclude:: validation/038.php :lines: 2- +.. _rules-for-general-use: + Rules for General Use ===================== @@ -1057,6 +1059,8 @@ parameter of all file upload related rules:: 'avatar' => 'uploaded[avatar]|max_size[avatar,1024]', ]); +See also :ref:`file-upload-form-tutorial`. + ======================= ========== ============================================= =================================================== Rule Parameter Description Example ======================= ========== ============================================= =================================================== From c6c370d1a482c3b25d97f81e02cbbb11fc2a1d2e Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 11:43:14 +0900 Subject: [PATCH 6918/8282] docs: add notes for Config Caching --- user_guide_src/source/concepts/factories.rst | 7 +++++++ user_guide_src/source/installation/deployment.rst | 3 +++ 2 files changed, 10 insertions(+) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 6f6848bdb52b..10975798490b 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -270,6 +270,10 @@ Config Caching .. versionadded:: 4.4.0 +.. important:: Do not use this feature unless you have carefully read this section + and understand how this feature works. Otherwise, your application will not + function properly. + To improve performance, Config Caching has been implemented. Prerequisite @@ -287,6 +291,9 @@ Prerequisite How It Works ============ +.. important:: Once cached, configuration values are never changed until the cache + is deleted, even if the configuration file or **.env** is changed. + - Save the all Config instances in Factories into a cache file before shutdown, if the state of the Config instances in Factories changes. - Restore cached Config instances before CodeIgniter initialization if a cache diff --git a/user_guide_src/source/installation/deployment.rst b/user_guide_src/source/installation/deployment.rst index 184d9216c42b..0eb206ee9d04 100644 --- a/user_guide_src/source/installation/deployment.rst +++ b/user_guide_src/source/installation/deployment.rst @@ -56,6 +56,9 @@ See :ref:`modules-specify-composer-packages`. Config Caching ============== +.. important:: Once cached, configuration values are never changed until the cache + is deleted, even if the configuration file or **.env** is changed. + Caching the Config objects can improve performance. However, the cache must be manually deleted when changing Config values. From 688a416a0717dd521c55f41d29166ac8cf873e28 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 9 May 2024 21:24:02 +0900 Subject: [PATCH 6919/8282] docs: replace @group with Group attribute --- tests/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/README.md b/tests/README.md index 5de4f7f2cc8e..fdcef8a6d57f 100644 --- a/tests/README.md +++ b/tests/README.md @@ -62,8 +62,8 @@ exclude `@DatabaseLive` group. This will make the tests run quite a bit faster. ## Groups Each test class that we are running should belong to at least one -[@group](https://phpunit.readthedocs.io/en/9.5/annotations.html#group) that is written at class-level -doc block. +[Group](https://docs.phpunit.de/en/10.5/attributes.html#group) attribute that is +written at class-level doc block. The available groups to use are: From 3813e6fd66763c8efc3cfae2bba1a020d9b83765 Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 9 May 2024 17:30:56 +0200 Subject: [PATCH 6920/8282] docs: Small typos and modifications in libraries/sessions.rst Small typos and modifications in libraries/sessions.rst --- user_guide_src/source/libraries/sessions.rst | 50 +++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index 0255e3f3b3ff..a0a5cd77cd93 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -43,7 +43,7 @@ How Do Sessions Work? ===================== When a page is loaded, the session class will check to see if a valid -session cookie is sent by the user's browser. If a sessions cookie does +session cookie is sent by the user's browser. If a session cookie does **not** exist (or if it doesn't match one stored on the server or has expired) a new session will be created and saved. @@ -480,7 +480,7 @@ Preference Default Description **sameSite** Lax The SameSite setting for the session cookie ============== =============== =========================================================================== -.. note:: The ``httponly`` setting doesn't have an effect on sessions. +.. note:: The ``httponly`` setting (in **app/Config/Cookie.php**) doesn't have an effect on sessions. Instead the HttpOnly parameter is always enabled, for security reasons. Additionally, the ``Config\Cookie::$prefix`` setting is completely ignored. @@ -488,7 +488,7 @@ Preference Default Description Session Drivers *************** -As already mentioned, the Session library comes with 4 handlers, or storage +As already mentioned, the Session library comes with five handlers, or storage engines, that you can use: - CodeIgniter\\Session\\Handlers\\FileHandler @@ -497,12 +497,12 @@ engines, that you can use: - CodeIgniter\\Session\\Handlers\\RedisHandler - CodeIgniter\\Session\\Handlers\\ArrayHandler -By default, the ``FileHandler`` Driver will be used when a session is initialized, +By default, the ``FileHandler`` will be used when a session is initialized, because it is the safest choice and is expected to work everywhere (virtually every environment has a file system). -However, any other driver may be selected via the ``public $driver`` -line in your **app/Config/Session.php** file, if you chose to do so. +However, any other driver may be selected via the ``$driver`` +setting in your **app/Config/Session.php** file, if you chose to do so. Have it in mind though, every driver has different caveats, so be sure to get yourself familiar with them (below) before you make that choice. @@ -515,22 +515,20 @@ FileHandler Driver (the default) The 'FileHandler' driver uses your file system for storing session data. It can safely be said that it works exactly like PHP's own default session -implementation, but in case this is an important detail for you, have it -mind that it is in fact not the same code and it has some limitations -(and advantages). +implementation, but in case this is an important detail for you, in fact it is not the same code +and it has some limitations (and advantages). To be more specific, it doesn't support PHP's `directory level and mode formats used in session.save_path `_, and it has most of the options hard-coded for safety. Instead, only -absolute paths are supported for ``public string $savePath``. +absolute paths are supported with ``$savePath`` setting. Another important thing that you should know, is to make sure that you don't use a publicly-readable or shared directory for storing your session -files. Make sure that *only you* have access to see the contents of your -chosen *savePath* directory. Otherwise, anybody who can do that, can -also steal any of the current sessions (also known as "session fixation" -attack). +files. *Only you* should have access to the contents of your +chosen *savePath* directory. Otherwise, anybody can see and +steal session data (also known as "session fixation" attack). On UNIX-like operating systems, this is usually achieved by setting the 0700 mode permissions on that directory via the `chmod` command, which @@ -554,14 +552,14 @@ Some of you will probably opt to choose another session driver because file storage is usually slower. This is only half true. A very basic test will probably trick you into believing that an SQL -database is faster, but in 99% of the cases, this is only true while you -only have a few current sessions. As the sessions count and server loads +database is faster, but in 99% of the cases, this is true only if you +have a few current sessions. As the sessions count and server loads increase - which is the time when it matters - the file system will consistently outperform almost all relational database setups. In addition, if performance is your only concern, you may want to look into using `tmpfs `_, -(warning: external resource), which can make your sessions blazing fast. + which can make your sessions blazing fast. .. _sessions-databasehandler-driver: @@ -571,19 +569,15 @@ DatabaseHandler Driver .. important:: Only MySQL and PostgreSQL databases are officially supported, due to lack of advisory locking mechanisms on other platforms. Using sessions without locks can cause all sorts of - problems, especially with heavy usage of AJAX, and we will not - support such cases. Use the :ref:`session-close` method after you've - done processing session data if you're having performance - issues. + problems, especially with heavy usage of AJAX. Use the :ref:`session-close` method + after you've done processing session data if you're having performance issues. The 'DatabaseHandler' driver uses a relational database such as MySQL or PostgreSQL to store sessions. This is a popular choice among many users, because it allows the developer easy access to the session data within an application - it is just another table in your database. -However, there are some conditions that must be met: - - - You can NOT use a persistent connection. +However, there is a restriction: You can NOT use a persistent connection. Configure DatabaseHandler ------------------------- @@ -602,7 +596,7 @@ you would do this: Creating Database Table ^^^^^^^^^^^^^^^^^^^^^^^ -And then of course, create the database table ... +And then of course, create the database table. For MySQL:: @@ -691,7 +685,7 @@ The downside is that it is not as ubiquitous as relational databases and requires the `phpredis `_ PHP extension to be installed on your system, and that one doesn't come bundled with PHP. -Chances are, you're only be using the RedisHandler driver only if you're already +Chances are, you're using the RedisHandler driver only if you're already both familiar with Redis and using it for other purposes. Configure RedisHandler @@ -700,9 +694,9 @@ Configure RedisHandler Just as with the 'FileHandler' and 'DatabaseHandler' drivers, you must also configure the storage location for your sessions via the ``$savePath`` setting. -The format here is a bit different and complicated at the same time. It is +The format here is a bit different and complicated. It is best explained by the *phpredis* extension's README file, so we'll simply -link you to it: +give a link to it: https://github.com/phpredis/phpredis From 222f4fc4165cb8c0239edf85ccf8700c4f73f02f Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 9 May 2024 18:32:53 +0200 Subject: [PATCH 6921/8282] docs: Fixed unexpected indentation error for pull request in libreries/sessions.rst Fixed unexpected indentation error for pull request in libreries/sessions.rst --- user_guide_src/source/libraries/sessions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst index a0a5cd77cd93..03c2bbe81fc2 100644 --- a/user_guide_src/source/libraries/sessions.rst +++ b/user_guide_src/source/libraries/sessions.rst @@ -559,7 +559,7 @@ consistently outperform almost all relational database setups. In addition, if performance is your only concern, you may want to look into using `tmpfs `_, - which can make your sessions blazing fast. +which can make your sessions blazing fast. .. _sessions-databasehandler-driver: From efa40e78ae89fa98098095e645b637aabca97687 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 May 2024 07:50:22 +0900 Subject: [PATCH 6922/8282] docs: fix outdated description Atrribute is not written at doc block. --- tests/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/README.md b/tests/README.md index fdcef8a6d57f..c0c58040917b 100644 --- a/tests/README.md +++ b/tests/README.md @@ -62,8 +62,8 @@ exclude `@DatabaseLive` group. This will make the tests run quite a bit faster. ## Groups Each test class that we are running should belong to at least one -[Group](https://docs.phpunit.de/en/10.5/attributes.html#group) attribute that is -written at class-level doc block. +[Group](https://docs.phpunit.de/en/10.5/attributes.html#group) attribute to the +test class. The available groups to use are: From 2a51e70d0749bf17ecd9b34a1855ceff2ed7d73f Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 May 2024 10:58:49 +0900 Subject: [PATCH 6923/8282] docs: update notes for @runInSeparateProcess --- user_guide_src/source/testing/overview.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst index 9bec721428d9..4052269c4ee4 100644 --- a/user_guide_src/source/testing/overview.rst +++ b/user_guide_src/source/testing/overview.rst @@ -164,8 +164,12 @@ Ensure that a header or cookie was actually emitted: .. literalinclude:: overview/009.php -.. note:: the test case with this should be `run as a separate process - in PHPunit `_. +.. note:: The test case with this should be run as a separate process + (with `@runInSeparateProcess annotation`_ or `RunInSeparateProcess attribute`_) + in PHPUnit. + +.. _@runInSeparateProcess annotation: https://docs.phpunit.de/en/10.5/annotations.html#runinseparateprocess +.. _RunInSeparateProcess attribute: https://docs.phpunit.de/en/10.5/attributes.html#runinseparateprocess assertHeaderNotEmitted($header, $ignoreCase = false) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -174,8 +178,9 @@ Ensure that a header or cookie was not emitted: .. literalinclude:: overview/010.php -.. note:: the test case with this should be `run as a separate process - in PHPunit `_. +.. note:: The test case with this should be run as a separate process + (with `@runInSeparateProcess annotation`_ or `RunInSeparateProcess attribute`_) + in PHPUnit. assertCloseEnough($expected, $actual, $message = '', $tolerance = 1) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From 0002c6b842d5022a2af6b1e351d5d5616a0a8af4 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 10 May 2024 11:04:00 +0900 Subject: [PATCH 6924/8282] docs: update PHP 8.1 EOL dates --- README.md | 8 ++++---- admin/framework/README.md | 8 ++++---- admin/starter/README.md | 8 ++++---- user_guide_src/source/intro/requirements.rst | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 6fbe0b4fa16c..77419c2a2348 100644 --- a/README.md +++ b/README.md @@ -93,10 +93,10 @@ PHP version 8.1 or higher is required, with the following extensions installed: - [mbstring](http://php.net/manual/en/mbstring.installation.php) > [!WARNING] -> The end of life date for PHP 7.4 was November 28, 2022. -> The end of life date for PHP 8.0 was November 26, 2023. -> If you are still using PHP 7.4 or 8.0, you should upgrade immediately. -> The end of life date for PHP 8.1 will be November 25, 2024. +> - The end of life date for PHP 7.4 was November 28, 2022. +> - The end of life date for PHP 8.0 was November 26, 2023. +> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately. +> - The end of life date for PHP 8.1 will be December 31, 2025. Additionally, make sure that the following extensions are enabled in your PHP: diff --git a/admin/framework/README.md b/admin/framework/README.md index 32668f5af19e..a23783ac316a 100644 --- a/admin/framework/README.md +++ b/admin/framework/README.md @@ -48,10 +48,10 @@ PHP version 8.1 or higher is required, with the following extensions installed: - [mbstring](http://php.net/manual/en/mbstring.installation.php) > [!WARNING] -> The end of life date for PHP 7.4 was November 28, 2022. -> The end of life date for PHP 8.0 was November 26, 2023. -> If you are still using PHP 7.4 or 8.0, you should upgrade immediately. -> The end of life date for PHP 8.1 will be November 25, 2024. +> - The end of life date for PHP 7.4 was November 28, 2022. +> - The end of life date for PHP 8.0 was November 26, 2023. +> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately. +> - The end of life date for PHP 8.1 will be December 31, 2025. Additionally, make sure that the following extensions are enabled in your PHP: diff --git a/admin/starter/README.md b/admin/starter/README.md index 43eb3718978e..d14b4c9c804c 100644 --- a/admin/starter/README.md +++ b/admin/starter/README.md @@ -56,10 +56,10 @@ PHP version 8.1 or higher is required, with the following extensions installed: - [mbstring](http://php.net/manual/en/mbstring.installation.php) > [!WARNING] -> The end of life date for PHP 7.4 was November 28, 2022. -> The end of life date for PHP 8.0 was November 26, 2023. -> If you are still using PHP 7.4 or 8.0, you should upgrade immediately. -> The end of life date for PHP 8.1 will be November 25, 2024. +> - The end of life date for PHP 7.4 was November 28, 2022. +> - The end of life date for PHP 8.0 was November 26, 2023. +> - If you are still using PHP 7.4 or 8.0, you should upgrade immediately. +> - The end of life date for PHP 8.1 will be December 31, 2025. Additionally, make sure that the following extensions are enabled in your PHP: diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst index fcc14266ab76..db01ef5fb002 100644 --- a/user_guide_src/source/intro/requirements.rst +++ b/user_guide_src/source/intro/requirements.rst @@ -20,7 +20,7 @@ PHP and Required Extensions - The end of life date for PHP 7.4 was November 28, 2022. - The end of life date for PHP 8.0 was November 26, 2023. - If you are still using PHP 7.4 or 8.0, you should upgrade immediately. - - The end of life date for PHP 8.1 will be November 25, 2024. + - The end of life date for PHP 8.1 will be December 31, 2025. *********************** Optional PHP Extensions From dbf17264f2d8997cee129ba15378d88df19396d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 15:50:20 +0000 Subject: [PATCH 6925/8282] chore(deps-dev): update rector/rector requirement from 1.0.4 to 1.0.5 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/1.0.4...1.0.5) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bed54690aa96..1fd90b6ac762 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "phpunit/phpcov": "^9.0.2", "phpunit/phpunit": "^10.5.16", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "1.0.4", + "rector/rector": "1.0.5", "vimeo/psalm": "^5.0" }, "replace": { From 89d8d5d023cad036168088535753bb2bfba31e1e Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 10 May 2024 20:25:08 +0200 Subject: [PATCH 6926/8282] docs: Some small typos and modifications in libraries/time.rst Some small typos and modifications in libraries/time.rst --- user_guide_src/source/libraries/time.rst | 58 ++++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst index d94a8cd58e62..f4924d600442 100644 --- a/user_guide_src/source/libraries/time.rst +++ b/user_guide_src/source/libraries/time.rst @@ -2,7 +2,7 @@ Times and Dates ############### -CodeIgniter provides a fully-localized, immutable, date/time class that is built on PHP's DateTimeImmutable object, but uses the Intl +CodeIgniter provides a fully-localized, immutable, date/time class that is built on PHP's DateTimeImmutable class, but uses the Intl extension's features to convert times across timezones and display the output correctly for different locales. This class is the ``Time`` class and lives in the ``CodeIgniter\I18n`` namespace. @@ -34,9 +34,9 @@ This can be any string that PHP's `DateTimeImmutable`_ constructor can parse. Se .. literalinclude:: time/001.php -You can pass in strings representing the timezone and the locale in the second and parameters, respectively. Timezones -can be any supported by PHP's `DateTimeZone `__ class. The locale can be -any supported by PHP's `Locale `__ class. If no locale or timezone is +You can pass in strings representing the timezone and the locale in the second and the third parameters, respectively. The timezone +can be any one supported by PHP's `DateTimeZone `__ class. The locale can be +any one supported by PHP's `Locale `__ class. If no locale or timezone is provided, the application defaults will be used. .. literalinclude:: time/002.php @@ -45,8 +45,8 @@ now() ===== The Time class has several helper methods to instantiate the class. The first of these is the ``now()`` method -that returns a new instance set to the current time. You can pass in strings representing the timezone and the locale -in the second and parameters, respectively. If no locale or timezone is provided, the application defaults will be used. +that returns a new instance set to the current time. You can pass in strings representing the timezone and locale +in the second and third parameters, respectively. If no locale or timezone is provided, the application defaults will be used. .. literalinclude:: time/003.php @@ -86,7 +86,7 @@ createFromDate() ================ Given separate inputs for **year**, **month**, and **day**, will return a new instance. If any of these parameters -are not provided, it will use the current value to fill it in. Accepts strings for the timezone and locale in the +are not provided, it will use the current year, month and day. Accepts strings for the timezone and locale in the fourth and fifth parameters: .. literalinclude:: time/008.php @@ -94,7 +94,7 @@ fourth and fifth parameters: createFromTime() ================ -Like ``createFromDate()`` except it is only concerned with the **hours**, **minutes**, and **seconds**. Uses the +Like ``createFromDate()``, except it is only concerned with the **hours**, **minutes**, and **seconds**. Uses the current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the fourth and fifth parameters: @@ -104,7 +104,7 @@ create() ======== A combination of the previous two methods, takes **year**, **month**, **day**, **hour**, **minutes**, and **seconds** -as separate parameters. Any value not provided will use the current date and time to determine. Accepts strings for the +as separate parameters. Any value not provided will use the current date and time. Accepts strings for the timezone and locale in the fourth and fifth parameters: .. literalinclude:: time/010.php @@ -178,21 +178,21 @@ This will return a localized version of string formatted as (``Y-m-d H:i:s``): toDateString() ============== -Displays just the localized version of date portion of the Time: +Displays just the localized date portion of the Time: .. literalinclude:: time/017.php toTimeString() ============== -Displays just the localized version of time portion of the value: +Displays just the localized time portion of the value: .. literalinclude:: time/018.php humanize() ========== -This methods returns a string that displays the difference between the current date/time and the instance in a +This method returns a string that displays the difference between the current date/time and the instance in a human readable format that is geared towards being easily understood. It can create strings like '3 hours ago', 'in 1 month', etc: @@ -203,17 +203,17 @@ The exact time displayed is determined in the following manner: =============================== ================================= Time difference Result =============================== ================================= -$time > 1 year && < 2 years in 1 year / 1 year ago -$time > 1 month && < 1 year in 6 months / 6 months ago -$time > 7 days && < 1 month in 3 weeks / 3 weeks ago -$time > today && < 7 days in 4 days / 4 days ago -$time == tomorrow / yesterday Tomorrow / Yesterday -$time > 59 minutes && < 1 day in 2 hours / 2 hours ago -$time > now && < 1 hour in 35 minutes / 35 minutes ago +1 year < $time < 2 years in 1 year / 1 year ago +1 month < $time < 1 year in 6 months / 6 months ago +7 days < $time < 1 month in 3 weeks / 3 weeks ago +today < $time < 7 days in 4 days / 4 days ago +$time == yesterday / tomorrow Yesterday / Tomorrow +59 minutes < $time < 1 day in 2 hours / 2 hours ago +now < $time < 1 hour in 35 minutes / 35 minutes ago $time == now Now =============================== ================================= -The exact language used is controlled through the language file, **Time.php**. +The result strings are coming from the language file, **app/Language/{locale}/Time.php**. ****************************** Working with Individual Values @@ -240,7 +240,7 @@ In addition to these, a number of methods exist to provide additional informatio getAge() -------- -Returns the age, in years, of between the Time's instance and the current time. Perfect for checking +Returns the age, in years, between the Time instance and the current time. Perfect for checking the age of someone based on their birthday: .. literalinclude:: time/022.php @@ -402,7 +402,7 @@ humanize() Much like Time's ``humanize()`` method, this returns a string that displays the difference between the times in a human readable format that is geared towards being easily understood. It can create strings like '3 hours ago', -'in 1 month', etc. The biggest differences are in how very recent dates are handled: +'in 1 month', etc. The biggest difference is in how very recent dates are handled: .. literalinclude:: time/041.php @@ -411,13 +411,13 @@ The exact time displayed is determined in the following manner: =============================== ================================= Time difference Result =============================== ================================= -$time > 1 year && < 2 years in 1 year / 1 year ago -$time > 1 month && < 1 year in 6 months / 6 months ago -$time > 7 days && < 1 month in 3 weeks / 3 weeks ago -$time > today && < 7 days in 4 days / 4 days ago -$time > 1 hour && < 1 day in 8 hours / 8 hours ago -$time > 1 minute && < 1 hour in 35 minutes / 35 minutes ago +1 year < $time < 2 years in 1 year / 1 year ago +1 month < $time < 1 year in 6 months / 6 months ago +7 days < $time < 1 month in 3 weeks / 3 weeks ago +today < $time < 7 days in 4 days / 4 days ago +1 hour < $time < 1 day in 8 hours / 8 hours ago +1 minute < $time < 1 hour in 35 minutes / 35 minutes ago $time < 1 minute Now =============================== ================================= -The exact language used is controlled through the language file, **Time.php**. +The result strings are coming from the language file, **app/Language/{locale}/Time.php**. From 036724c722be4259122aaf6b7754ba9dad3185cf Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:34:12 +0900 Subject: [PATCH 6927/8282] docs: remove unneeded note Even if you rename the Controllers directory, you still are able to use auto routing with proper $defaultNamespace setting. --- user_guide_src/source/concepts/structure.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst index 5e2084556380..83f4d348ae76 100644 --- a/user_guide_src/source/concepts/structure.rst +++ b/user_guide_src/source/concepts/structure.rst @@ -41,8 +41,6 @@ of this directory to suit your application's needs. For example, you might decid pattern and Entity Models to work with your data. In this case, you could rename the ``Models`` directory to ``Repositories``, and add a new ``Entities`` directory. -.. note:: If you rename the ``Controllers`` directory, though, you will not be able to use the automatic method of - routing to controllers, and will need to define all of your routes in the routes file. All files in this directory live under the ``App`` namespace, though you are free to change that in **app/Config/Constants.php**. From 560f9bf55f2241a4ef5513062e54d002de6fdcbf Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:36:32 +0900 Subject: [PATCH 6928/8282] docs: change text decration and add empty lines --- user_guide_src/source/concepts/structure.rst | 34 +++++++++++++------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst index 83f4d348ae76..cf0e49722280 100644 --- a/user_guide_src/source/concepts/structure.rst +++ b/user_guide_src/source/concepts/structure.rst @@ -12,15 +12,23 @@ can change to meet the needs of your application. Default Directories ******************* -A fresh install has five directories: ``app/``, ``public/``, -``writable/``, ``tests/`` and ``vendor/`` or ``system/``. +A fresh install has five directories: + +- **app** +- **public** +- **writable** +- **tests** +- **vendor** or **system** + Each of these directories has a very specific part to play. app === -The ``app`` directory is where all of your application code lives. This comes with a default directory -structure that works well for many applications. The following folders make up the basic contents: +The **app** directory is where all of your application code lives. This comes with a default directory +structure that works well for many applications. + +The following folders make up the basic contents: .. code-block:: none @@ -36,11 +44,12 @@ structure that works well for many applications. The following folders make up t ThirdParty/ ThirdParty libraries that can be used in application Views/ Views make up the HTML that is displayed to the client -Because the ``app`` directory is already namespaced, you should feel free to modify the structure -of this directory to suit your application's needs. For example, you might decide to start using the Repository -pattern and Entity Models to work with your data. In this case, you could rename the ``Models`` directory to -``Repositories``, and add a new ``Entities`` directory. +Because the **app** directory is already namespaced, you should feel free to modify the structure +of this directory to suit your application's needs. +For example, you might decide to start using the Repository +pattern and Entities to work with your data. In this case, you could rename the **Models** directory to +**Repositories**, and add a new **Entities** directory. All files in this directory live under the ``App`` namespace, though you are free to change that in **app/Config/Constants.php**. @@ -48,7 +57,8 @@ All files in this directory live under the ``App`` namespace, though you are fre system ====== -.. note:: If you install CodeIgniter with Composer, the ``system`` is located in ``vendor/codeigniter4/framework/system``. +.. note:: If you install CodeIgniter with Composer, the **system** is located in + **vendor/codeigniter4/framework/system**. This directory stores the files that make up the framework, itself. While you have a lot of flexibility in how you use the application directory, the files in the system directory should never be modified. Instead, you should @@ -74,14 +84,16 @@ writable ======== This directory holds any directories that might need to be written to in the course of an application's life. -This includes directories for storing cache files, logs, and any uploads a user might send. You should add any other +This includes directories for storing cache files, logs, and any uploads a user might send. + +You should add any other directories that your application will need to write to here. This allows you to keep your other primary directories non-writable as an added security measure. tests ===== -This directory is set up to hold your test files. The ``_support`` directory holds various mock classes and other +This directory is set up to hold your test files. The **_support** directory holds various mock classes and other utilities that you can use while writing your tests. This directory does not need to be transferred to your production servers. From cff8db38fb3c03dabfa68b5ce9ec0620ed26d155 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:42:06 +0900 Subject: [PATCH 6929/8282] docs: break long lines --- user_guide_src/source/concepts/structure.rst | 49 +++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst index cf0e49722280..5c374a548200 100644 --- a/user_guide_src/source/concepts/structure.rst +++ b/user_guide_src/source/concepts/structure.rst @@ -2,8 +2,9 @@ Application Structure ##################### -To get the most out of CodeIgniter, you need to understand how the application is structured, by default, and what you -can change to meet the needs of your application. +To get the most out of CodeIgniter, you need to understand how the application +is structured, by default, and what you can change to meet the needs of your +application. .. contents:: :local: @@ -25,8 +26,8 @@ Each of these directories has a very specific part to play. app === -The **app** directory is where all of your application code lives. This comes with a default directory -structure that works well for many applications. +The **app** directory is where all of your application code lives. This comes +with a default directory structure that works well for many applications. The following folders make up the basic contents: @@ -44,15 +45,15 @@ The following folders make up the basic contents: ThirdParty/ ThirdParty libraries that can be used in application Views/ Views make up the HTML that is displayed to the client -Because the **app** directory is already namespaced, you should feel free to modify the structure -of this directory to suit your application's needs. +Because the **app** directory is already namespaced, you should feel free to +modify the structure of this directory to suit your application's needs. For example, you might decide to start using the Repository -pattern and Entities to work with your data. In this case, you could rename the **Models** directory to -**Repositories**, and add a new **Entities** directory. +pattern and Entities to work with your data. In this case, you could rename the +**Models** directory to **Repositories**, and add a new **Entities** directory. -All files in this directory live under the ``App`` namespace, though you are free to change that in -**app/Config/Constants.php**. +All files in this directory live under the ``App`` namespace, though you are free +to change that in **app/Config/Constants.php**. system ====== @@ -60,9 +61,10 @@ system .. note:: If you install CodeIgniter with Composer, the **system** is located in **vendor/codeigniter4/framework/system**. -This directory stores the files that make up the framework, itself. While you have a lot of flexibility in how you -use the application directory, the files in the system directory should never be modified. Instead, you should -extend the classes, or create new classes, to provide the desired functionality. +This directory stores the files that make up the framework, itself. While you +have a lot of flexibility in how you use the application directory, the files in +the system directory should never be modified. Instead, you should extend the +classes, or create new classes, to provide the desired functionality. All files in this directory live under the ``CodeIgniter`` namespace. @@ -74,8 +76,7 @@ public The **public** folder holds the browser-accessible portion of your web application, preventing direct access to your source code. It contains the main **.htaccess** file, **index.php**, and any application -assets that you add, like CSS, javascript, or -images. +assets that you add, like CSS, javascript, or images. This folder is meant to be the "web root" of your site, and your web server would be configured to point to it. @@ -83,19 +84,21 @@ would be configured to point to it. writable ======== -This directory holds any directories that might need to be written to in the course of an application's life. -This includes directories for storing cache files, logs, and any uploads a user might send. +This directory holds any directories that might need to be written to in the +course of an application's life. This includes directories for storing cache +files, logs, and any uploads a user might send. -You should add any other -directories that your application will need to write to here. This allows you to keep your other primary directories -non-writable as an added security measure. +You should add any other directories that your application will need to write to +here. This allows you to keep your other primary directories non-writable as an +added security measure. tests ===== -This directory is set up to hold your test files. The **_support** directory holds various mock classes and other -utilities that you can use while writing your tests. This directory does not need to be transferred to your -production servers. +This directory is set up to hold your test files. The **_support** directory +holds various mock classes and other utilities that you can use while writing +your tests. This directory does not need to be transferred to your production +servers. Modifying Directory Locations ***************************** From ee5b08789f9036db588e7cf25c722781fa834e9d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:42:57 +0900 Subject: [PATCH 6930/8282] docs: add empty lines --- user_guide_src/source/concepts/structure.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst index 5c374a548200..9b00fc57e2d5 100644 --- a/user_guide_src/source/concepts/structure.rst +++ b/user_guide_src/source/concepts/structure.rst @@ -75,6 +75,7 @@ public The **public** folder holds the browser-accessible portion of your web application, preventing direct access to your source code. + It contains the main **.htaccess** file, **index.php**, and any application assets that you add, like CSS, javascript, or images. @@ -97,8 +98,9 @@ tests This directory is set up to hold your test files. The **_support** directory holds various mock classes and other utilities that you can use while writing -your tests. This directory does not need to be transferred to your production -servers. +your tests. + +This directory does not need to be transferred to your production servers. Modifying Directory Locations ***************************** From dc9120d9c5538ca7caec3a03e97e84af2afceb65 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:48:45 +0900 Subject: [PATCH 6931/8282] docs: remove outdated important note Since v4.5.0, you can define App and Config in composer.json. --- user_guide_src/source/general/managing_apps.rst | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst index ff664668bf8b..de6b63f7f0f6 100644 --- a/user_guide_src/source/general/managing_apps.rst +++ b/user_guide_src/source/general/managing_apps.rst @@ -8,21 +8,6 @@ directory. It is possible, however, to have multiple sets of applications that share a single CodeIgniter installation, or even to rename or relocate your application directory. -.. important:: When you installed CodeIgniter v4.1.9 or before, and if there are ``App\\`` and ``Config\\`` namespaces in your ``/composer.json``'s ``autoload.psr-4`` like the following, you need to remove these lines, and run ``composer dump-autoload``. - - .. code-block:: text - - { - ... - "autoload": { - "psr-4": { - "App\\": "app", <-- Remove this line - "Config\\": "app/Config" <-- Remove this line - } - }, - ... - } - .. contents:: :local: :depth: 2 From d8cdb4ca1b601cec36a21e6ed512cd8117016b4e Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:55:33 +0900 Subject: [PATCH 6932/8282] docs: remove unneeded / before filename --- user_guide_src/source/general/managing_apps.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst index de6b63f7f0f6..6c990cfc28cb 100644 --- a/user_guide_src/source/general/managing_apps.rst +++ b/user_guide_src/source/general/managing_apps.rst @@ -27,11 +27,11 @@ your main **app/Config/Paths.php** and set a *full server path* in the You will need to modify two additional files in your project root, so that they can find the **Paths** configuration file: -- **/spark** runs command line apps. +- **spark** runs command line apps. .. literalinclude:: managing_apps/002.php -- **/public/index.php** is the front controller for your webapp. +- **public/index.php** is the front controller for your webapp. .. literalinclude:: managing_apps/003.php From 6a72da86d6db0cb8253092022fcfbc641110b788 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 11 May 2024 17:56:02 +0900 Subject: [PATCH 6933/8282] dpcs: remove ` Date: Sat, 11 May 2024 18:00:43 +0900 Subject: [PATCH 6934/8282] docs: fix text decoration --- user_guide_src/source/concepts/autoloader.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst index c7590bde3a2a..2829e1240929 100644 --- a/user_guide_src/source/concepts/autoloader.rst +++ b/user_guide_src/source/concepts/autoloader.rst @@ -62,7 +62,7 @@ The key of each row is the namespace itself. This does not need a trailing back The value is the location to the directory the classes can be found in. By default, the namespace ``App`` is located in the **app** directory, and the -namespace ``Config`` is located in the ``app/Config`` directory. +namespace ``Config`` is located in the **app/Config** directory. If you create class files in the locations and according to `PSR-4`_, the autoloader will autoload them. From 83b1628a661d9715577951b8a74f58ce265b4620 Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 11 May 2024 20:36:58 +0200 Subject: [PATCH 6935/8282] docs: Small typos in libraries/uploaded_files.rst Small typos in libraries/uploaded_files.rst --- .../source/libraries/uploaded_files.rst | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index ef1bc6b592f6..89dfdf039586 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -30,7 +30,7 @@ Uploading a file involves the following general process: uploaded based on the preferences you set. - Once uploaded, the user will be shown a success message. -To demonstrate this process here is brief tutorial. Afterward you'll +To demonstrate this process here is a brief tutorial. Afterward you'll find reference information. Creating the Upload Form @@ -83,9 +83,9 @@ this code and save it to your **app/Controllers** directory: .. literalinclude:: uploaded_files/002.php -Since the value of a file upload HTML field doesn't exist, and is stored in the +Since HTML file element has no value attribute, and the upload file is stored in the ``$_FILES`` global, only :ref:`rules-for-file-uploads` can be used to validate -upload file with :doc:`validation`. +the upload file with :doc:`validation`. The rule ``required`` cannot be used either, so if the file is required, use the rule ``uploaded`` instead. @@ -250,7 +250,7 @@ In controller: Working with the File ********************* -Once you've retrieved the UploadedFile instance, you can retrieve information about the file in safe ways, as well as +Once you've retrieved the UploadedFile instance, you can get information about the file in safe ways, as well as move the file to a new location. .. _verify-a-file: @@ -315,7 +315,7 @@ Returns the original file extension, based on the file name that was uploaded: getClientMimeType() ------------------- -Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted +Returns the mime type of the file as provided by the client. This is NOT a trusted value. For a trusted version, use ``getMimeType()`` instead: .. literalinclude:: uploaded_files/015.php @@ -365,7 +365,7 @@ as the third parameter: Check if the File Moved ----------------------- -Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with +Once the file has been moved the temporary file is deleted. You can check if a file has been moved already with the ``hasMoved()`` method, which returns a boolean: .. literalinclude:: uploaded_files/018.php @@ -373,7 +373,7 @@ the ``hasMoved()`` method, which returns a boolean: When Moving Fails ----------------- -Moving an uploaded file can fail, with an HTTPException, under several circumstances: +Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances: - the file has already been moved - the file did not upload successfully @@ -398,8 +398,4 @@ passing it as the second parameter: .. literalinclude:: uploaded_files/020.php -Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances: - -- the file has already been moved -- the file did not upload successfully -- the file move operation fails (e.g., improper permissions) +Storing an uploaded file can fail, with an ``HTTPException``, under same circumstances like moving file. From cbc33f4f3c646e4d54be0dcccb36a657d817705b Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 12 May 2024 20:06:51 +0200 Subject: [PATCH 6936/8282] docs: Some typos and modifications in libraries/uri.rst Some typos and small modifications in libraries/uri.rst --- user_guide_src/source/libraries/uri.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst index 3ce031bf64bf..d0e05d247971 100644 --- a/user_guide_src/source/libraries/uri.rst +++ b/user_guide_src/source/libraries/uri.rst @@ -39,8 +39,8 @@ Since v4.4.0, if you don't pass a URL, it returns the current URI: The Current URI --------------- -Many times, all you really want is an object representing the current URL of this request. -You can use the :php:func:`current_url()` function available in the :doc:`../helpers/url_helper`: +When you need an object representing the current URL of the request, +you can use the :php:func:`current_url()` function available in the :doc:`../helpers/url_helper`: .. literalinclude:: uri/004.php :lines: 2- @@ -141,12 +141,12 @@ When using the ``setPort()`` method, the port will be checked that it is within Path ---- -The path are all of the segments within the site itself. As expected, the ``getPath()`` and ``setPath()`` methods +The path is all of the segments within the site itself. As expected, the ``getPath()`` and ``setPath()`` methods can be used to manipulate it: .. literalinclude:: uri/016.php -.. note:: When setting the path this way, or any other way the class allows, it is sanitized to encode any dangerous +.. note:: When setting the path it is sanitized to encode any dangerous characters, and remove dot segments for safety. .. note:: Since v4.4.0, the ``SiteURI::getRoutePath()`` method, @@ -166,7 +166,7 @@ be set as a string currently. .. literalinclude:: uri/017.php -The ``setQuery()`` method overwrite any existing query variables. +The ``setQuery()`` method overwrites existing query variables. .. note:: Query values cannot contain fragments. An InvalidArgumentException will be thrown if it does. @@ -177,7 +177,7 @@ You can set query values using an array: .. literalinclude:: uri/018.php -The ``setQueryArray()`` method overwrite any existing query variables. +The ``setQueryArray()`` method overwrites existing query variables. Adding Query Value ^^^^^^^^^^^^^^^^^^ @@ -196,11 +196,12 @@ You can filter the query values returned by passing an options array to the ``ge .. literalinclude:: uri/020.php -This only changes the values returned during this one call. If you need to modify the URI's query values more permanently, +This only changes the values returned during this one call. Changing Query Values ^^^^^^^^^^^^^^^^^^^^^ +If you need to modify the URI's query values more permanently, you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actual object's query variable collection: .. literalinclude:: uri/021.php From b632fd243946821eea7dcdc40a69414752ec4b3f Mon Sep 17 00:00:00 2001 From: "John Paul E. Balandan, CPA" Date: Tue, 14 May 2024 01:01:39 +0800 Subject: [PATCH 6937/8282] Bump to phpstan v1.11 --- composer.json | 4 ++-- phpstan.neon.dist | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 1fd90b6ac762..8cb3583805ce 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,8 @@ "nexusphp/cs-config": "^3.6", "nexusphp/tachycardia": "^2.0", "phpstan/extension-installer": "^1.3", - "phpstan/phpstan": "^1.10.2", - "phpstan/phpstan-strict-rules": "^1.5", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-strict-rules": "^1.6", "phpunit/phpcov": "^9.0.2", "phpunit/phpunit": "^10.5.16", "predis/predis": "^1.1 || ^2.0", diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 7dd53849a9a8..eccd0f88db75 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -31,7 +31,9 @@ parameters: - tests/system/View/Views/* scanDirectories: - system/Helpers - checkGenericClassInNonGenericObjectType: false + ignoreErrors: + - + identifier: missingType.generics checkMissingCallableSignature: true treatPhpDocTypesAsCertain: false strictRules: From 61c457789d7e0acbac5d9c4f68b346a797b105ab Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 14 May 2024 10:13:54 +0900 Subject: [PATCH 6938/8282] chore: improve userguide deploy script --- admin/userguide/.github/scripts/deploy | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/userguide/.github/scripts/deploy b/admin/userguide/.github/scripts/deploy index 0347c004dfff..ba1ce42d6a84 100755 --- a/admin/userguide/.github/scripts/deploy +++ b/admin/userguide/.github/scripts/deploy @@ -2,7 +2,8 @@ # Deploys the User Guide to the production # website. Triggered by updates to the GitHub -# repo's master branch. +# codeigniter4/userguide repo's master branch. +# See https://github.com/codeigniter4/userguide/blob/master/.github/workflows/deploy.yml REPO=/opt/userguide SITE=/home/public_html/userguides/userguide4 @@ -11,5 +12,7 @@ cd "$REPO" git switch master git pull -rm -rf "$SITE" -cp -R "$REPO/docs" "$SITE" +cp -R "$REPO/docs" "$SITE.new" +mv "$SITE" "$SITE.old" +mv "$SITE.new" "$SITE" +rm -rf "$SITE.old" From 9390da10042a4b49e09ede3905c3cf51c8965b45 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 May 2024 12:00:11 +0900 Subject: [PATCH 6939/8282] docs: use list for readability --- contributing/pull_request.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 66bdd9151ccd..06ae3aed3e9d 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -200,10 +200,10 @@ working on your contribution. ### Branching -All bug fixes should be sent to the __"develop"__ branch, this is where the next -bug fix version will be developed. +- All bug fix PRs should be sent to the __"develop"__ branch, this is where the + next bug fix version will be developed. +- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ -PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an emergency security patch) can be applied to the From 8dc546cdeccc094233081cbda7c4bde70e955515 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 May 2024 12:00:44 +0900 Subject: [PATCH 6940/8282] docs: add note --- contributing/pull_request.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 06ae3aed3e9d..9e473e515b1b 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -204,6 +204,9 @@ working on your contribution. next bug fix version will be developed. - PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ +> [!NOTE] +> If you sent your PR to the wrong branch, see +> [Contribution Workflow](./workflow.md#if-you-sent-to-the-wrong-branch). The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an emergency security patch) can be applied to the From 78731c5df22565218c9910ec81a68d73db0cac75 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 May 2024 12:01:08 +0900 Subject: [PATCH 6941/8282] docs: update sample branch name to `4.6` --- contributing/workflow.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/contributing/workflow.md b/contributing/workflow.md index d893c18f0fb0..30dfc80492af 100644 --- a/contributing/workflow.md +++ b/contributing/workflow.md @@ -18,7 +18,7 @@ values for when you try these: - All bug fix PRs should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed. -- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__ +- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ The "master" branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g: an emergency security @@ -114,7 +114,7 @@ is optional, and implies a sort of namespacing if used. - All bug fix PRs should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed. -- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.5"__ +- PRs with any enhancement should be sent to next minor version branch, e.g. __"4.6"__ For instance, if you send a PR to __"develop"__ branch, make sure you are in the *develop* branch, and create a new bugfix branch, based on *develop*, for a new @@ -126,11 +126,11 @@ feature you are creating: ``` If you send a PR with an enhancement, make sure you are in the *next minor version* -branch, and create a new feature branch, based on, e.g., __"4.5"__, for a new +branch, and create a new feature branch, based on, e.g., __"4.6"__, for a new feature you are creating: ```console -> git switch 4.5 +> git switch 4.6 > git switch -c new/mind-reader ``` @@ -283,7 +283,7 @@ switching to the branch you wish to contribute, and then clicking on "New pull request". Make sure the pull request is for the shared __"develop"__ or next minor version -branch, e.g. __"4.5"__, or it may be rejected. +branch, e.g. __"4.6"__, or it may be rejected. Make sure that the PR title is helpful for the maintainers and other developers. Add any comments appropriate, for instance asking for @@ -324,7 +324,7 @@ And if your PRs have the breaking changes, label the following label: If you are asked for changes in the review, commit the fix in your branch and push it to GitHub again. -If the __"develop"__ or next minor version branch, e.g. __"4.5"__, progresses +If the __"develop"__ or next minor version branch, e.g. __"4.6"__, progresses and conflicts arise that prevent merging, or if you are asked to *rebase*, do the following: @@ -364,7 +364,7 @@ And finally push your local branch to your GitHub repository: If you have sent a PR to the wrong branch, you need to create a new PR branch. -When you have the PR branch `feat-abc` and you should have sent the PR to __"4.5"__, +When you have the PR branch `feat-abc` and you should have sent the PR to __"4.6"__, but you created the PR branch from `develop` and sent a PR. Copy the IDs of any commits you made that you want to keep: @@ -373,13 +373,13 @@ Copy the IDs of any commits you made that you want to keep: > git log ``` -Update your __"4.5"__ branch: +Update your __"4.6"__ branch: ```console > git fetch upstream -> git switch 4.5 -> git merge upstream/4.5 -> git push origin 4.5 +> git switch 4.6 +> git merge upstream/4.6 +> git push origin 4.6 ``` (Optional) Create a new branch as a backup, just in case: @@ -388,10 +388,10 @@ Update your __"4.5"__ branch: > git branch feat-abc.bk feat-abc ``` -Rebase your PR branch from `develop` onto __"4.5"__: +Rebase your PR branch from `develop` onto __"4.6"__: ```console -> git rebase --onto 4.5 develop feat-abc +> git rebase --onto 4.6 develop feat-abc ``` Force push. @@ -400,7 +400,7 @@ Force push. > git push --force-with-lease origin feat-abc ``` -On the GitHub PR page, change the base branch to the correct branch __"4.5"__. +On the GitHub PR page, change the base branch to the correct branch __"4.6"__. ## Cleanup From 3f5aecc84be5c946fa092c94d0cd11015df4c1fc Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 15 May 2024 12:07:08 +0900 Subject: [PATCH 6942/8282] docs: add note --- contributing/pull_request.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributing/pull_request.md b/contributing/pull_request.md index 9e473e515b1b..05e060f797ec 100644 --- a/contributing/pull_request.md +++ b/contributing/pull_request.md @@ -238,6 +238,10 @@ This is *not* just a "signed-off-by" commit, but instead, a digitally signed one See [Contribution signing](./signing.md) for details. +> [!NOTE] +> If you forgot GPG-signing your commits, see +> [Contribution Workflow](./workflow.md#gpg-signing-old-commits). + ### Static Analysis on PHP code We cannot, at all times, guarantee that all PHP code submitted on pull requests From bce69e8924c504bbe1d23802cb43293da45dc0b8 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 16 May 2024 11:07:10 +0900 Subject: [PATCH 6943/8282] docs: update outdated note --- user_guide_src/source/concepts/factories.rst | 2 ++ user_guide_src/source/general/modules.rst | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst index 10975798490b..f98fd1726e38 100644 --- a/user_guide_src/source/concepts/factories.rst +++ b/user_guide_src/source/concepts/factories.rst @@ -86,6 +86,8 @@ The following code loads **app/Libraries/Sub/SubLib.php** if it exists: .. literalinclude:: factories/013.php :lines: 2- +.. _factories-passing-fully-qualified-classname: + Passing Fully Qualified Classname --------------------------------- diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 4e5c72a9fa9b..715cdd5386e4 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -272,9 +272,11 @@ Model files are automatically discovered whenever using the :php:func:`model()` .. note:: We don't recommend you use the same short classname in modules. -.. note:: ``model()`` finds the file in **app/Models/** when there is a class with the same shortname, - even if you specify a fully qualified class name like ``model(\Acme\Blog\Model\PostModel::class)``. - This is because ``model()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-loading-class` for more information. +.. note:: Prior to v4.4.0, ``model()`` finds the file in **app/Models/** when + there is a class with the same shortname, even if you specify a fully qualified + class name like ``model(\Acme\Blog\Model\PostModel::class)``. + See the Note in :ref:`factories-passing-fully-qualified-classname` for more + information. Views ===== From 382e32abb1e3910f2d64891777bf7c921fc1aaf5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 16 May 2024 11:12:12 +0900 Subject: [PATCH 6944/8282] docs: improve link --- user_guide_src/source/general/modules.rst | 2 +- user_guide_src/source/outgoing/views.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 715cdd5386e4..67967f5ed1d8 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -281,6 +281,6 @@ Model files are automatically discovered whenever using the :php:func:`model()` Views ===== -Views can be loaded using the class namespace as described in the :doc:`views ` documentation: +Views can be loaded using the class namespace as described in the :ref:`views ` documentation: .. literalinclude:: modules/012.php diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst index 611631ea6d5a..c08a3e61f97f 100644 --- a/user_guide_src/source/outgoing/views.rst +++ b/user_guide_src/source/outgoing/views.rst @@ -86,6 +86,8 @@ When doing so you will need to include the directory name loading the view. Exam .. literalinclude:: views/004.php :lines: 2- +.. _namespaced-views: + Namespaced Views ================ From 1af5192f42290c7c3564511beed79e71bf134209 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 16 May 2024 11:12:28 +0900 Subject: [PATCH 6945/8282] docs: make function linkable --- user_guide_src/source/general/modules.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst index 67967f5ed1d8..a077b8f5523d 100644 --- a/user_guide_src/source/general/modules.rst +++ b/user_guide_src/source/general/modules.rst @@ -251,7 +251,8 @@ You can specify namespaces. See :ref:`helpers-loading-from-specified-namespace` Language Files ============== -Language files are located automatically from defined namespaces when using the ``lang()`` method, as long as the +Language files are located automatically from defined namespaces when using the +:php:func:`lang()` function, as long as the file follows the same directory structures as the main application directory. Libraries From a909c07f18359efc9eedb965760190d7e8b6a17a Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 17 May 2024 21:39:38 +0900 Subject: [PATCH 6946/8282] chore: improve deploy script --- admin/userguide/.github/scripts/{deploy => deploy.sh} | 9 +++++++-- admin/userguide/.github/workflows/deploy.yml | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) rename admin/userguide/.github/scripts/{deploy => deploy.sh} (66%) diff --git a/admin/userguide/.github/scripts/deploy b/admin/userguide/.github/scripts/deploy.sh similarity index 66% rename from admin/userguide/.github/scripts/deploy rename to admin/userguide/.github/scripts/deploy.sh index ba1ce42d6a84..43e0675db0e6 100755 --- a/admin/userguide/.github/scripts/deploy +++ b/admin/userguide/.github/scripts/deploy.sh @@ -5,8 +5,13 @@ # codeigniter4/userguide repo's master branch. # See https://github.com/codeigniter4/userguide/blob/master/.github/workflows/deploy.yml -REPO=/opt/userguide -SITE=/home/public_html/userguides/userguide4 +REPO="/opt/userguide" +SITE="/home/public_html/userguides/userguide4" + +if [ "$(id -u)" = "0" ]; then + echo "Cannot be run as root. Please run as the user for deployment." + exit 1 +fi cd "$REPO" git switch master diff --git a/admin/userguide/.github/workflows/deploy.yml b/admin/userguide/.github/workflows/deploy.yml index ac8027fc7410..d244eb415978 100644 --- a/admin/userguide/.github/workflows/deploy.yml +++ b/admin/userguide/.github/workflows/deploy.yml @@ -4,7 +4,7 @@ name: Deploy Production on: push: - branches: + branches: - master jobs: @@ -19,4 +19,4 @@ jobs: username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} port: ${{ secrets.PORT }} - script: /opt/userguide/.github/scripts/deploy + script: /opt/userguide/.github/scripts/deploy.sh From 4b6bcfa9d4786a9f9f0c3b424b7c9ffe0bdda9ef Mon Sep 17 00:00:00 2001 From: obozdag Date: Sun, 19 May 2024 20:56:18 +0200 Subject: [PATCH 6947/8282] docs: Rollback misleading changes in libraries/uploaded_files.rst Rollback misleading changes in libraries/uploaded_files.rst --- user_guide_src/source/libraries/uploaded_files.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index 89dfdf039586..c6cd88d46016 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -83,7 +83,7 @@ this code and save it to your **app/Controllers** directory: .. literalinclude:: uploaded_files/002.php -Since HTML file element has no value attribute, and the upload file is stored in the +Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global, only :ref:`rules-for-file-uploads` can be used to validate the upload file with :doc:`validation`. @@ -398,4 +398,8 @@ passing it as the second parameter: .. literalinclude:: uploaded_files/020.php -Storing an uploaded file can fail, with an ``HTTPException``, under same circumstances like moving file. +Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances: + +- the file has already been moved +- the file did not upload successfully +- the file move operation fails (e.g., improper permissions) From 4a0efa5efd50a8be42d8e6856c1b3918a2a341ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 15:21:00 +0000 Subject: [PATCH 6948/8282] chore(deps-dev): update rector/rector requirement from 1.0.5 to 1.1.0 Updates the requirements on [rector/rector](https://github.com/rectorphp/rector) to permit the latest version. - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/1.0.5...1.1.0) --- updated-dependencies: - dependency-name: rector/rector dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8cb3583805ce..afaf2e9cb60e 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "phpunit/phpcov": "^9.0.2", "phpunit/phpunit": "^10.5.16", "predis/predis": "^1.1 || ^2.0", - "rector/rector": "1.0.5", + "rector/rector": "1.1.0", "vimeo/psalm": "^5.0" }, "replace": { From 627a28a663297ac992b069851e3156bf510e1b85 Mon Sep 17 00:00:00 2001 From: obozdag Date: Tue, 21 May 2024 08:45:18 +0200 Subject: [PATCH 6949/8282] docs: Prevent text-wrap in user guide Prevent text-wrap in user guide. For example $this- >validateData() should stay unwrapped ($this->validateData()). --- user_guide_src/source/_static/css/citheme.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/user_guide_src/source/_static/css/citheme.css b/user_guide_src/source/_static/css/citheme.css index 3410fbc5cbb2..b3264e096336 100644 --- a/user_guide_src/source/_static/css/citheme.css +++ b/user_guide_src/source/_static/css/citheme.css @@ -245,6 +245,10 @@ html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not( background-color: #fffff0; } +span.std { + text-wrap: nowrap; +} + /* Messages ----------------------------------------------------------------- */ .rst-content .success { From 02ada60fb3ade14bace81ab5a9614d69207f996a Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Thu, 2 May 2024 15:28:51 +0700 Subject: [PATCH 6950/8282] docs: fix PHPDocs View --- phpstan-baseline.php | 182 +----------------------------- system/View/Parser.php | 30 ++++- system/View/RendererInterface.php | 19 ++-- system/View/Table.php | 29 ++--- system/View/View.php | 32 +++--- 5 files changed, 68 insertions(+), 224 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index c9b399ed3a8e..3c1ceaa90b39 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -9006,171 +9006,21 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/Parser.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:applyFilters\\(\\) has parameter \\$filters with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:objectToArray\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:objectToArray\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parse\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parse\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parsePair\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parsePair\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:parseSingle\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:prepareReplacement\\(\\) has parameter \\$matches with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:replaceSingle\\(\\) has parameter \\$pattern with no value type specified in iterable type array\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/View/Parser.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Parser\\:\\:\\$dataContexts type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Parser\\:\\:\\$noparseBlocks type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Parser.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/RendererInterface.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/RendererInterface.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\RendererInterface\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/RendererInterface.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:__construct\\(\\) has parameter \\$config with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_defaultTemplate\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_prepArgs\\(\\) has parameter \\$args with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_prepArgs\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:_setFromArray\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:generate\\(\\) has parameter \\$tableData with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) has parameter \\$array with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Table\\:\\:setTemplate\\(\\) has parameter \\$template with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; $ignoreErrors[] = [ 'message' => '#^Only booleans are allowed in an if condition, string\\|null given\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/View/Table.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$footing type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$function type has no signature specified for callable\\.$#', 'count' => 1, 'path' => __DIR__ . '/system/View/Table.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$heading type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$rows type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\Table\\:\\:\\$template type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Table.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9186,26 +9036,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/View.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:render\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:renderString\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:setData\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$data type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$performanceData type has no value type specified in iterable type array\\.$#', 'count' => 1, @@ -9221,11 +9051,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/View.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$tempData type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 2, @@ -15992,15 +15817,10 @@ 'path' => __DIR__ . '/tests/system/View/TableTest.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$array of method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) expects array, string given\\.$#', + 'message' => '#^Parameter \\#1 \\$array of method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) expects array\\, string given\\.$#', 'count' => 1, 'path' => __DIR__ . '/tests/system/View/TableTest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$template of method CodeIgniter\\\\View\\\\Table\\:\\:setTemplate\\(\\) expects array, string given\\.$#', - 'count' => 2, - 'path' => __DIR__ . '/tests/system/View/TableTest.php', -]; $ignoreErrors[] = [ 'message' => '#^Parameter \\#2 \\$columnLimit of method CodeIgniter\\\\View\\\\Table\\:\\:makeColumns\\(\\) expects int, string given\\.$#', 'count' => 1, diff --git a/system/View/Parser.php b/system/View/Parser.php index 085252102e6e..bbeb00f757c0 100644 --- a/system/View/Parser.php +++ b/system/View/Parser.php @@ -56,7 +56,7 @@ class Parser extends View /** * Stores extracted noparse blocks. * - * @var array + * @var list */ protected $noparseBlocks = []; @@ -72,7 +72,7 @@ class Parser extends View * Stores the context for each data element * when set by `setData` so the context is respected. * - * @var array + * @var array */ protected $dataContexts = []; @@ -99,6 +99,10 @@ public function __construct( * * Parses pseudo-variables contained in the specified template view, * replacing them with any data that has already been set. + * + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. */ public function render(string $view, ?array $options = null, ?bool $saveData = null): string { @@ -159,6 +163,10 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n * * Parses pseudo-variables contained in the specified string, * replacing them with any data that has already been set. + * + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. */ public function renderString(string $template, ?array $options = null, ?bool $saveData = null): string { @@ -190,6 +198,7 @@ public function renderString(string $template, ?array $options = null, ?bool $sa * so that the variable is correctly handled within the * parsing itself, and contexts (including raw) are respected. * + * @param array $data * @param non-empty-string|null $context The context to escape it for. * If 'raw', no escaping will happen. * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context @@ -222,7 +231,8 @@ public function setData(array $data = [], ?string $context = null): RendererInte * Parses pseudo-variables contained in the specified template, * replacing them with the data in the second param * - * @param array $options Future options + * @param array $data + * @param array $options Future options */ protected function parse(string $template, array $data = [], ?array $options = null): string { @@ -266,6 +276,8 @@ protected function parse(string $template, array $data = [], ?array $options = n /** * Parse a single key/value, extracting it + * + * @return array */ protected function parseSingle(string $key, string $val): array { @@ -280,6 +292,10 @@ protected function parseSingle(string $key, string $val): array * Parse a tag pair * * Parses tag pairs: {some_tag} string... {/some_tag} + * + * @param array $data + * + * @return array */ protected function parsePair(string $variable, array $data, string $template): array { @@ -533,6 +549,8 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f /** * Callback used during parse() to apply any filters to the value. + * + * @param list $matches */ protected function prepareReplacement(array $matches, string $replace, bool $escape = true): string { @@ -586,6 +604,8 @@ public function shouldAddEscaping(string $key) /** * Given a set of filters, will apply each of the filters in turn * to $replace, and return the modified string. + * + * @param list $filters */ protected function applyFilters(string $replace, array $filters): string { @@ -708,9 +728,9 @@ public function removePlugin(string $alias) * Converts an object to an array, respecting any * toArray() methods on an object. * - * @param array|bool|float|int|object|string|null $value + * @param array|bool|float|int|object|string|null $value * - * @return array|bool|float|int|string|null + * @return array|bool|float|int|string|null */ protected function objectToArray($value) { diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php index 62d3d7825060..5fdf8794f12d 100644 --- a/system/View/RendererInterface.php +++ b/system/View/RendererInterface.php @@ -24,10 +24,10 @@ interface RendererInterface * Builds the output based upon a file name and any * data that has already been set. * - * @param array|null $options Reserved for 3rd-party uses since - * it might be needed to pass additional info - * to other template engines. - * @param bool $saveData Whether to save data for subsequent calls + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. + * @param bool $saveData Whether to save data for subsequent calls */ public function render(string $view, ?array $options = null, bool $saveData = false): string; @@ -35,17 +35,18 @@ public function render(string $view, ?array $options = null, bool $saveData = fa * Builds the output based upon a string and any * data that has already been set. * - * @param string $view The view contents - * @param array|null $options Reserved for 3rd-party uses since - * it might be needed to pass additional info - * to other template engines. - * @param bool $saveData Whether to save data for subsequent calls + * @param string $view The view contents + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. + * @param bool $saveData Whether to save data for subsequent calls */ public function renderString(string $view, ?array $options = null, bool $saveData = false): string; /** * Sets several pieces of view data at once. * + * @param array $data * @param non-empty-string|null $context The context to escape it for. * If 'raw', no escaping will happen. * @phpstan-param null|'html'|'js'|'css'|'url'|'attr'|'raw' $context diff --git a/system/View/Table.php b/system/View/Table.php index 85770e31915d..60ccc509f9ae 100644 --- a/system/View/Table.php +++ b/system/View/Table.php @@ -27,21 +27,21 @@ class Table /** * Data for table rows * - * @var list|list> + * @var list>|list>> */ public $rows = []; /** * Data for table heading * - * @var array + * @var array */ public $heading = []; /** * Data for table footing * - * @var array + * @var array */ public $footing = []; @@ -62,7 +62,7 @@ class Table /** * Table layout template * - * @var array + * @var array */ public $template; @@ -95,7 +95,7 @@ class Table /** * Set the template from the table config file if it exists * - * @param array $config (default: array()) + * @param array $config (default: array()) */ public function __construct($config = []) { @@ -108,7 +108,8 @@ public function __construct($config = []) /** * Set the template * - * @param array $template + * @param array $template + * @phpstan-param array|string $template * * @return bool */ @@ -157,10 +158,10 @@ public function setFooting() * columns. This allows a single array with many elements to be * displayed in a table that has a fixed column count. * - * @param array $array - * @param int $columnLimit + * @param list $array + * @param int $columnLimit * - * @return array|false + * @return array|false */ public function makeColumns($array = [], $columnLimit = 0) { @@ -260,7 +261,9 @@ public function setSyncRowsWithHeading(bool $orderByKey) * * Ensures a standard associative array format for all cell data * - * @return array|list + * @param array $args + * + * @return array>|list> */ protected function _prepArgs(array $args) { @@ -297,7 +300,7 @@ public function setCaption($caption) /** * Generate the table * - * @param array|BaseResult|null $tableData + * @param array|BaseResult|null $tableData * * @return string */ @@ -472,7 +475,7 @@ protected function _setFromDBResult($object) /** * Set table data from an array * - * @param array $data + * @param array $data * * @return void */ @@ -510,7 +513,7 @@ protected function _compileTemplate() /** * Default Template * - * @return array + * @return array */ protected function _defaultTemplate() { diff --git a/system/View/View.php b/system/View/View.php index cda3d64f6088..8f630d7b90f3 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -34,14 +34,14 @@ class View implements RendererInterface /** * Saved Data. * - * @var array + * @var array */ protected $data = []; /** * Data for the variables that are available in the Views. * - * @var array|null + * @var array|null */ protected $tempData; @@ -165,13 +165,13 @@ public function __construct( * - cache Number of seconds to cache for * - cache_name Name to use for cache * - * @param string $view File name of the view source - * @param array|null $options Reserved for 3rd-party uses since - * it might be needed to pass additional info - * to other template engines. - * @param bool|null $saveData If true, saves data for subsequent calls, - * if false, cleans the data after displaying, - * if null, uses the config setting. + * @param string $view File name of the view source + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. + * @param bool|null $saveData If true, saves data for subsequent calls, + * if false, cleans the data after displaying, + * if null, uses the config setting. */ public function render(string $view, ?array $options = null, ?bool $saveData = null): string { @@ -306,13 +306,13 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n * data that has already been set. * Cache does not apply, because there is no "key". * - * @param string $view The view contents - * @param array|null $options Reserved for 3rd-party uses since - * it might be needed to pass additional info - * to other template engines. - * @param bool|null $saveData If true, saves data for subsequent calls, - * if false, cleans the data after displaying, - * if null, uses the config setting. + * @param string $view The view contents + * @param array|null $options Reserved for 3rd-party uses since + * it might be needed to pass additional info + * to other template engines. + * @param bool|null $saveData If true, saves data for subsequent calls, + * if false, cleans the data after displaying, + * if null, uses the config setting. */ public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string { From d88ad38c8dbf1b95422b64f2a174fcef200c4b1b Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 3 May 2024 08:08:37 +0700 Subject: [PATCH 6951/8282] docs: fix PHPDocs for View --- phpstan-baseline.php | 55 ----------------------------------------- system/View/Cell.php | 13 +++++----- system/View/Filters.php | 2 +- system/View/View.php | 13 +++++++--- 4 files changed, 17 insertions(+), 66 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index 3c1ceaa90b39..995190b9d740 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -8936,21 +8936,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/Cell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:prepareParams\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Cell.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:prepareParams\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Cell.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:render\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Cell.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\View\\\\Cell\\:\\:renderCell\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#', 'count' => 1, @@ -8996,11 +8981,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/Cells/Cell.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\Filters\\:\\:default\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/Filters.php', -]; $ignoreErrors[] = [ 'message' => '#^Method CodeIgniter\\\\View\\\\Parser\\:\\:addPlugin\\(\\) has parameter \\$callback with no signature specified for callable\\.$#', 'count' => 1, @@ -9021,36 +9001,6 @@ 'count' => 1, 'path' => __DIR__ . '/system/View/Table.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:getData\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:getPerformanceData\\(\\) return type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Method CodeIgniter\\\\View\\\\View\\:\\:include\\(\\) has parameter \\$options with no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$performanceData type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$renderVars type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Property CodeIgniter\\\\View\\\\View\\:\\:\\$sections type has no value type specified in iterable type array\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/system/View/View.php', -]; $ignoreErrors[] = [ 'message' => '#^Short ternary operator is not allowed\\. Use null coalesce operator if applicable or consider using long ternary\\.$#', 'count' => 2, @@ -15691,11 +15641,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/system/Validation/ValidationTest.php', ]; -$ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$params of method CodeIgniter\\\\View\\\\Cell\\:\\:prepareParams\\(\\) expects array\\|string\\|null, float given\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/system/View/CellTest.php', -]; $ignoreErrors[] = [ 'message' => '#^Property CodeIgniter\\\\View\\\\DecoratorsTest\\:\\:\\$loader \\(CodeIgniter\\\\Autoloader\\\\FileLocator\\) does not accept CodeIgniter\\\\Autoloader\\\\FileLocatorInterface\\.$#', 'count' => 1, diff --git a/system/View/Cell.php b/system/View/Cell.php index cafe13d161e0..28b249a60e1c 100644 --- a/system/View/Cell.php +++ b/system/View/Cell.php @@ -68,10 +68,10 @@ public function __construct(CacheInterface $cache) /** * Render a cell, returning its body as a string. * - * @param string $library Cell class and method name. - * @param array|string|null $params Parameters to pass to the method. - * @param int $ttl Number of seconds to cache the cell. - * @param string|null $cacheName Cache item name. + * @param string $library Cell class and method name. + * @param array|string|null $params Parameters to pass to the method. + * @param int $ttl Number of seconds to cache the cell. + * @param string|null $cacheName Cache item name. * * @throws ReflectionException */ @@ -117,9 +117,10 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c * If a string, it should be in the format "key1=value key2=value". * It will be split and returned as an array. * - * @param array|string|null $params + * @param array|string|null $params + * @phpstan-param array|string|float|null $params * - * @return array + * @return array */ public function prepareParams($params) { diff --git a/system/View/Filters.php b/system/View/Filters.php index 56204c86c3d2..dde9ec6d663d 100644 --- a/system/View/Filters.php +++ b/system/View/Filters.php @@ -67,7 +67,7 @@ public static function date_modify($value, string $adjustment) /** * Returns the given default value if $value is empty or undefined. * - * @param array|bool|float|int|object|resource|string|null $value + * @param bool|float|int|list|object|resource|string|null $value */ public static function default($value, string $default): string { diff --git a/system/View/View.php b/system/View/View.php index 8f630d7b90f3..1aec11cab57b 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -55,7 +55,7 @@ class View implements RendererInterface /** * Data for rendering including Caching and Debug Toolbar data. * - * @var array + * @var array */ protected $renderVars = []; @@ -86,7 +86,7 @@ class View implements RendererInterface * Cache stats about our performance here, * when CI_DEBUG = true * - * @var array + * @var list */ protected $performanceData = []; @@ -120,7 +120,7 @@ class View implements RendererInterface /** * Holds the sections and their data. * - * @var array + * @var array> */ protected $sections = []; @@ -393,6 +393,8 @@ public function resetData(): RendererInterface /** * Returns the current data that will be displayed in the view. + * + * @return array */ public function getData(): array { @@ -477,7 +479,8 @@ public function renderSection(string $sectionName, bool $saveData = false) /** * Used within layout views to include additional views. * - * @param bool $saveData + * @param array|null $options + * @param bool $saveData */ public function include(string $view, ?array $options = null, $saveData = true): string { @@ -487,6 +490,8 @@ public function include(string $view, ?array $options = null, $saveData = true): /** * Returns the performance data that might have been collected * during the execution. Used primarily in the Debug Toolbar. + * + * @return list */ public function getPerformanceData(): array { From 93267dab39261b1f2ea0a46a1f86b3e49ba92979 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Wed, 22 May 2024 15:19:25 +0700 Subject: [PATCH 6952/8282] docs: fix PHPDocs in View --- system/View/View.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/View/View.php b/system/View/View.php index 1aec11cab57b..7b6bfea0bba5 100644 --- a/system/View/View.php +++ b/system/View/View.php @@ -86,7 +86,7 @@ class View implements RendererInterface * Cache stats about our performance here, * when CI_DEBUG = true * - * @var list + * @var list */ protected $performanceData = []; @@ -491,7 +491,7 @@ public function include(string $view, ?array $options = null, $saveData = true): * Returns the performance data that might have been collected * during the execution. Used primarily in the Debug Toolbar. * - * @return list + * @return list */ public function getPerformanceData(): array { From 550557e9b6ab092056f43ed21a76fe238d342795 Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 23 May 2024 15:13:37 +0200 Subject: [PATCH 6953/8282] docs: Small typos in libraries/validation.rst Small typos in libraries/validation.rst --- .../source/libraries/validation.rst | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst index 3b16ad588d87..899389d2d004 100644 --- a/user_guide_src/source/libraries/validation.rst +++ b/user_guide_src/source/libraries/validation.rst @@ -743,7 +743,7 @@ Configuration ============= Once you have your views created, you need to let the Validation library know about them. Open **app/Config/Validation.php**. -Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an +Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide a short alias they can be referenced by. If we were to add our example file from above, it would look something like: .. literalinclude:: validation/032.php @@ -769,7 +769,7 @@ Creating Custom Rules Using Rule Classes ================== -Rules are stored within simple, namespaced classes. They can be stored any location you would like, as long as the +Rules are stored within simple, namespaced classes. They can be stored in any location you would like, as long as the autoloader can find it. These files are called RuleSets. Adding a RuleSet @@ -781,7 +781,7 @@ add the new file to the ``$ruleSets`` array: .. literalinclude:: validation/033.php You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as -shown above. The primary benefit here is that it provides some extra navigation capabilities in more advanced IDEs. +shown above. The primary benefit of using the ``::class`` suffix is that it provides some extra navigation capabilities in more advanced IDEs. Creating a Rule Class --------------------- @@ -921,8 +921,9 @@ decimal No Fails if field contains anything other than ``-`` sign for the number. differs Yes Fails if field does not differ from the one ``differs[field_name]`` in the parameter. -exact_length Yes Fails if field is not exactly the parameter ``exact_length[5]`` or ``exact_length[5,8,12]`` - value. One or more comma-separated values. +exact_length Yes Fails if field length is not exactly ``exact_length[5]`` or ``exact_length[5,8,12]`` + the parameter value. One or more + comma-separated values are possible. field_exists Yes Fails if field does not exist. (This rule was added in v4.5.0.) greater_than Yes Fails if field is less than or equal to ``greater_than[8]`` @@ -943,7 +944,7 @@ is_natural No Fails if field contains anything other than is_natural_no_zero No Fails if field contains anything other than a natural number, except zero: 1, 2, 3, etc. is_not_unique Yes Checks the database to see if the given value ``is_not_unique[table.field,where_field,where_value]`` - exist. Can ignore records by field/value to + exists. Can ignore records by field/value to filter (currently accept only one filter). is_unique Yes Checks if this field value exists in the ``is_unique[table.field,ignore_field,ignore_value]`` database. Optionally set a column and value @@ -975,8 +976,8 @@ required_without Yes The field is required when any of the other fields is `empty()`_ in the data. string No A generic alternative to the alpha* rules that confirms the element is a string -timezone No Fails if field does match a timezone per - `timezone_identifiers_list()`_ +timezone No Fails if field does not match a timezone + per `timezone_identifiers_list()`_ valid_base64 No Fails if field contains anything other than valid Base64 characters. valid_json No Fails if field does not contain a valid JSON @@ -1001,7 +1002,7 @@ valid_url_strict Yes Fails if field does not contain a valid URL. valid_date Yes Fails if field does not contain a valid date. ``valid_date[d/m/Y]`` Any string that `strtotime()`_ accepts is valid if you don't specify an optional - parameter to matches a date format. + parameter that matches a date format. **So it is usually necessary to specify the parameter.** valid_cc_number Yes Verifies that the credit card number matches ``valid_cc_number[amex]`` @@ -1069,9 +1070,9 @@ uploaded Yes Fails if the name of the parameter does not If you want the file upload to be optional (not required), do not define this rule. -max_size Yes Fails if the uploaded file named in the ``max_size[field_name,2048]`` - parameter is larger than the second - parameter in kilobytes (kb). Or if the file +max_size Yes Fails if the uploaded file is larger ``max_size[field_name,2048]`` + than the second parameter + in kilobytes (kb). Or if the file is larger than allowed maximum size declared in php.ini config file - ``upload_max_filesize`` directive. From d0baacf5623501b9a90fdf4b8a38dc8bca7c304d Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 23 May 2024 15:18:57 +0200 Subject: [PATCH 6954/8282] docs: Small typo in libraries/validation/037.php Small typo in libraries/validation/037.php --- user_guide_src/source/libraries/validation/037.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php index 450c5de1a9cc..1a05b912d397 100644 --- a/user_guide_src/source/libraries/validation/037.php +++ b/user_guide_src/source/libraries/validation/037.php @@ -17,7 +17,7 @@ public function required_with($value, string $params, array $data): bool // Still here? Then we fail this test if // any of the fields are present in $data - // as $fields is the lis + // as $fields in the list $requiredFields = []; foreach ($params as $field) { From e126b2facc8369404b6dcc5b5d6ed435869cc930 Mon Sep 17 00:00:00 2001 From: obozdag Date: Fri, 24 May 2024 04:25:08 +0200 Subject: [PATCH 6955/8282] docs: Change last sentence in humanize() in libraries/time.rst Change last sentence in humanize() in libraries/time.rst --- user_guide_src/source/libraries/time.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst index f4924d600442..bbf6066f886c 100644 --- a/user_guide_src/source/libraries/time.rst +++ b/user_guide_src/source/libraries/time.rst @@ -213,7 +213,8 @@ now < $time < 1 hour in 35 minutes / 35 minutes ago $time == now Now =============================== ================================= -The result strings are coming from the language file, **app/Language/{locale}/Time.php**. +The result strings are coming from the language file, **system/Language/en/Time.php**. +If you want to overwrite them, create **app/Language/{locale}/Time.php**. ****************************** Working with Individual Values From 0a45ea8a35afdecc51020553faadec29310a7ec1 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 May 2024 09:33:37 +0900 Subject: [PATCH 6956/8282] test: add test for Postgre error message --- .../Database/Live/Postgre/ConnectTest.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 tests/system/Database/Live/Postgre/ConnectTest.php diff --git a/tests/system/Database/Live/Postgre/ConnectTest.php b/tests/system/Database/Live/Postgre/ConnectTest.php new file mode 100644 index 000000000000..29de0976eb21 --- /dev/null +++ b/tests/system/Database/Live/Postgre/ConnectTest.php @@ -0,0 +1,55 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace CodeIgniter\Database\Live\Postgre; + +use CodeIgniter\Database\Exceptions\DatabaseException; +use CodeIgniter\Test\CIUnitTestCase; +use Config\Database; +use PHPUnit\Framework\Attributes\Group; + +/** + * @internal + */ +#[Group('DatabaseLive')] +final class ConnectTest extends CIUnitTestCase +{ + protected function setUp(): void + { + parent::setUp(); + + $this->db = Database::connect($this->DBGroup); + + if ($this->db->DBDriver !== 'Postgre') { + $this->markTestSkipped('This test is only for Postgre.'); + } + } + + public function testShowErrorMessageWhenSettingInvalidCharset(): void + { + $this->expectException(DatabaseException::class); + $this->expectExceptionMessage( + 'Unable to connect to the database. +Main connection [Postgre]: ERROR: invalid value for parameter "client_encoding": "utf8mb4"' + ); + + $config = config('Database'); + $group = $config->tests; + // Sets invalid charset. + $group['charset'] = 'utf8mb4'; + $db = Database::connect($group); + + // Actually connect to DB. + $db->initialize(); + } +} From 35dc6429c364cb3c9c8a294de97eecbd0e0433a6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 May 2024 09:15:53 +0900 Subject: [PATCH 6957/8282] fix: missing Postgre error message --- system/Database/BaseConnection.php | 1 + system/Database/Postgre/Connection.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index 77c9bd39ef3e..6325fd691093 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -420,6 +420,7 @@ public function initialize() // Connect to the database and set the connection ID $this->connID = $this->connect($this->pConnect); } catch (Throwable $e) { + $this->connID = false; $connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage()); log_message('error', 'Error connecting to the database: ' . $e); } diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php index 126aa98bb1c2..b1b41d411b7e 100644 --- a/system/Database/Postgre/Connection.php +++ b/system/Database/Postgre/Connection.php @@ -80,7 +80,9 @@ public function connect(bool $persistent = false) if ($this->connID !== false) { if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false ) { - return false; + $error = pg_last_error($this->connID); + + throw new DatabaseException($error); } if (! empty($this->schema)) { @@ -88,7 +90,9 @@ public function connect(bool $persistent = false) } if ($this->setClientEncoding($this->charset) === false) { - return false; + $error = pg_last_error($this->connID); + + throw new DatabaseException($error); } } From 8b3e4e377c2a7cd995781468b27882adbe73d6fe Mon Sep 17 00:00:00 2001 From: kenjis Date: Sat, 25 May 2024 09:20:20 +0900 Subject: [PATCH 6958/8282] style: break long lines --- system/Database/BaseConnection.php | 13 +++++++++++-- system/Database/Postgre/Connection.php | 5 ++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php index 6325fd691093..57c37d8a0a6c 100644 --- a/system/Database/BaseConnection.php +++ b/system/Database/BaseConnection.php @@ -421,7 +421,11 @@ public function initialize() $this->connID = $this->connect($this->pConnect); } catch (Throwable $e) { $this->connID = false; - $connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage()); + $connectionErrors[] = sprintf( + 'Main connection [%s]: %s', + $this->DBDriver, + $e->getMessage() + ); log_message('error', 'Error connecting to the database: ' . $e); } @@ -442,7 +446,12 @@ public function initialize() // Try to connect $this->connID = $this->connect($this->pConnect); } catch (Throwable $e) { - $connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage()); + $connectionErrors[] = sprintf( + 'Failover #%d [%s]: %s', + ++$index, + $this->DBDriver, + $e->getMessage() + ); log_message('error', 'Error connecting to the database: ' . $e); } diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php index b1b41d411b7e..c22dc8605f56 100644 --- a/system/Database/Postgre/Connection.php +++ b/system/Database/Postgre/Connection.php @@ -78,7 +78,10 @@ public function connect(bool $persistent = false) $this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN); if ($this->connID !== false) { - if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false + if ( + $persistent === true + && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD + && pg_ping($this->connID) === false ) { $error = pg_last_error($this->connID); From 2e480d56a41a4ecea8dad0534c0a16e61d475c4a Mon Sep 17 00:00:00 2001 From: obozdag Date: Sat, 25 May 2024 04:48:12 +0200 Subject: [PATCH 6959/8282] docs: Update libraries/time.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/time.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst index bbf6066f886c..b18e56350403 100644 --- a/user_guide_src/source/libraries/time.rst +++ b/user_guide_src/source/libraries/time.rst @@ -421,4 +421,5 @@ today < $time < 7 days in 4 days / 4 days ago $time < 1 minute Now =============================== ================================= -The result strings are coming from the language file, **app/Language/{locale}/Time.php**. +The result strings are coming from the language file, **system/Language/en/Time.php**. +If you want to overwrite them, create **app/Language/{locale}/Time.php**. From 4f819cbb7cde0952bd400d6f78d0a9a61556e2bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 24 May 2024 08:40:20 +0900 Subject: [PATCH 6960/8282] docs: simplify explanation --- user_guide_src/source/libraries/uploaded_files.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst index c6cd88d46016..7cc3084d306f 100644 --- a/user_guide_src/source/libraries/uploaded_files.rst +++ b/user_guide_src/source/libraries/uploaded_files.rst @@ -83,12 +83,10 @@ this code and save it to your **app/Controllers** directory: .. literalinclude:: uploaded_files/002.php -Since the value of a file upload HTML field doesn't exist, and is stored in the -``$_FILES`` global, only :ref:`rules-for-file-uploads` can be used to validate -the upload file with :doc:`validation`. +Only the :ref:`rules-for-file-uploads` can be used to validate uploaded files. -The rule ``required`` cannot be used either, so if the file is required, use -the rule ``uploaded`` instead. +Therefore, the rule ``required`` cannot be used either, so if the file is required, +use the rule ``uploaded`` instead. Note that an empty array (``[]``) is passed as the first argument to ``$this->validateData()``. It is because the file validation rules get the data From 8af1608752ffd6305e16137f480ee3e2f10fa630 Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 May 2024 10:24:32 +0900 Subject: [PATCH 6961/8282] docs: make description more detailed --- user_guide_src/source/models/model.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index edc4139a4d42..bf91f0a98ce3 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -659,9 +659,14 @@ prior to saving to the database with the ``insert()``, ``update()``, or ``save() .. important:: When you update data, by default, the validation in the model class only validates provided fields. This is to avoid validation errors when updating only some fields. - But this means ``required*`` rules do not work as expected when updating. - If you want to check required fields, you can change the behavior by configuration. - See :ref:`clean-validation-rules` for details. + However, this means that not all validation rules you set will be checked + during updates. Thus, incomplete data may pass the validation. + + For example, ``required*`` rules or ``is_unique`` rule that require the + values of other fields may not work as expected. + + To avoid such glitches, this behavior can be changed by configuration. See + :ref:`clean-validation-rules` for details. Setting Validation Rules ------------------------ From e19fc097b912afc4c389c4ba31b0a7ee74bd2fff Mon Sep 17 00:00:00 2001 From: kenjis Date: Mon, 27 May 2024 10:25:14 +0900 Subject: [PATCH 6962/8282] docs: add link to section --- user_guide_src/source/models/model.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst index bf91f0a98ce3..c77e68cb81b8 100644 --- a/user_guide_src/source/models/model.rst +++ b/user_guide_src/source/models/model.rst @@ -38,7 +38,7 @@ CodeIgniter does provide a model class that has a few nice features, including: - automatic database connection - basic CRUD methods -- in-model validation +- :ref:`in-model validation ` - :ref:`automatic pagination ` - and more From 6b0dfb19f4e7cb7e63d6540e0094eadc786528b5 Mon Sep 17 00:00:00 2001 From: obozdag Date: Mon, 27 May 2024 05:20:31 +0200 Subject: [PATCH 6963/8282] docs: Rollback the backuphandler explanation in libraries/caching.rst Rollback the backuphandler explanation in libraries/caching.rst --- user_guide_src/source/libraries/caching.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 647055749923..169fc681f6e6 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -42,7 +42,8 @@ $backupHandler ============== In the case that the first choice ``$handler`` is not available, this is the next cache handler to load. -The default backup handler is **dummy**. +This is commonly the ``File`` handler since the file system is always available, but may not fit +more complex, multi-server setups. $prefix ======= From 798d0554046e81ef300f5dbfb53d1097b90a1941 Mon Sep 17 00:00:00 2001 From: kenjis Date: Tue, 28 May 2024 21:37:32 +0900 Subject: [PATCH 6964/8282] style: remove unneeded x permissions --- admin/starter/tests/.htaccess | 0 admin/starter/tests/index.html | 0 app/Config/DocTypes.php | 0 system/Database/SQLSRV/Builder.php | 0 system/Database/SQLSRV/Connection.php | 0 system/Database/SQLSRV/Forge.php | 0 system/Database/SQLSRV/PreparedQuery.php | 0 system/Database/SQLSRV/Result.php | 0 system/Database/SQLSRV/Utils.php | 0 system/HTTP/IncomingRequest.php | 0 system/Helpers/cookie_helper.php | 0 system/Helpers/html_helper.php | 0 system/Helpers/inflector_helper.php | 0 system/Helpers/text_helper.php | 0 system/Test/Mock/MockResponse.php | 0 tests/system/Helpers/CookieHelperTest.php | 0 tests/system/Helpers/HTMLHelperTest.php | 0 tests/system/Helpers/InflectorHelperTest.php | 0 tests/system/Helpers/NumberHelperTest.php | 0 tests/system/Helpers/TextHelperTest.php | 0 user_guide_src/source/database/query_builder.rst | 0 user_guide_src/source/general/common_functions.rst | 0 user_guide_src/source/helpers/cookie_helper.rst | 0 user_guide_src/source/helpers/html_helper.rst | 0 user_guide_src/source/helpers/inflector_helper.rst | 0 user_guide_src/source/helpers/text_helper.rst | 0 writable/.htaccess | 0 writable/cache/index.html | 0 writable/debugbar/index.html | 0 writable/index.html | 0 writable/logs/index.html | 0 writable/session/index.html | 0 writable/uploads/index.html | 0 33 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 admin/starter/tests/.htaccess mode change 100755 => 100644 admin/starter/tests/index.html mode change 100755 => 100644 app/Config/DocTypes.php mode change 100755 => 100644 system/Database/SQLSRV/Builder.php mode change 100755 => 100644 system/Database/SQLSRV/Connection.php mode change 100755 => 100644 system/Database/SQLSRV/Forge.php mode change 100755 => 100644 system/Database/SQLSRV/PreparedQuery.php mode change 100755 => 100644 system/Database/SQLSRV/Result.php mode change 100755 => 100644 system/Database/SQLSRV/Utils.php mode change 100755 => 100644 system/HTTP/IncomingRequest.php mode change 100755 => 100644 system/Helpers/cookie_helper.php mode change 100755 => 100644 system/Helpers/html_helper.php mode change 100755 => 100644 system/Helpers/inflector_helper.php mode change 100755 => 100644 system/Helpers/text_helper.php mode change 100755 => 100644 system/Test/Mock/MockResponse.php mode change 100755 => 100644 tests/system/Helpers/CookieHelperTest.php mode change 100755 => 100644 tests/system/Helpers/HTMLHelperTest.php mode change 100755 => 100644 tests/system/Helpers/InflectorHelperTest.php mode change 100755 => 100644 tests/system/Helpers/NumberHelperTest.php mode change 100755 => 100644 tests/system/Helpers/TextHelperTest.php mode change 100755 => 100644 user_guide_src/source/database/query_builder.rst mode change 100755 => 100644 user_guide_src/source/general/common_functions.rst mode change 100755 => 100644 user_guide_src/source/helpers/cookie_helper.rst mode change 100755 => 100644 user_guide_src/source/helpers/html_helper.rst mode change 100755 => 100644 user_guide_src/source/helpers/inflector_helper.rst mode change 100755 => 100644 user_guide_src/source/helpers/text_helper.rst mode change 100755 => 100644 writable/.htaccess mode change 100755 => 100644 writable/cache/index.html mode change 100755 => 100644 writable/debugbar/index.html mode change 100755 => 100644 writable/index.html mode change 100755 => 100644 writable/logs/index.html mode change 100755 => 100644 writable/session/index.html mode change 100755 => 100644 writable/uploads/index.html diff --git a/admin/starter/tests/.htaccess b/admin/starter/tests/.htaccess old mode 100755 new mode 100644 diff --git a/admin/starter/tests/index.html b/admin/starter/tests/index.html old mode 100755 new mode 100644 diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php old mode 100755 new mode 100644 diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php old mode 100755 new mode 100644 diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php old mode 100755 new mode 100644 diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php old mode 100755 new mode 100644 diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php old mode 100755 new mode 100644 diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php old mode 100755 new mode 100644 diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php old mode 100755 new mode 100644 diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php old mode 100755 new mode 100644 diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php old mode 100755 new mode 100644 diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php old mode 100755 new mode 100644 diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php old mode 100755 new mode 100644 diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php old mode 100755 new mode 100644 diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php old mode 100755 new mode 100644 diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst old mode 100755 new mode 100644 diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst old mode 100755 new mode 100644 diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst old mode 100755 new mode 100644 diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst old mode 100755 new mode 100644 diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst old mode 100755 new mode 100644 diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst old mode 100755 new mode 100644 diff --git a/writable/.htaccess b/writable/.htaccess old mode 100755 new mode 100644 diff --git a/writable/cache/index.html b/writable/cache/index.html old mode 100755 new mode 100644 diff --git a/writable/debugbar/index.html b/writable/debugbar/index.html old mode 100755 new mode 100644 diff --git a/writable/index.html b/writable/index.html old mode 100755 new mode 100644 diff --git a/writable/logs/index.html b/writable/logs/index.html old mode 100755 new mode 100644 diff --git a/writable/session/index.html b/writable/session/index.html old mode 100755 new mode 100644 diff --git a/writable/uploads/index.html b/writable/uploads/index.html old mode 100755 new mode 100644 From 3e90a29e6fd97942874e6c3901abb2bce8bfdab2 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 29 May 2024 17:39:03 +0700 Subject: [PATCH 6965/8282] chore: remove JsonThrowOnErrorRector and FinalizePublicClassConstantRector from skip() config as no longer part of sets --- rector.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/rector.php b/rector.php index b9d51f872fdc..596eb7a3da65 100644 --- a/rector.php +++ b/rector.php @@ -44,11 +44,9 @@ use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector; use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector; use Rector\Php70\Rector\FuncCall\RandomFunctionRector; -use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector; use Rector\Php80\Rector\FunctionLike\MixedTypeRector; -use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector; use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector; use Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_\AnnotationWithValueToAttributeRector; use Rector\PHPUnit\AnnotationsToAttributes\Rector\Class_\CoversAnnotationWithValueToAttributeRector; @@ -107,7 +105,6 @@ __DIR__ . '/tests/_support/Commands/Foobar.php', __DIR__ . '/tests/_support/View', - JsonThrowOnErrorRector::class, YieldDataProviderRector::class, RemoveUnusedPromotedPropertyRector::class => [ @@ -174,16 +171,6 @@ ], MixedTypeRector::class, - // PHP 8.1 features but cause breaking changes - FinalizePublicClassConstantRector::class => [ - __DIR__ . '/system/Cache/Handlers/BaseHandler.php', - __DIR__ . '/system/Cache/Handlers/FileHandler.php', - __DIR__ . '/system/CodeIgniter.php', - __DIR__ . '/system/Events/Events.php', - __DIR__ . '/system/Log/Handlers/ChromeLoggerHandler.php', - __DIR__ . '/system/Log/Handlers/ErrorlogHandler.php', - __DIR__ . '/system/Security/Security.php', - ], ReturnNeverTypeRector::class => [ __DIR__ . '/system/Cache/Handlers/BaseHandler.php', __DIR__ . '/system/Cache/Handlers/MemcachedHandler.php', From e0d2cff888575d70a2a5d4e4633df250f6be6a86 Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 30 May 2024 11:30:49 +0900 Subject: [PATCH 6966/8282] chore: add file permission check workflow --- .github/workflows/test-file-permissions.yml | 24 ++++++ utils/check_permission_x.php | 95 +++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 .github/workflows/test-file-permissions.yml create mode 100644 utils/check_permission_x.php diff --git a/.github/workflows/test-file-permissions.yml b/.github/workflows/test-file-permissions.yml new file mode 100644 index 000000000000..e6ad5949d8b4 --- /dev/null +++ b/.github/workflows/test-file-permissions.yml @@ -0,0 +1,24 @@ +name: Check File Permissions + +on: + pull_request: + push: + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + permission-check: + name: Check File Permission + runs-on: ubuntu-22.04 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Detect unnecessary execution permissions + run: php utils/check_permission_x.php diff --git a/utils/check_permission_x.php b/utils/check_permission_x.php new file mode 100644 index 000000000000..219ec5cc64e4 --- /dev/null +++ b/utils/check_permission_x.php @@ -0,0 +1,95 @@ + + * + * For the full copyright and license information, please view + * the LICENSE file that was distributed with this source code. + */ + +namespace Utils; + +require __DIR__ . '/../system/Test/bootstrap.php'; + +use CodeIgniter\CLI\CLI; +use RecursiveDirectoryIterator; +use RecursiveIteratorIterator; +use RuntimeException; + +function findExecutableFiles($dir) +{ + $execFileList = [ + 'admin/release-userguide', + 'admin/release-deploy', + 'admin/apibot', + 'admin/alldocs', + 'admin/release', + 'admin/docbot', + 'admin/release-notes.bb', + 'admin/release-revert', + 'admin/starter/builds', + 'user_guide_src/add-edit-this-page', + ]; + + $executableFiles = []; + + // Check if the directory exists + if (! is_dir($dir)) { + throw new RuntimeException('No such directory: ' . $dir); + } + + // Create a Recursive Directory Iterator + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($dir) + ); + + // Iterate over each item in the directory + foreach ($iterator as $fileinfo) { + // Check if the item is a file and is executable + if ($fileinfo->isFile() && is_executable($fileinfo->getPathname())) { + $filePath = $fileinfo->getPathname(); + + // Check allow list + if (in_array($filePath, $execFileList, true)) { + continue; + } + + if (str_ends_with($filePath, '.sh')) { + continue; + } + + $executableFiles[] = $filePath; + } + } + + return $executableFiles; +} + +// Main +chdir(__DIR__ . '/../'); + +$dirs = ['admin', 'app', 'system', 'tests', 'user_guide_src', 'utils', 'writable']; + +$executableFiles = []; + +foreach ($dirs as $dir) { + $executableFiles = array_merge($executableFiles, findExecutableFiles($dir)); +} + +if ($executableFiles !== []) { + CLI::write('Files with unnecessary execution permissions were detected:', 'light_gray', 'red'); + + foreach ($executableFiles as $file) { + CLI::write('- ' . $file); + } + + exit(1); +} + +CLI::write('No files with unnecessary execution permissions were detected.', 'black', 'green'); + +exit(0); From ab796767a89167d15e04ec06cf3796aeda42e392 Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 30 May 2024 08:19:11 +0200 Subject: [PATCH 6967/8282] docs: Prevent text-wrap for span.pre in user guide citheme.css Add span.pre to span.std to prevent text-wrap in user guide citheme.css --- user_guide_src/source/_static/css/citheme.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/_static/css/citheme.css b/user_guide_src/source/_static/css/citheme.css index b3264e096336..fae4909dd62c 100644 --- a/user_guide_src/source/_static/css/citheme.css +++ b/user_guide_src/source/_static/css/citheme.css @@ -245,7 +245,8 @@ html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not( background-color: #fffff0; } -span.std { +span.std, +span.pre { text-wrap: nowrap; } From 4a65e2a818859c2de275004ad9d1b5ffbe5858bd Mon Sep 17 00:00:00 2001 From: kenjis Date: Thu, 30 May 2024 21:42:02 +0900 Subject: [PATCH 6968/8282] docs: add note for View Cells typed properties --- user_guide_src/source/outgoing/view_cells.rst | 4 ++++ user_guide_src/source/outgoing/view_cells/023.php | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 user_guide_src/source/outgoing/view_cells/023.php diff --git a/user_guide_src/source/outgoing/view_cells.rst b/user_guide_src/source/outgoing/view_cells.rst index f940bc99ea17..e01bdcd53343 100644 --- a/user_guide_src/source/outgoing/view_cells.rst +++ b/user_guide_src/source/outgoing/view_cells.rst @@ -101,6 +101,10 @@ Implementing the AlertMessage from above as a Controlled Cell would look like th .. literalinclude:: view_cells/010.php +.. note:: If you use typed properties, you must set the initial values: + + .. literalinclude:: view_cells/023.php + .. _generating-cell-via-command: Generating Cell via Command diff --git a/user_guide_src/source/outgoing/view_cells/023.php b/user_guide_src/source/outgoing/view_cells/023.php new file mode 100644 index 000000000000..c892fcd683a7 --- /dev/null +++ b/user_guide_src/source/outgoing/view_cells/023.php @@ -0,0 +1,13 @@ + Date: Thu, 30 May 2024 22:48:09 +0700 Subject: [PATCH 6969/8282] chore: remove unused path parameter on PhpStreamWrapper::stream_open() --- system/Test/PhpStreamWrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Test/PhpStreamWrapper.php b/system/Test/PhpStreamWrapper.php index 980d5424ab62..a6be8dd1329c 100644 --- a/system/Test/PhpStreamWrapper.php +++ b/system/Test/PhpStreamWrapper.php @@ -46,7 +46,7 @@ public static function restore() stream_wrapper_restore('php'); } - public function stream_open(string $path): bool + public function stream_open(): bool { return true; } From 2ba2c45139c643bce4072e0d3f92bb5e445f42fc Mon Sep 17 00:00:00 2001 From: obozdag Date: Thu, 30 May 2024 22:34:39 +0200 Subject: [PATCH 6970/8282] docs: Small typo in testing/overview.rst Small typo in testing/overview.rst --- user_guide_src/source/testing/overview.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst index 4052269c4ee4..8a94d6bc382c 100644 --- a/user_guide_src/source/testing/overview.rst +++ b/user_guide_src/source/testing/overview.rst @@ -76,14 +76,14 @@ There are no rules for how test files must be placed. However, we recommend that you establish placement rules in advance so that you can quickly understand where the test files are located. -In this document, we will place the test files corresponding to the classes in -the **app** directory in the **tests/app** directory. To test a new library, +In this document, the test files corresponding to the classes in the **app** directory +will be placed in the **tests/app** directory. To test a new library, **app/Libraries/Foo.php**, you would create a new file at **tests/app/Libraries/FooTest.php**: .. literalinclude:: overview/001.php -To test one of your models, **app/Models/UserMode.php**, you might end up with +To test one of your models, **app/Models/UserModel.php**, you might end up with something like this in **tests/app/Models/UserModelTest.php**: .. literalinclude:: overview/002.php @@ -121,7 +121,7 @@ parent as well so extended test cases do not interfere with staging: Traits ------ -A common way to enhance your tests is by using traits to consolidate staging across different +A common way to enhance your tests is using traits to consolidate staging across different test cases. ``CIUnitTestCase`` will detect any class traits and look for staging methods to run named for the trait itself (i.e. `setUp{NameOfTrait}()` and `tearDown{NameOfTrait}()`). From 10a07398a4ff2ad943473f5f081ac6d3759b53a6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 2 Jun 2024 18:05:40 +0900 Subject: [PATCH 6971/8282] test: add test cases --- tests/system/Helpers/NumberHelperTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php index 9b3afa61992f..7e5fe2a358c4 100644 --- a/tests/system/Helpers/NumberHelperTest.php +++ b/tests/system/Helpers/NumberHelperTest.php @@ -38,6 +38,11 @@ public function testRomanNumber(): void $this->assertSame('X', number_to_roman(10)); } + public function testRomanNumberString(): void + { + $this->assertSame('XCVI', number_to_roman('96')); + } + public function testRomanNumberRange(): void { $this->assertNull(number_to_roman(-1)); @@ -70,6 +75,11 @@ public function testNumberToSize(): void $this->assertSame('456 Bytes', number_to_size(456, 1, 'en_US')); } + public function testNumberToSizeString(): void + { + $this->assertSame('456 Bytes', number_to_size('456', 1, 'en_US')); + } + public function testKbFormat(): void { $this->assertSame('4.5 KB', number_to_size(4567, 1, 'en_US')); @@ -109,6 +119,11 @@ public function testThousands(): void $this->assertSame('1,000 thousand', number_to_amount('999999', 0, 'en_US')); } + public function testThousandsInt(): void + { + $this->assertSame('123 thousand', number_to_amount(123000, 0, 'en_US')); + } + public function testMillions(): void { $this->assertSame('123.4 million', number_to_amount('123,400,000', 1, 'en_US')); From 3d6436ed4666732f0008da27cf3ffd943720150d Mon Sep 17 00:00:00 2001 From: kenjis Date: Sun, 2 Jun 2024 18:06:41 +0900 Subject: [PATCH 6972/8282] fix: TypeError in number_to_amount() TypeError: str_replace(): Argument #3 ($subject) must be of type array|string, int given --- system/Helpers/number_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php index 96468ddcdea3..0999d200f99b 100644 --- a/system/Helpers/number_helper.php +++ b/system/Helpers/number_helper.php @@ -82,8 +82,9 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null) // Strip any formatting & ensure numeric input try { // @phpstan-ignore-next-line - $num = 0 + str_replace(',', '', $num); + $num = 0 + str_replace(',', '', (string) $num); } catch (ErrorException) { + // Catch "Warning: A non-numeric value encountered" return false; } From ca09944c251e0a398c1348ba9f23fe5b64248e96 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 31 May 2024 14:28:22 +0700 Subject: [PATCH 6973/8282] docs: replace Service class to service() --- user_guide_src/source/concepts/services.rst | 8 +++++--- user_guide_src/source/concepts/services/002.php | 3 +++ user_guide_src/source/concepts/services/012.php | 2 +- user_guide_src/source/concepts/services/013.php | 2 +- user_guide_src/source/concepts/services/014.php | 2 +- user_guide_src/source/concepts/services/015.php | 4 ++-- user_guide_src/source/extending/basecontroller/003.php | 2 +- user_guide_src/source/general/common_functions.rst | 4 ++-- user_guide_src/source/general/errors/018.php | 2 +- .../source/incoming/content_negotiation/001.php | 2 +- user_guide_src/source/incoming/incomingrequest/002.php | 2 +- user_guide_src/source/incoming/incomingrequest/003.php | 2 +- user_guide_src/source/libraries/caching.rst | 2 +- user_guide_src/source/libraries/caching/002.php | 2 +- user_guide_src/source/libraries/cookies/002.php | 2 +- user_guide_src/source/libraries/cookies/003.php | 2 +- user_guide_src/source/libraries/cookies/007.php | 4 +--- user_guide_src/source/libraries/cookies/009.php | 3 +-- user_guide_src/source/libraries/cookies/010.php | 2 +- user_guide_src/source/libraries/cookies/013.php | 4 +--- user_guide_src/source/libraries/cookies/014.php | 1 - user_guide_src/source/libraries/cookies/015.php | 6 ++---- user_guide_src/source/libraries/cookies/017.php | 3 +-- user_guide_src/source/libraries/curlrequest.rst | 2 +- user_guide_src/source/libraries/curlrequest/002.php | 3 +++ user_guide_src/source/libraries/curlrequest/003.php | 2 +- user_guide_src/source/libraries/curlrequest/004.php | 6 ++++-- user_guide_src/source/libraries/curlrequest/005.php | 2 +- user_guide_src/source/libraries/curlrequest/008.php | 2 +- user_guide_src/source/libraries/email/001.php | 2 +- user_guide_src/source/libraries/encryption/001.php | 2 +- user_guide_src/source/libraries/encryption/003.php | 6 ++++-- user_guide_src/source/libraries/encryption/013.php | 5 ++--- user_guide_src/source/libraries/images.rst | 6 +++--- user_guide_src/source/libraries/images/001.php | 2 +- user_guide_src/source/libraries/images/002.php | 2 +- user_guide_src/source/libraries/images/007.php | 2 +- user_guide_src/source/libraries/images/008.php | 4 ++-- user_guide_src/source/libraries/images/009.php | 2 +- user_guide_src/source/libraries/images/010.php | 2 +- user_guide_src/source/libraries/images/011.php | 4 ++-- user_guide_src/source/libraries/images/012.php | 2 +- user_guide_src/source/libraries/images/013.php | 2 +- user_guide_src/source/libraries/images/014.php | 2 +- user_guide_src/source/libraries/pagination/001.php | 2 +- user_guide_src/source/libraries/pagination/002.php | 4 +++- user_guide_src/source/libraries/pagination/003.php | 4 +++- user_guide_src/source/libraries/pagination/004.php | 7 +++++-- user_guide_src/source/libraries/pagination/005.php | 4 +++- user_guide_src/source/libraries/pagination/018.php | 4 +++- user_guide_src/source/libraries/security/001.php | 2 +- user_guide_src/source/libraries/sessions/001.php | 2 +- user_guide_src/source/libraries/throttler/001.php | 2 +- user_guide_src/source/libraries/throttler/002.php | 5 ++--- user_guide_src/source/libraries/typography/001.php | 2 +- user_guide_src/source/libraries/validation/004.php | 2 +- user_guide_src/source/libraries/validation/008.php | 4 ++-- user_guide_src/source/libraries/validation/044.php | 2 +- user_guide_src/source/libraries/validation/046.php | 6 +++--- user_guide_src/source/outgoing/view_parser/001.php | 2 +- user_guide_src/source/outgoing/view_renderer/001.php | 2 +- user_guide_src/source/testing/benchmark/001.php | 2 +- 62 files changed, 99 insertions(+), 87 deletions(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index a3dc9fabb74d..24ee8ec5be65 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -37,7 +37,7 @@ come in handy. Instead of creating the instance ourself, we let a central class create an instance of the class for us. This class is kept very simple. It only contains a method for each class that we want to use as a service. The method typically returns a **shared instance** of that class, passing any dependencies -it might have into it. Then, we would replace our timer creation code with code that calls this new class: +it might have into it. Then, we would replace our timer creation code with code that calls this global function or Service class: .. literalinclude:: services/002.php @@ -55,7 +55,7 @@ As many CodeIgniter classes are provided as services, you can get them like the .. literalinclude:: services/013.php -The ``$typography`` is an instance of the Typography class, and if you call ``\Config\Services::typography()`` again, you will get the exactly same instance. +The ``$timer`` is an instance of the Timer class, and if you call ``service('timer')`` again, you will get the exactly same instance. The Services typically return a **shared instance** of the class. The following code creates a ``CURLRequest`` instance at the first call. And the second call returns the exactly same instance. @@ -66,7 +66,7 @@ Therefore, the parameter ``$options2`` for the ``$client2`` does not work. It is Getting a New Instance ====================== -If you want to get a new instance of the Typography class, you need to pass ``false`` to the argument ``$getShared``: +If you want to get a new instance of the Timer class, you need to pass ``false`` to the argument ``$getShared``: .. literalinclude:: services/014.php @@ -85,6 +85,8 @@ always return the same instance: .. literalinclude:: services/003.php +.. note:: Since `v4.5.0`, the global function ``service()`` is recommended due to performance improvements on without parameter + If the creation method requires additional parameters, they can be passed after the service name: .. literalinclude:: services/004.php diff --git a/user_guide_src/source/concepts/services/002.php b/user_guide_src/source/concepts/services/002.php index cb292ecaeb42..cedf5d19ed65 100644 --- a/user_guide_src/source/concepts/services/002.php +++ b/user_guide_src/source/concepts/services/002.php @@ -1,3 +1,6 @@ 'http://example.com/api/v1/', 'timeout' => 3, ]; -$client1 = \Config\Services::curlrequest($options1); +$client1 = service('curlrequest', $options1); $options2 = [ 'baseURI' => 'http://another.example.com/api/v2/', 'timeout' => 10, ]; -$client2 = \Config\Services::curlrequest($options2); +$client2 = service('curlrequest', $options2); // $options2 does not work. // $client2 is the exactly same instance as $client1. diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php index 2f6fcb9d08cb..b7bcab22545d 100644 --- a/user_guide_src/source/extending/basecontroller/003.php +++ b/user_guide_src/source/extending/basecontroller/003.php @@ -18,6 +18,6 @@ public function initController(/* ... */) // Do Not Edit This Line parent::initController($request, $response, $logger); - $this->session = \Config\Services::session(); + $this->session = service('session'); } } diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst index 61b92a99df92..d0a23758e348 100644 --- a/user_guide_src/source/general/common_functions.rst +++ b/user_guide_src/source/general/common_functions.rst @@ -372,7 +372,7 @@ Miscellaneous Functions :returns: The shared Request object. :rtype: IncomingRequest|CLIRequest - This function is a wrapper for ``Services::request()``. + This function is a wrapper for ``Services::request()`` and ``service('request')``. .. php:function:: response() @@ -381,7 +381,7 @@ Miscellaneous Functions :returns: The shared Response object. :rtype: Response - This function is a wrapper for ``Services::response()``. + This function is a wrapper for ``Services::response()`` and ``service('response')``. .. php:function:: route_to($method[, ...$params]) diff --git a/user_guide_src/source/general/errors/018.php b/user_guide_src/source/general/errors/018.php index 3cba09951d8b..9546e4a606ae 100644 --- a/user_guide_src/source/general/errors/018.php +++ b/user_guide_src/source/general/errors/018.php @@ -1,6 +1,6 @@ redirect('https://example.com/path') ->setHeader('Some', 'header') ->setCookie('and', 'cookie'); diff --git a/user_guide_src/source/incoming/content_negotiation/001.php b/user_guide_src/source/incoming/content_negotiation/001.php index 3c55e788eff9..fbd07a975ee3 100644 --- a/user_guide_src/source/incoming/content_negotiation/001.php +++ b/user_guide_src/source/incoming/content_negotiation/001.php @@ -1,3 +1,3 @@ get('foo'); diff --git a/user_guide_src/source/libraries/cookies/002.php b/user_guide_src/source/libraries/cookies/002.php index 8c2fb03fea9d..ecbe37ed088b 100644 --- a/user_guide_src/source/libraries/cookies/002.php +++ b/user_guide_src/source/libraries/cookies/002.php @@ -4,7 +4,7 @@ use Config\Cookie as CookieConfig; // pass in a Config\Cookie instance before constructing a Cookie class -Cookie::setDefaults(new CookieConfig()); +Cookie::setDefaults(config(CookieConfig::class)); $cookie = new Cookie('login_token'); // pass in an array of defaults diff --git a/user_guide_src/source/libraries/cookies/003.php b/user_guide_src/source/libraries/cookies/003.php index f878ff8592d1..6e9094fe7b77 100644 --- a/user_guide_src/source/libraries/cookies/003.php +++ b/user_guide_src/source/libraries/cookies/003.php @@ -3,7 +3,7 @@ use CodeIgniter\Cookie\Cookie; use Config\Cookie as CookieConfig; -$oldDefaults = Cookie::setDefaults(new CookieConfig()); +$oldDefaults = Cookie::setDefaults(config(CookieConfig::class)); $cookie = new Cookie('my_token', 'muffins'); // return the old defaults diff --git a/user_guide_src/source/libraries/cookies/007.php b/user_guide_src/source/libraries/cookies/007.php index ff79582a5d07..ea4dcc97876f 100644 --- a/user_guide_src/source/libraries/cookies/007.php +++ b/user_guide_src/source/libraries/cookies/007.php @@ -1,5 +1,3 @@ getCookieStore(); +$cookieStore = service('response')->getCookieStore(); diff --git a/user_guide_src/source/libraries/cookies/009.php b/user_guide_src/source/libraries/cookies/009.php index 6db5a50bfc1e..3e73bb0cafaf 100644 --- a/user_guide_src/source/libraries/cookies/009.php +++ b/user_guide_src/source/libraries/cookies/009.php @@ -2,7 +2,6 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; -use Config\Services; // check if cookie is in the current cookie collection $store = new CookieStore([ @@ -13,7 +12,7 @@ // check if cookie is in the current Response's cookie collection cookies()->has('login_token'); -Services::response()->hasCookie('remember_token'); +service('response')->hasCookie('remember_token'); // using the cookie helper to check the current Response // not available to v4.1.1 and lower diff --git a/user_guide_src/source/libraries/cookies/010.php b/user_guide_src/source/libraries/cookies/010.php index 8211a4a2b23e..b2a18323cdac 100644 --- a/user_guide_src/source/libraries/cookies/010.php +++ b/user_guide_src/source/libraries/cookies/010.php @@ -13,7 +13,7 @@ // getting cookie in the current Response's cookie collection cookies()->get('login_token'); -Services::response()->getCookie('remember_token'); +service('response')->getCookie('remember_token'); // using the cookie helper to get cookie from the Response's cookie collection helper('cookie'); diff --git a/user_guide_src/source/libraries/cookies/013.php b/user_guide_src/source/libraries/cookies/013.php index 6dcb79807380..80052c7c9218 100644 --- a/user_guide_src/source/libraries/cookies/013.php +++ b/user_guide_src/source/libraries/cookies/013.php @@ -1,11 +1,9 @@ get(); // array of Cookie objects // alternatively, you can use the display method cookies()->display(); // or even from the Response -Services::response()->getCookies(); +service('response')->getCookies(); diff --git a/user_guide_src/source/libraries/cookies/014.php b/user_guide_src/source/libraries/cookies/014.php index 0e6ae6772146..9be64c5cf651 100644 --- a/user_guide_src/source/libraries/cookies/014.php +++ b/user_guide_src/source/libraries/cookies/014.php @@ -2,7 +2,6 @@ use CodeIgniter\Cookie\Cookie; use CodeIgniter\Cookie\CookieStore; -use Config\Services; $store = new CookieStore([ new Cookie('login_token'), diff --git a/user_guide_src/source/libraries/cookies/015.php b/user_guide_src/source/libraries/cookies/015.php index 040a2f8a9882..696e9c7c73d3 100644 --- a/user_guide_src/source/libraries/cookies/015.php +++ b/user_guide_src/source/libraries/cookies/015.php @@ -1,9 +1,7 @@ setCookie('admin_token', 'yes'); -Services::response()->deleteCookie('login_token'); +service('response')->setCookie('admin_token', 'yes'); +service('response')->deleteCookie('login_token'); // using the cookie helper helper('cookie'); diff --git a/user_guide_src/source/libraries/cookies/017.php b/user_guide_src/source/libraries/cookies/017.php index eadbc8083e98..4cc1fe4a67a6 100644 --- a/user_guide_src/source/libraries/cookies/017.php +++ b/user_guide_src/source/libraries/cookies/017.php @@ -1,9 +1,8 @@ `. -To load with the Services class call the ``curlrequest()`` method: +To load with the Services class call the ``curlrequest()`` method or global function ``service()``: .. literalinclude:: curlrequest/002.php diff --git a/user_guide_src/source/libraries/curlrequest/002.php b/user_guide_src/source/libraries/curlrequest/002.php index 5d84bfe442b5..ae7264ffdcdb 100644 --- a/user_guide_src/source/libraries/curlrequest/002.php +++ b/user_guide_src/source/libraries/curlrequest/002.php @@ -1,3 +1,6 @@ 'http://example.com/api/v1/', 'timeout' => 3, ]; -$client = \Config\Services::curlrequest($options); +$client = service('curlrequest', $options); diff --git a/user_guide_src/source/libraries/curlrequest/004.php b/user_guide_src/source/libraries/curlrequest/004.php index 4d6a14fadbb0..654d72d2687f 100644 --- a/user_guide_src/source/libraries/curlrequest/004.php +++ b/user_guide_src/source/libraries/curlrequest/004.php @@ -1,8 +1,10 @@ request('GET', 'https://api.github.com/user', [ 'auth' => ['user', 'pass'], diff --git a/user_guide_src/source/libraries/curlrequest/008.php b/user_guide_src/source/libraries/curlrequest/008.php index 611909c2df7d..2f14c6974cd0 100644 --- a/user_guide_src/source/libraries/curlrequest/008.php +++ b/user_guide_src/source/libraries/curlrequest/008.php @@ -1,6 +1,6 @@ 'https://example.com/api/v1/', ]); diff --git a/user_guide_src/source/libraries/email/001.php b/user_guide_src/source/libraries/email/001.php index 914193c15203..f7873714bab5 100644 --- a/user_guide_src/source/libraries/email/001.php +++ b/user_guide_src/source/libraries/email/001.php @@ -1,6 +1,6 @@ setFrom('your@example.com', 'Your Name'); $email->setTo('someone@example.com'); diff --git a/user_guide_src/source/libraries/encryption/001.php b/user_guide_src/source/libraries/encryption/001.php index 8f840be59245..1481d20c2758 100644 --- a/user_guide_src/source/libraries/encryption/001.php +++ b/user_guide_src/source/libraries/encryption/001.php @@ -1,3 +1,3 @@ key = 'aBigsecret_ofAtleast32Characters'; $config->driver = 'OpenSSL'; -$encrypter = \Config\Services::encrypter($config); +$encrypter = service('encrypter', $config); diff --git a/user_guide_src/source/libraries/encryption/013.php b/user_guide_src/source/libraries/encryption/013.php index c49d282f42da..06eb6b0de807 100644 --- a/user_guide_src/source/libraries/encryption/013.php +++ b/user_guide_src/source/libraries/encryption/013.php @@ -1,9 +1,8 @@ driver = 'OpenSSL'; // Your CI3's 'encryption_key' @@ -15,4 +14,4 @@ $config->encryptKeyInfo = 'encryption'; $config->authKeyInfo = 'authentication'; -$encrypter = Services::encrypter($config, false); +$encrypter = service('encrypter', $config); diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst index 08efccfe92f9..cfb7dce8f628 100644 --- a/user_guide_src/source/libraries/images.rst +++ b/user_guide_src/source/libraries/images.rst @@ -22,12 +22,12 @@ Initializing the Class ********************** Like most other classes in CodeIgniter, the image class is initialized -in your controller by calling the Services class: +in your controller by calling the global function service: .. literalinclude:: images/001.php -You can pass the alias for the image library you wish to use into the -Service function: +You can pass the alias for the image library you wish to use into the global +function service: .. literalinclude:: images/002.php diff --git a/user_guide_src/source/libraries/images/001.php b/user_guide_src/source/libraries/images/001.php index 780bb37b3a4d..3001f4561029 100644 --- a/user_guide_src/source/libraries/images/001.php +++ b/user_guide_src/source/libraries/images/001.php @@ -1,3 +1,3 @@ withFile('/path/to/image/mypic.jpg') diff --git a/user_guide_src/source/libraries/images/008.php b/user_guide_src/source/libraries/images/008.php index 01406733d31b..a7963d420573 100644 --- a/user_guide_src/source/libraries/images/008.php +++ b/user_guide_src/source/libraries/images/008.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->getFile() ->getProperties(true); @@ -8,7 +8,7 @@ $xOffset = ($info['width'] / 2) - 25; $yOffset = ($info['height'] / 2) - 25; -\Config\Services::image('imagick') +service('image', 'imagick') ->withFile('/path/to/image/mypic.jpg') ->crop(50, 50, $xOffset, $yOffset) ->save('/path/to/new/image.jpg'); diff --git a/user_guide_src/source/libraries/images/009.php b/user_guide_src/source/libraries/images/009.php index 6314181ef435..e24cfcc40a4a 100644 --- a/user_guide_src/source/libraries/images/009.php +++ b/user_guide_src/source/libraries/images/009.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->convert(IMAGETYPE_PNG) ->save('/path/to/new/image.png'); diff --git a/user_guide_src/source/libraries/images/010.php b/user_guide_src/source/libraries/images/010.php index b70b179815cd..696eab880516 100644 --- a/user_guide_src/source/libraries/images/010.php +++ b/user_guide_src/source/libraries/images/010.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->fit(100, 150, 'left') ->save('/path/to/new/image.jpg'); diff --git a/user_guide_src/source/libraries/images/011.php b/user_guide_src/source/libraries/images/011.php index f18fb55545a1..e816af48c647 100644 --- a/user_guide_src/source/libraries/images/011.php +++ b/user_guide_src/source/libraries/images/011.php @@ -1,11 +1,11 @@ withFile('/path/to/image/mypic.png') ->flatten() ->save('/path/to/new/image.jpg'); -\Config\Services::image('imagick') +service('image', 'imagick') ->withFile('/path/to/image/mypic.png') ->flatten(25, 25, 112) ->save('/path/to/new/image.jpg'); diff --git a/user_guide_src/source/libraries/images/012.php b/user_guide_src/source/libraries/images/012.php index 581a984238bd..eb99b11ae3b1 100644 --- a/user_guide_src/source/libraries/images/012.php +++ b/user_guide_src/source/libraries/images/012.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->flip('horizontal') ->save('/path/to/new/image.jpg'); diff --git a/user_guide_src/source/libraries/images/013.php b/user_guide_src/source/libraries/images/013.php index c51a7126be8d..7c1780565a5d 100644 --- a/user_guide_src/source/libraries/images/013.php +++ b/user_guide_src/source/libraries/images/013.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->resize(200, 100, true, 'height') ->save('/path/to/new/image.jpg'); diff --git a/user_guide_src/source/libraries/images/014.php b/user_guide_src/source/libraries/images/014.php index 32943ed142c6..cfe551a4c411 100644 --- a/user_guide_src/source/libraries/images/014.php +++ b/user_guide_src/source/libraries/images/014.php @@ -1,6 +1,6 @@ withFile('/path/to/image/mypic.jpg') ->text('Copyright 2017 My Photo Co', [ 'color' => '#fff', diff --git a/user_guide_src/source/libraries/pagination/001.php b/user_guide_src/source/libraries/pagination/001.php index ec86f0e73490..4b67fd5511de 100644 --- a/user_guide_src/source/libraries/pagination/001.php +++ b/user_guide_src/source/libraries/pagination/001.php @@ -1,3 +1,3 @@ $model->paginate(10), diff --git a/user_guide_src/source/libraries/pagination/003.php b/user_guide_src/source/libraries/pagination/003.php index 6ea631c7a9bc..262385ea0eb8 100644 --- a/user_guide_src/source/libraries/pagination/003.php +++ b/user_guide_src/source/libraries/pagination/003.php @@ -1,7 +1,9 @@ $model->where('ban', 1)->paginate(10), diff --git a/user_guide_src/source/libraries/pagination/004.php b/user_guide_src/source/libraries/pagination/004.php index a8ef4d296125..b7af3ec83d2a 100644 --- a/user_guide_src/source/libraries/pagination/004.php +++ b/user_guide_src/source/libraries/pagination/004.php @@ -2,12 +2,15 @@ namespace App\Controllers; +use App\Models\PageModel; +use App\Models\UserModel; + class UserController extends BaseController { public function index() { - $userModel = new \App\Models\UserModel(); - $pageModel = new \App\Models\PageModel(); + $userModel = model(UserModel::class); + $pageModel = model(PageModel::class); $data = [ 'users' => $userModel->paginate(10, 'group1'), diff --git a/user_guide_src/source/libraries/pagination/005.php b/user_guide_src/source/libraries/pagination/005.php index dec2c3161e76..2dc3405b8a62 100644 --- a/user_guide_src/source/libraries/pagination/005.php +++ b/user_guide_src/source/libraries/pagination/005.php @@ -1,6 +1,8 @@ paginate(10, 'group1', $page); diff --git a/user_guide_src/source/libraries/pagination/018.php b/user_guide_src/source/libraries/pagination/018.php index 002d034a643c..afabd1c8c998 100644 --- a/user_guide_src/source/libraries/pagination/018.php +++ b/user_guide_src/source/libraries/pagination/018.php @@ -1,7 +1,9 @@ $model->banned()->paginate(10), diff --git a/user_guide_src/source/libraries/security/001.php b/user_guide_src/source/libraries/security/001.php index fe504ef35a8e..f81de1a9432c 100644 --- a/user_guide_src/source/libraries/security/001.php +++ b/user_guide_src/source/libraries/security/001.php @@ -1,3 +1,3 @@ check($name, 60, MINUTE); diff --git a/user_guide_src/source/libraries/throttler/002.php b/user_guide_src/source/libraries/throttler/002.php index 440ad582245b..9e3fec98c963 100644 --- a/user_guide_src/source/libraries/throttler/002.php +++ b/user_guide_src/source/libraries/throttler/002.php @@ -5,7 +5,6 @@ use CodeIgniter\Filters\FilterInterface; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; -use Config\Services; class Throttle implements FilterInterface { @@ -19,12 +18,12 @@ class Throttle implements FilterInterface */ public function before(RequestInterface $request, $arguments = null) { - $throttler = Services::throttler(); + $throttler = service('throttler'); // Restrict an IP address to no more than 1 request // per second across the entire site. if ($throttler->check(md5($request->getIPAddress()), 60, MINUTE) === false) { - return Services::response()->setStatusCode(429); + return service('response')->setStatusCode(429); } } diff --git a/user_guide_src/source/libraries/typography/001.php b/user_guide_src/source/libraries/typography/001.php index 0c82ed0e95fa..9685611c7691 100644 --- a/user_guide_src/source/libraries/typography/001.php +++ b/user_guide_src/source/libraries/typography/001.php @@ -1,3 +1,3 @@ withRequest($request)->run()) { // If you use the input data, you should get it from the getValidated() method. diff --git a/user_guide_src/source/libraries/validation/044.php b/user_guide_src/source/libraries/validation/044.php index 7f3a0e0e0902..df2598d1906c 100644 --- a/user_guide_src/source/libraries/validation/044.php +++ b/user_guide_src/source/libraries/validation/044.php @@ -1,6 +1,6 @@ setRules([ 'username' => 'required', 'password' => 'required|min_length[10]', diff --git a/user_guide_src/source/libraries/validation/046.php b/user_guide_src/source/libraries/validation/046.php index f37def009eba..34dea12ceeef 100644 --- a/user_guide_src/source/libraries/validation/046.php +++ b/user_guide_src/source/libraries/validation/046.php @@ -2,8 +2,6 @@ namespace App\Controllers; -use Config\Services; - class Form extends BaseController { // Define a custom validation rule. @@ -16,7 +14,9 @@ public function process() { // ... - $validation = Services::validation(); + $data = []; + + $validation = service('validation'); $validation->setRules( [ 'foo' => [ diff --git a/user_guide_src/source/outgoing/view_parser/001.php b/user_guide_src/source/outgoing/view_parser/001.php index 56f7f51e4a07..e9f733df13e4 100644 --- a/user_guide_src/source/outgoing/view_parser/001.php +++ b/user_guide_src/source/outgoing/view_parser/001.php @@ -1,3 +1,3 @@ start('render view'); From a1690e8656e9fabfa171e32946d06e64ae1290b5 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 31 May 2024 14:58:16 +0700 Subject: [PATCH 6974/8282] docs: typo Services --- user_guide_src/source/concepts/services.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index 24ee8ec5be65..39620f44bca6 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -37,7 +37,7 @@ come in handy. Instead of creating the instance ourself, we let a central class create an instance of the class for us. This class is kept very simple. It only contains a method for each class that we want to use as a service. The method typically returns a **shared instance** of that class, passing any dependencies -it might have into it. Then, we would replace our timer creation code with code that calls this global function or Service class: +it might have into it. Then, we would replace our timer creation code with code that calls this global function or Services class: .. literalinclude:: services/002.php From 6be5e3cbdba02661c87f312363f96f38f7a39a18 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 31 May 2024 15:54:06 +0700 Subject: [PATCH 6975/8282] Update user_guide_src/source/libraries/images.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/images.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst index cfb7dce8f628..232174765c91 100644 --- a/user_guide_src/source/libraries/images.rst +++ b/user_guide_src/source/libraries/images.rst @@ -27,7 +27,7 @@ in your controller by calling the global function service: .. literalinclude:: images/001.php You can pass the alias for the image library you wish to use into the global -function service: +function ``service()``: .. literalinclude:: images/002.php From c3323b441838cc0a5327806fc2842a070599b03f Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 31 May 2024 15:54:24 +0700 Subject: [PATCH 6976/8282] Update user_guide_src/source/libraries/images.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/images.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst index 232174765c91..a439c3321a0b 100644 --- a/user_guide_src/source/libraries/images.rst +++ b/user_guide_src/source/libraries/images.rst @@ -22,7 +22,7 @@ Initializing the Class ********************** Like most other classes in CodeIgniter, the image class is initialized -in your controller by calling the global function service: +in your controller by calling the global function ``service()``: .. literalinclude:: images/001.php From ef9c3e5a56d54dec355a7ced58bd19551d32f25d Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 31 May 2024 15:54:36 +0700 Subject: [PATCH 6977/8282] Update user_guide_src/source/libraries/caching.rst Co-authored-by: kenjis --- user_guide_src/source/libraries/caching.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst index 5e1fa7368811..f4adc04a93df 100644 --- a/user_guide_src/source/libraries/caching.rst +++ b/user_guide_src/source/libraries/caching.rst @@ -19,7 +19,7 @@ The following example shows a common usage pattern within your controllers. .. literalinclude:: caching/001.php -You can grab an instance of the cache engine directly through the global function service: +You can grab an instance of the cache engine directly through the global function ``service()``: .. literalinclude:: caching/002.php From 107c99baede6e640586a1283d81cce3e641b4c27 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com> Date: Fri, 31 May 2024 15:54:44 +0700 Subject: [PATCH 6978/8282] Update user_guide_src/source/concepts/services.rst Co-authored-by: kenjis --- user_guide_src/source/concepts/services.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst index 39620f44bca6..92eec136e1c8 100644 --- a/user_guide_src/source/concepts/services.rst +++ b/user_guide_src/source/concepts/services.rst @@ -85,7 +85,7 @@ always return the same instance: .. literalinclude:: services/003.php -.. note:: Since `v4.5.0`, the global function ``service()`` is recommended due to performance improvements on without parameter +.. note:: Since v4.5.0, when you don't pass parameters to the service, the global function ``service()`` is recommended due to performance improvements. If the creation method requires additional parameters, they can be passed after the service name: From 2b0bbf55c60578b92b883b18729f563695838bd4 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 31 May 2024 15:56:11 +0700 Subject: [PATCH 6979/8282] docs: no use config() --- user_guide_src/source/libraries/encryption/013.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/encryption/013.php b/user_guide_src/source/libraries/encryption/013.php index 06eb6b0de807..f7ef52060b6b 100644 --- a/user_guide_src/source/libraries/encryption/013.php +++ b/user_guide_src/source/libraries/encryption/013.php @@ -2,7 +2,7 @@ use Config\Encryption; -$config = config(Encryption::class); +$config = new Encryption(); $config->driver = 'OpenSSL'; // Your CI3's 'encryption_key' From 1c27fd410916eaf84e35dfb236be1a8ac0718976 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Sun, 2 Jun 2024 21:39:38 +0700 Subject: [PATCH 6980/8282] docs: remove variable --- user_guide_src/source/libraries/validation/046.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/user_guide_src/source/libraries/validation/046.php b/user_guide_src/source/libraries/validation/046.php index 34dea12ceeef..d9c244cdf31e 100644 --- a/user_guide_src/source/libraries/validation/046.php +++ b/user_guide_src/source/libraries/validation/046.php @@ -14,8 +14,6 @@ public function process() { // ... - $data = []; - $validation = service('validation'); $validation->setRules( [ From fb816b15352fb2d8bd3be82948523d6b65f785d0 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jun 2024 17:34:43 +0900 Subject: [PATCH 6981/8282] test: add tests for Model::find() with casts --- .../system/Models/DataConverterModelTest.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/system/Models/DataConverterModelTest.php b/tests/system/Models/DataConverterModelTest.php index 4dd6da072f5e..f243871526f3 100644 --- a/tests/system/Models/DataConverterModelTest.php +++ b/tests/system/Models/DataConverterModelTest.php @@ -100,6 +100,28 @@ public function testFindAsEntity(): void $this->assertInstanceOf(Time::class, $user->created_at); } + public function testFindArrayAsEntity(): void + { + $id = $this->prepareOneRecord(); + + $users = $this->model->asObject(User::class)->find([$id, 999]); + + $this->assertCount(1, $users); + $this->assertIsInt($users[0]->id); + $this->assertInstanceOf(Time::class, $users[0]->created_at); + } + + public function testFindNullAsEntity(): void + { + $this->prepareOneRecord(); + + $users = $this->model->asObject(User::class)->find(); + + $this->assertCount(1, $users); + $this->assertIsInt($users[0]->id); + $this->assertInstanceOf(Time::class, $users[0]->created_at); + } + public function testFindAllAsArray(): void { $this->prepareTwoRecords(); From 977059bbc8f3614ee77e7f4c20e742a1c6e7a6cf Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 5 Jun 2024 17:19:24 +0900 Subject: [PATCH 6982/8282] fix: Model::find() returns incorrect data with casting --- system/Model.php | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/system/Model.php b/system/Model.php index 03ca7525ec76..d5df3f861b97 100644 --- a/system/Model.php +++ b/system/Model.php @@ -174,7 +174,7 @@ public function setTable(string $table) } /** - * Fetches the row of database from $this->table with a primary key + * Fetches the row(s) of database from $this->table with a primary key * matching $id. * This method works only with dbCalls. * @@ -198,8 +198,11 @@ protected function doFind(bool $singleton, $id = null) $builder->where($this->table . '.' . $this->deletedField, null); } + $row = null; + $rows = []; + if (is_array($id)) { - $row = $builder->whereIn($this->table . '.' . $this->primaryKey, $id) + $rows = $builder->whereIn($this->table . '.' . $this->primaryKey, $id) ->get() ->getResult($this->tempReturnType); } elseif ($singleton) { @@ -207,16 +210,32 @@ protected function doFind(bool $singleton, $id = null) ->get() ->getFirstRow($this->tempReturnType); } else { - $row = $builder->get()->getResult($this->tempReturnType); + $rows = $builder->get()->getResult($this->tempReturnType); } - if ($useCast && $row !== null) { - $row = $this->convertToReturnType($row, $returnType); - + if ($useCast) { $this->tempReturnType = $returnType; + + if ($singleton) { + if ($row === null) { + return null; + } + + return $this->convertToReturnType($row, $returnType); + } + + foreach ($rows as $i => $row) { + $rows[$i] = $this->convertToReturnType($row, $returnType); + } + + return $rows; } - return $row; + if ($singleton) { + return $row; + } + + return $rows; } /** @@ -230,15 +249,7 @@ protected function doFind(bool $singleton, $id = null) */ protected function doFindColumn(string $columnName) { - $results = $this->select($columnName)->asArray()->find(); - - if ($this->useCasts()) { - foreach ($results as $i => $row) { - $results[$i] = $this->converter->fromDataSource($row); - } - } - - return $results; + return $this->select($columnName)->asArray()->find(); } /** From 579a4730b811b8bb9c9338922cec0e88978401a6 Mon Sep 17 00:00:00 2001 From: obozdag Date: Wed, 5 Jun 2024 11:26:28 +0200 Subject: [PATCH 6983/8282] docs: Change HTML 'tag's to 'element's in helpers/form_helper.rst Change HTML 'tag's to 'element's in helpers/form_helper.rst --- user_guide_src/source/helpers/form_helper.rst | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst index 68c7090408df..206aa216b6c5 100644 --- a/user_guide_src/source/helpers/form_helper.rst +++ b/user_guide_src/source/helpers/form_helper.rst @@ -145,7 +145,7 @@ The following functions are available: :param string $name: Field name :param string $value: Field value - :returns: An HTML hidden input field tag + :returns: An HTML hidden input element :rtype: string Lets you generate hidden input fields. You can either submit a @@ -171,7 +171,7 @@ The following functions are available: :param string $value: Field value :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string :param string $type: The type of input field. i.e., 'text', 'email', 'number', etc. - :returns: An HTML text input field tag + :returns: An HTML text input element :rtype: string Lets you generate a standard text input field. You can minimally pass @@ -206,7 +206,7 @@ The following functions are available: :param array $data: Field attributes data :param string $value: Field value :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML password input field tag + :returns: An HTML password input element :rtype: string This function is identical in all respects to the :php:func:`form_input()` @@ -217,7 +217,7 @@ The following functions are available: :param array $data: Field attributes data :param string $value: Field value :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML file upload input field tag + :returns: An HTML file upload input element :rtype: string This function is identical in all respects to the :php:func:`form_input()` @@ -229,7 +229,7 @@ The following functions are available: :param array $data: Field attributes data :param string $value: Field value :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML textarea tag + :returns: An HTML textarea element :rtype: string This function is identical in all respects to the :php:func:`form_input()` @@ -244,7 +244,7 @@ The following functions are available: :param array $options: An associative array of options to be listed :param array $selected: List of fields to mark with the *selected* attribute :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML dropdown select field tag + :returns: An HTML select (dropdown) element :rtype: string Lets you create a standard drop-down field. The first parameter will @@ -278,7 +278,7 @@ The following functions are available: :param array $options: An associative array of options to be listed :param array $selected: List of fields to mark with the *selected* attribute :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML dropdown multiselect field tag + :returns: An HTML multiselect (dropdown) element :rtype: string Lets you create a standard multiselect field. The first parameter will @@ -326,7 +326,7 @@ The following functions are available: :param string $value: Field value :param bool $checked: Whether to mark the checkbox as being *checked* :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML checkbox input tag + :returns: An HTML checkbox input element :rtype: string Lets you generate a checkbox field. Simple example: @@ -357,7 +357,7 @@ The following functions are available: :param string $value: Field value :param bool $checked: Whether to mark the radio button as being *checked* :param mixed $extra: Extra attributes to be added to the tag either as an array or a literal string - :returns: An HTML radio input tag + :returns: An HTML radio input element :rtype: string This function is identical in all respects to the :php:func:`form_checkbox()` @@ -368,7 +368,7 @@ The following functions are available: :param string $label_text: Text to put in the
        getHeaderLine($name), 'html') ?>
        HTTP MethodgetMethod())) ?>getMethod()) ?>
        IP AddressFredBlueSmallFredBlueSmall