Skip to content

Commit 319fea5

Browse files
committedJun 20, 2023
Merge remote-tracking branch 'upstream/develop' into 4.4
Conflicts: user_guide_src/source/changelogs/index.rst user_guide_src/source/installation/upgrading.rst
·
v4.6.2v4.4.0
2 parents dd4d11d + 52a2372 commit 319fea5

File tree

6 files changed

+104
-4
lines changed

6 files changed

+104
-4
lines changed
 

‎user_guide_src/source/changelogs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ See all the changes.
1313
:titlesonly:
1414

1515
v4.4.0
16+
v4.3.7
1617
v4.3.6
1718
v4.3.5
1819
v4.3.4
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Version 4.3.7
2+
#############
3+
4+
Release Date: Unreleased
5+
6+
**4.3.7 release of CodeIgniter4**
7+
8+
.. contents::
9+
:local:
10+
:depth: 3
11+
12+
BREAKING
13+
********
14+
15+
Message Changes
16+
***************
17+
18+
Changes
19+
*******
20+
21+
Deprecations
22+
************
23+
24+
Bugs Fixed
25+
**********
26+
27+
See the repo's
28+
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
29+
for a complete list of bugs fixed.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#############################
2+
Upgrading from 4.3.6 to 4.3.7
3+
#############################
4+
5+
Please refer to the upgrade instructions corresponding to your installation method.
6+
7+
- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
8+
- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
9+
- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
10+
11+
.. contents::
12+
:local:
13+
:depth: 2
14+
15+
Mandatory File Changes
16+
**********************
17+
18+
Breaking Changes
19+
****************
20+
21+
Breaking Enhancements
22+
*********************
23+
24+
Project Files
25+
*************
26+
27+
Some files in the **project space** (root, app, public, writable) received updates. Due to
28+
these files being outside of the **system** scope they will not be changed without your intervention.
29+
30+
There are some third-party CodeIgniter modules available to assist with merging changes to
31+
the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
32+
33+
Content Changes
34+
===============
35+
36+
The following files received significant changes (including deprecations or visual adjustments)
37+
and it is recommended that you merge the updated versions with your application:
38+
39+
Config
40+
------
41+
42+
- @TODO
43+
44+
All Changes
45+
===========
46+
47+
This is a list of all files in the **project space** that received changes;
48+
many will be simple comments or formatting that have no effect on the runtime:
49+
50+
- @TODO

‎user_guide_src/source/installation/upgrading.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ See also :doc:`./backward_compatibility_notes`.
1717
backward_compatibility_notes
1818

1919
upgrade_440
20+
upgrade_437
2021
upgrade_436
2122
upgrade_435
2223
upgrade_434

‎user_guide_src/source/libraries/sessions.rst

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,9 @@ However, there are some conditions that must be met:
583583
Configure DatabaseHandler
584584
-------------------------
585585

586+
Setting Table Name
587+
^^^^^^^^^^^^^^^^^^
588+
586589
In order to use the 'DatabaseHandler' session driver, you must also create this
587590
table that we already mentioned and then set it as your
588591
``$savePath`` value.
@@ -591,6 +594,9 @@ you would do this:
591594

592595
.. literalinclude:: sessions/039.php
593596

597+
Creating Database Table
598+
^^^^^^^^^^^^^^^^^^^^^^^
599+
594600
And then of course, create the database table ...
595601

596602
For MySQL::
@@ -618,6 +624,9 @@ For PostgreSQL::
618624
and the session ID and a delimiter. It should be increased as needed, for example,
619625
when using long session IDs.
620626

627+
Adding Primary Key
628+
^^^^^^^^^^^^^^^^^^
629+
621630
You will also need to add a PRIMARY KEY **depending on your $matchIP
622631
setting**. The examples below work both on MySQL and PostgreSQL::
623632

@@ -630,11 +639,23 @@ setting**. The examples below work both on MySQL and PostgreSQL::
630639
// To drop a previously created primary key (use when changing the setting)
631640
ALTER TABLE ci_sessions DROP PRIMARY KEY;
632641

633-
You can choose the Database group to use by adding a new line to the
634-
**app/Config/Session.php** file with the name of the group to use:
642+
.. important:: If you don't add the correct primary key, the following error
643+
may occur::
644+
645+
Uncaught mysqli_sql_exception: Duplicate entry 'ci_session:***' for key 'ci_sessions.PRIMARY'
646+
647+
Changing Database Group
648+
^^^^^^^^^^^^^^^^^^^^^^^
649+
650+
The default database group is used by default.
651+
You can change the database group to use by changing the ``$DBGroup`` property
652+
in the **app/Config/Session.php** file to the name of the group to use:
635653

636654
.. literalinclude:: sessions/040.php
637655

656+
Setting Up Database Table with Command
657+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
658+
638659
If you'd rather not do all of this by hand, you can use the ``make:migration --session`` command
639660
from the cli to generate a migration file for you::
640661

‎user_guide_src/source/libraries/sessions/040.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ class Session extends BaseConfig
99
{
1010
// ...
1111
public ?string $DBGroup = 'groupName';
12-
13-
// ...
1412
}

0 commit comments

Comments
 (0)
Please sign in to comment.