File tree 3 files changed +4
-1
lines changed
3 files changed +4
-1
lines changed Original file line number Diff line number Diff line change 11
11
- Added the ` |float ` Twig filter. ([ #11792 ] ( https://github.com/craftcms/cms/pull/11792 ) )
12
12
- Added the ` |integer ` Twig filter. ([ #11792 ] ( https://github.com/craftcms/cms/pull/11792 ) )
13
13
- Added the ` |string ` Twig filter. ([ #11792 ] ( https://github.com/craftcms/cms/pull/11792 ) )
14
+ - Added support for the ` CRAFT_DOTENV_PATH ` PHP constant. ([ #11894 ] ( https://github.com/craftcms/cms/discussions/11894 ) )
14
15
- Added ` craft\db\ActiveQuery::collect() ` . ([ #11842 ] ( https://github.com/craftcms/cms/pull/11842 ) )
15
16
- Added ` craft\elements\actions\Restore::$restorableElementsOnly ` .
16
17
- Added ` craft\enums\DateRangeType ` .
Original file line number Diff line number Diff line change 81
81
$ rootPath = $ findConfigPath ('--basePath ' , 'CRAFT_BASE_PATH ' ) ?? dirname ($ vendorPath );
82
82
83
83
// By default the remaining directories will be in the base directory
84
+ $ dotenvPath = $ findConfigPath ('--dotenvPath ' , 'CRAFT_DOTENV_PATH ' ) ?? "$ rootPath/.env " ;
84
85
$ configPath = $ findConfigPath ('--configPath ' , 'CRAFT_CONFIG_PATH ' ) ?? "$ rootPath/config " ;
85
86
$ contentMigrationsPath = $ findConfigPath ('--contentMigrationsPath ' , 'CRAFT_CONTENT_MIGRATIONS_PATH ' ) ?? "$ rootPath/migrations " ;
86
87
$ storagePath = $ findConfigPath ('--storagePath ' , 'CRAFT_STORAGE_PATH ' ) ?? "$ rootPath/storage " ;
200
201
Craft::setAlias ('@lib ' , $ libPath );
201
202
Craft::setAlias ('@craft ' , $ srcPath );
202
203
Craft::setAlias ('@appicons ' , $ srcPath . DIRECTORY_SEPARATOR . 'icons ' );
204
+ Craft::setAlias ('@dotenv ' , $ dotenvPath );
203
205
Craft::setAlias ('@config ' , $ configPath );
204
206
Craft::setAlias ('@contentMigrations ' , $ contentMigrationsPath );
205
207
Craft::setAlias ('@storage ' , $ storagePath );
Original file line number Diff line number Diff line change @@ -322,7 +322,7 @@ public function getLoadingConfigFile(): ?string
322
322
*/
323
323
public function getDotEnvPath (): string
324
324
{
325
- return $ this ->_dotEnvPath ?? ($ this ->_dotEnvPath = Craft::getAlias ('@root/.env ' ));
325
+ return $ this ->_dotEnvPath ?? ($ this ->_dotEnvPath = Craft::getAlias ('@dotenv ' ));
326
326
}
327
327
328
328
/**
You can’t perform that action at this time.
0 commit comments