Skip to content

feat: env directory path #9631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.7
Choose a base branch
from
+17 −5
Open

feat: env directory path #9631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/Config/Paths.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,14 @@ class Paths
* is used when no value is provided to `Services::renderer()`.
*/
public string $viewDirectory = __DIR__ . '/../Views';

/**
* ---------------------------------------------------------------
* ENVIRONMENT DIRECTORY NAME
* ---------------------------------------------------------------
*
* This variable must contain the name of the directory for
* environment files.
*/
public string $environmentDirectory = __DIR__ . '/../../';
}
2 changes: 1 addition & 1 deletion system/Boot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public static function preload(Paths $paths): void
protected static function loadDotEnv(Paths $paths): void
{
require_once $paths->systemDirectory . '/Config/DotEnv.php';
(new DotEnv($paths->appDirectory . '/../'))->load();
(new DotEnv($paths->environmentDirectory))->load();
}

protected static function defineEnvironment(): void
Expand Down
5 changes: 3 additions & 2 deletions system/Commands/Encryption/GenerateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use CodeIgniter\CLI\CLI;
use CodeIgniter\Config\DotEnv;
use CodeIgniter\Encryption\Encryption;
use Config\Paths;

/**
* Generates a new encryption key.
Expand Down Expand Up @@ -101,7 +102,7 @@ public function run(array $params)
// force DotEnv to reload the new env vars
putenv('encryption.key');
unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
$dotenv = new DotEnv(ROOTPATH);
$dotenv = new DotEnv((new Paths())->environmentDirectory);
$dotenv->load();

CLI::write('Application\'s new encryption key was successfully set.', 'green');
Expand Down Expand Up @@ -155,7 +156,7 @@ protected function confirmOverwrite(array $params): bool
protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bool
{
$baseEnv = ROOTPATH . 'env';
$envFile = ROOTPATH . '.env';
$envFile = (new Paths())->environmentDirectory . '.env';

if (! is_file($envFile)) {
if (! is_file($baseEnv)) {
Expand Down
5 changes: 3 additions & 2 deletions system/Commands/Utilities/Environment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use CodeIgniter\CLI\BaseCommand;
use CodeIgniter\CLI\CLI;
use CodeIgniter\Config\DotEnv;
use Config\Paths;

/**
* Command to display the current environment,
Expand Down Expand Up @@ -119,7 +120,7 @@ public function run(array $params)
// however we cannot redefine the ENVIRONMENT constant
putenv('CI_ENVIRONMENT');
unset($_ENV['CI_ENVIRONMENT'], $_SERVER['CI_ENVIRONMENT']);
(new DotEnv(ROOTPATH))->load();
(new DotEnv((new Paths())->environmentDirectory))->load();

CLI::write(sprintf('Environment is successfully changed to "%s".', $env), 'green');
CLI::write('The ENVIRONMENT constant will be changed in the next script execution.');
Expand All @@ -134,7 +135,7 @@ public function run(array $params)
private function writeNewEnvironmentToEnvFile(string $newEnv): bool
{
$baseEnv = ROOTPATH . 'env';
$envFile = ROOTPATH . '.env';
$envFile = (new Paths())->environmentDirectory . '.env';

if (! is_file($envFile)) {
if (! is_file($baseEnv)) {
Expand Down
Loading