Merge remote-tracking branch 'upstream/develop' into 4.3

Conflicts:
	rector.php
	user_guide_src/source/installation/upgrading.rst

Author: kenjis

.github/workflows/test-rector.yml

@@ -14,6 +14,7 @@ on:
       - 'utils/**.php'
       - '.github/workflows/test-rector.yml'
       - composer.json
+      - rector.php
 
   push:
     branches:
@@ -26,6 +27,7 @@ on:
       - 'utils/**.php'
       - '.github/workflows/test-rector.yml'
       - composer.json
+      - rector.php
 
 jobs:
   build:

.php-cs-fixer.dist.php

@@ -25,7 +25,11 @@
         __DIR__ . '/tests',
         __DIR__ . '/utils',
     ])
-    ->exclude(['ThirdParty'])
+    ->exclude([
+        'Pager/Views',
+        'ThirdParty',
+        'Validation/Views',
+    ])
     ->notName('#Foobar.php$#')
     ->append([
         __FILE__,

.php-cs-fixer.no-header.php

@@ -25,6 +25,7 @@
         __DIR__ . '/app',
         __DIR__ . '/public',
     ])
+    ->exclude(['Views/errors/html'])
     ->notName('#Logger\.php$#')
     ->append([
         __DIR__ . '/admin/starter/builds',

env

@@ -48,7 +48,7 @@
 # database.default.port = 3306
 
 # database.tests.hostname = localhost
-# database.tests.database = ci4
+# database.tests.database = ci4_test
 # database.tests.username = root
 # database.tests.password = root
 # database.tests.DBDriver = MySQLi

rector.php

@@ -95,7 +95,6 @@
 
         // check on constant compare
         UnwrapFutureCompatibleIfPhpVersionRector::class => [
-            __DIR__ . '/system/CodeIgniter.php',
             __DIR__ . '/system/Autoloader/Autoloader.php',
         ],
 

system/Database/SQLite3/Table.php

@@ -247,6 +247,13 @@ protected function createTable()
 
         $this->forge->addField($fields);
 
+        $fieldNames = array_keys($fields);
+
+        $this->keys = array_filter(
+            $this->keys,
+            static fn ($index) => count(array_intersect($index['fields'], $fieldNames)) === count($index['fields'])
+        );
+
         // Unique/Index keys
         if (is_array($this->keys)) {
             foreach ($this->keys as $key) {

tests/README.md

@@ -34,9 +34,24 @@ 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**.
+The default configuration uses SQLite3 transient in-memory database, so it works if you can use SQLite3.
+
+In order to change the database for testing, edit the details for the `tests` group in
+**app/Config/Database.php** or **phpunit.xml** or use **.env** file.
+
+E.g.:
+```
+database.tests.hostname = localhost
+database.tests.database = ci4_test
+database.tests.username = root
+database.tests.password = root
+database.tests.DBDriver = MySQLi
+database.tests.DBPrefix = db_
+database.default.port   = 3306
+```
+
 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.
 

tests/system/Database/Live/SQLite/AlterTableTest.php

@@ -156,6 +156,46 @@ public function testDropColumnMaintainsKeys()
         $this->assertTrue($result);
     }
 
+    public function testDropColumnDropCompositeKey()
+    {
+        $this->forge->dropTable('actions', true);
+
+        $fields = [
+            'category'   => ['type' => 'varchar', 'constraint' => 63],
+            'name'       => ['type' => 'varchar', 'constraint' => 63],
+            'created_at' => ['type' => 'datetime', 'null' => true],
+        ];
+
+        $this->forge->addField('id');
+        $this->forge->addField($fields);
+
+        $this->forge->addKey('name');
+        $this->forge->addKey(['category', 'name']);
+        $this->forge->addKey('created_at');
+
+        $this->forge->createTable('actions');
+
+        $indexes = $this->db->getIndexData('actions');
+
+        // the composite index was created
+        $this->assertSame(['category', 'name'], $indexes['actions_category_name']->fields);
+
+        // drop one of the columns in the composite index
+        $this->forge->dropColumn('actions', 'category');
+
+        // get indexes again
+        $indexes = $this->db->getIndexData('actions');
+
+        // check that composite index was dropped.
+        $this->assertArrayNotHasKey('actions_category_name', $indexes);
+
+        // check that that other keys are present
+        $this->assertArrayHasKey('actions_name', $indexes);
+        $this->assertArrayHasKey('actions_created_at', $indexes);
+
+        $this->forge->dropTable('actions');
+    }
+
     public function testModifyColumnSuccess()
     {
         $this->createTable('janky');

user_guide_src/source/installation/backward_compatibility_notes.rst

@@ -0,0 +1,16 @@
+############################
+Backward Compatibility Notes
+############################
+
+We try to develop our products to be as backward compatible (BC) as possible.
+
+Only major releases (such as 4.0, 5.0 etc.) are allowed to break backward compatibility.
+Minor releases (such as 4.2, 4.3 etc.) may introduce new features, but must do so without breaking the existing API.
+
+However, the code is not mature and bug fixes may break compatibility in minor releases, or even in patch releases (such as 4.2.5). In that case, all the breaking changes are described in the :doc:`../changelogs/index`.
+
+*****************************
+What are not Breaking Changes
+*****************************
+
+- 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.

user_guide_src/source/installation/upgrading.rst

@@ -5,13 +5,17 @@ Upgrading From a Previous Version
 Please read the upgrade notes corresponding to the version you are
 upgrading from.
 
+See also :doc:`./backward_compatibility_notes`.
+
 .. note:: If you don't know what version of CodeIgniter you are currently running,
     you can get it from :ref:`the Debug Toolbar <the-debug-toolbar>`,
     or simply echo the constant ``\CodeIgniter\CodeIgniter::CI_VERSION``.
 
 .. toctree::
     :titlesonly:
 
+    backward_compatibility_notes
+
     upgrade_430
     upgrade_423
     upgrade_422

user_guide_src/source/testing/database.rst

@@ -32,10 +32,13 @@ If you have multiple developers on your team, you will likely want to keep your
 the **.env** file. To do so, edit the file to ensure the following lines are present and have the
 correct information::
 
-    database.tests.dbdriver = 'MySQLi';
-    database.tests.username = 'root';
-    database.tests.password = '';
-    database.tests.database = '';
+    database.tests.hostname = localhost
+    database.tests.database = ci4_test
+    database.tests.username = root
+    database.tests.password = root
+    database.tests.DBDriver = MySQLi
+    database.tests.DBPrefix =
+    database.tests.port = 3306
 
 Migrations and Seeds
 ====================