Skip to content

Commit e704318

Browse files
authored
fix: Upgrade from 4.6 (#9939)
* fix: Add `Paths::$envDirectory` to framework package * docs: Add upgrade note
1 parent cce6f01 commit e704318

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

admin/starter/app/Config/Paths.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,16 @@ class Paths
7575
* is used when no value is provided to `Services::renderer()`.
7676
*/
7777
public string $viewDirectory = __DIR__ . '/../Views';
78+
79+
/**
80+
* ---------------------------------------------------------------
81+
* ENVIRONMENT DIRECTORY NAME
82+
* ---------------------------------------------------------------
83+
*
84+
* This variable must contain the name of the directory where
85+
* the .env file is located.
86+
* Please consider security implications when changing this
87+
* value - the directory should not be publicly accessible.
88+
*/
89+
public string $envDirectory = __DIR__ . '/../../';
7890
}

user_guide_src/source/installation/installing_composer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ Next Minor Version
191191
If you want to use the next minor version branch, after using the ``builds`` command
192192
edit **composer.json** manually.
193193

194-
If you try the ``4.7`` branch, change the version to ``4.7.x-dev``::
194+
If you try the ``4.8`` branch, change the version to ``4.8.x-dev``::
195195

196196
"require": {
197197
"php": "^8.2",
198-
"codeigniter4/codeigniter4": "4.7.x-dev"
198+
"codeigniter4/codeigniter4": "4.8.x-dev"
199199
},
200200

201201
And run ``composer update`` to sync your vendor

user_guide_src/source/installation/upgrading.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ upgrading from.
77

88
See also :doc:`./backward_compatibility_notes`.
99

10+
The manual mentions changes to **project space**. To perform the update,
11+
you need to compare the original files from **vendor/codeigniter4/framework** or from the ZIP archive and make changes.
12+
13+
Example, the original **app/Config/App.php** will be located in **vendor/codeigniter4/framework/app/Config/App.php**.
14+
Alternatively, replace it with a new file and add your previous lines.
15+
1016
.. note:: If you don't know what version of CodeIgniter you are currently running,
1117
you can get it from :ref:`the Debug Toolbar <the-debug-toolbar>`,
1218
or simply echo the constant ``\CodeIgniter\CodeIgniter::CI_VERSION``.

0 commit comments

Comments
 (0)