Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into 4.4
Browse files Browse the repository at this point in the history
 Conflicts:
	user_guide_src/source/changelogs/index.rst
	user_guide_src/source/installation/upgrading.rst
  • Loading branch information
kenjis committed Jun 20, 2023
2 parents dd4d11d + 52a2372 commit 319fea5
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 4 deletions.
1 change: 1 addition & 0 deletions user_guide_src/source/changelogs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ See all the changes.
:titlesonly:

v4.4.0
v4.3.7
v4.3.6
v4.3.5
v4.3.4
Expand Down
29 changes: 29 additions & 0 deletions user_guide_src/source/changelogs/v4.3.7.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Version 4.3.7
#############

Release Date: Unreleased

**4.3.7 release of CodeIgniter4**

.. contents::
:local:
:depth: 3

BREAKING
********

Message Changes
***************

Changes
*******

Deprecations
************

Bugs Fixed
**********

See the repo's
`CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
for a complete list of bugs fixed.
50 changes: 50 additions & 0 deletions user_guide_src/source/installation/upgrade_437.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#############################
Upgrading from 4.3.6 to 4.3.7
#############################

Please refer to the upgrade instructions corresponding to your installation method.

- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
- :ref:`Manual Installation Upgrading <installing-manual-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 <https://packagist.org/explore/?query=codeigniter4%20updates>`_.

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
1 change: 1 addition & 0 deletions user_guide_src/source/installation/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ See also :doc:`./backward_compatibility_notes`.
backward_compatibility_notes

upgrade_440
upgrade_437
upgrade_436
upgrade_435
upgrade_434
Expand Down
25 changes: 23 additions & 2 deletions user_guide_src/source/libraries/sessions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,9 @@ However, there are some conditions that must be met:
Configure DatabaseHandler
-------------------------

Setting Table Name
^^^^^^^^^^^^^^^^^^

In order to use the 'DatabaseHandler' session driver, you must also create this
table that we already mentioned and then set it as your
``$savePath`` value.
Expand All @@ -591,6 +594,9 @@ you would do this:

.. literalinclude:: sessions/039.php

Creating Database Table
^^^^^^^^^^^^^^^^^^^^^^^

And then of course, create the database table ...

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

Adding Primary Key
^^^^^^^^^^^^^^^^^^

You will also need to add a PRIMARY KEY **depending on your $matchIP
setting**. The examples below work both on MySQL and PostgreSQL::

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

You can choose the Database group to use by adding a new line to the
**app/Config/Session.php** file with the name of the group to use:
.. important:: If you don't add the correct primary key, the following error
may occur::

Uncaught mysqli_sql_exception: Duplicate entry 'ci_session:***' for key 'ci_sessions.PRIMARY'

Changing Database Group
^^^^^^^^^^^^^^^^^^^^^^^

The default database group is used by default.
You can change the database group to use by changing the ``$DBGroup`` property
in the **app/Config/Session.php** file to the name of the group to use:

.. literalinclude:: sessions/040.php

Setting Up Database Table with 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::

Expand Down
2 changes: 0 additions & 2 deletions user_guide_src/source/libraries/sessions/040.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ class Session extends BaseConfig
{
// ...
public ?string $DBGroup = 'groupName';

// ...
}

0 comments on commit 319fea5

Please sign in to comment.