Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
phd5-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmstr
phd5-app
Commits
aec783ee
Commit
aec783ee
authored
Jan 27, 2023
by
Tobias Munk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated ENV library (vlucas/dotenv)
parent
d9d32ae0
Pipeline
#73651
failed with stage
in 4 minutes and 50 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
189 additions
and
43 deletions
+189
-43
env.php
config/env.php
+3
-2
composer.lock
src/composer.lock
+183
-38
composer.phd5.json
src/composer.phd5.json
+3
-3
No files found.
config/env.php
View file @
aec783ee
...
...
@@ -9,6 +9,7 @@
* file that was distributed with this source code
*/
use
Dotenv\Dotenv
;
use
yii\helpers\FileHelper
;
$configPath
=
__DIR__
;
...
...
@@ -17,7 +18,7 @@ $configPath = __DIR__;
if
(
getenv
(
'ENV_LOCAL_FILE'
))
{
$localEnv
=
FileHelper
::
normalizePath
(
$configPath
.
'/'
.
getenv
(
'ENV_LOCAL_FILE'
));
if
(
is_file
(
$localEnv
))
{
$dotenvLocal
=
new
Dotenv\Dotenv
(
$configPath
,
getenv
(
'ENV_LOCAL_FILE'
));
$dotenvLocal
=
Dotenv
::
createUnsafeImmutable
(
$configPath
,
getenv
(
'ENV_LOCAL_FILE'
));
$dotenvLocal
->
load
();
}
else
{
exit
(
"Error: ENV_LOCAL_FILE '
{
$localEnv
}
' not found"
.
PHP_EOL
);
...
...
@@ -25,7 +26,7 @@ if (getenv('ENV_LOCAL_FILE')) {
}
// Load application environment configuration
$dotenv
=
new
Dotenv\Dotenv
(
$configPath
,
'/env-defaults'
);
$dotenv
=
Dotenv
::
createUnsafeImmutable
(
$configPath
,
'/env-defaults'
);
$dotenv
->
load
();
// Basic checks & validation
...
...
src/composer.lock
View file @
aec783ee
...
...
@@ -455,16 +455,16 @@
},
{
"name": "bower-asset/ace-builds",
"version": "v1.1
4
.0",
"version": "v1.1
5
.0",
"source": {
"type": "git",
"url": "
https://github.com/
ajaxorg/ace-builds.git",
"reference": "
62b5377d9d115313fc07dc74926b292cc7683497
"
"url": "
git@github.com:
ajaxorg/ace-builds.git",
"reference": "
4686b2a71f81c66fc7f7b5541b544fce4703bd4a
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ajaxorg/ace-builds/zipball/
62b5377d9d115313fc07dc74926b292cc7683497
",
"reference": "
62b5377d9d115313fc07dc74926b292cc7683497
"
"url": "https://api.github.com/repos/ajaxorg/ace-builds/zipball/
4686b2a71f81c66fc7f7b5541b544fce4703bd4a
",
"reference": "
4686b2a71f81c66fc7f7b5541b544fce4703bd4a
"
},
"type": "bower-asset",
"license": [
...
...
@@ -1980,16 +1980,16 @@
},
{
"name": "dmstr/yii2-pages-module",
"version": "2.5.
2
",
"version": "2.5.
3
",
"source": {
"type": "git",
"url": "https://github.com/dmstr/yii2-pages-module.git",
"reference": "
7e426cbbfc3d114552828079528a8618323b467e
"
"reference": "
b75473b28364c5ac199ee1b7ce6f2069e5b06be1
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmstr/yii2-pages-module/zipball/
7e426cbbfc3d114552828079528a8618323b467e
",
"reference": "
7e426cbbfc3d114552828079528a8618323b467e
",
"url": "https://api.github.com/repos/dmstr/yii2-pages-module/zipball/
b75473b28364c5ac199ee1b7ce6f2069e5b06be1
",
"reference": "
b75473b28364c5ac199ee1b7ce6f2069e5b06be1
",
"shasum": ""
},
"require": {
...
...
@@ -2043,22 +2043,22 @@
],
"support": {
"issues": "https://github.com/dmstr/yii2-pages-module/issues",
"source": "https://github.com/dmstr/yii2-pages-module/tree/2.5.
2
"
"source": "https://github.com/dmstr/yii2-pages-module/tree/2.5.
3
"
},
"time": "2023-01-2
6T13:15:32
+00:00"
"time": "2023-01-2
7T12:05:18
+00:00"
},
{
"name": "dmstr/yii2-prototype-module",
"version": "2.2.
3
",
"version": "2.2.
4
",
"source": {
"type": "git",
"url": "https://github.com/dmstr/yii2-prototype-module.git",
"reference": "
f32612d8d9b8af045017e2edcd77431f600e44d8
"
"reference": "
451cc0f6653cbf73f97202b75dbcc6dbec66178c
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dmstr/yii2-prototype-module/zipball/
f32612d8d9b8af045017e2edcd77431f600e44d8
",
"reference": "
f32612d8d9b8af045017e2edcd77431f600e44d8
",
"url": "https://api.github.com/repos/dmstr/yii2-prototype-module/zipball/
451cc0f6653cbf73f97202b75dbcc6dbec66178c
",
"reference": "
451cc0f6653cbf73f97202b75dbcc6dbec66178c
",
"shasum": ""
},
"require": {
...
...
@@ -2098,9 +2098,9 @@
],
"support": {
"issues": "https://github.com/dmstr/yii2-prototype-module/issues",
"source": "https://github.com/dmstr/yii2-prototype-module/tree/2.2.
3
"
"source": "https://github.com/dmstr/yii2-prototype-module/tree/2.2.
4
"
},
"time": "202
2-04-13T11:12:58
+00:00"
"time": "202
3-01-27T12:01:42
+00:00"
},
{
"name": "dmstr/yii2-publication-module",
...
...
@@ -2795,6 +2795,68 @@
},
"time": "2016-10-24T15:52:54+00:00"
},
{
"name": "graham-campbell/result-type",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"phpoption/phpoption": "^1.9"
},
"require-dev": {
"phpunit/phpunit": "^8.5.28 || ^9.5.21"
},
"type": "library",
"autoload": {
"psr-4": {
"GrahamCampbell\\ResultType\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
}
],
"description": "An Implementation Of The Result Type",
"keywords": [
"Graham Campbell",
"GrahamCampbell",
"Result Type",
"Result-Type",
"result"
],
"support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues",
"source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
},
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
"type": "tidelift"
}
],
"time": "2022-07-30T15:56:11+00:00"
},
{
"name": "ignatenkovnikita/yii2-queuemanager",
"version": "v0.1.0",
...
...
@@ -4325,10 +4387,10 @@
},
{
"name": "npm-asset/ace-builds",
"version": "1.1
4
.0",
"version": "1.1
5
.0",
"dist": {
"type": "tar",
"url": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.1
4
.0.tgz"
"url": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.1
5
.0.tgz"
},
"type": "npm-asset",
"license": [
...
...
@@ -4959,6 +5021,81 @@
},
"time": "2023-01-24T20:07:45+00:00"
},
{
"name": "phpoption/phpoption",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
"reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
"reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8",
"phpunit/phpunit": "^8.5.28 || ^9.5.21"
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": true
},
"branch-alias": {
"dev-master": "1.9-dev"
}
},
"autoload": {
"psr-4": {
"PhpOption\\": "src/PhpOption/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Johannes M. Schmitt",
"email": "schmittjoh@gmail.com",
"homepage": "https://github.com/schmittjoh"
},
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
}
],
"description": "Option Type for PHP",
"keywords": [
"language",
"option",
"php",
"type"
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
"source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
},
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
"type": "tidelift"
}
],
"time": "2022-07-30T15:51:26+00:00"
},
{
"name": "phpspec/php-diff",
"version": "v1.1.3",
...
...
@@ -5426,12 +5563,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "
6120dcc6cea2150079c5b75d31f0c5ad2ab3206e
"
"reference": "
85ea494f3599c1d23c81c65d0c994e0f80895a75
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/
6120dcc6cea2150079c5b75d31f0c5ad2ab3206e
",
"reference": "
6120dcc6cea2150079c5b75d31f0c5ad2ab3206e
",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/
85ea494f3599c1d23c81c65d0c994e0f80895a75
",
"reference": "
85ea494f3599c1d23c81c65d0c994e0f80895a75
",
"shasum": ""
},
"conflict": {
...
...
@@ -5703,7 +5840,7 @@
"open-web-analytics/open-web-analytics": "<1.7.4",
"opencart/opencart": "<=3.0.3.7",
"openid/php-openid": "<2.3",
"openmage/magento-lts": "<19.4.
15|>=20,<20.0.13
",
"openmage/magento-lts": "<19.4.
22|>=20,<20.0.19
",
"orchid/platform": ">=9,<9.4.4",
"oro/commerce": ">=4.1,<5.0.6",
"oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
...
...
@@ -5829,7 +5966,7 @@
"symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
"symbiote/silverstripe-seed": "<6.0.3",
"symbiote/silverstripe-versionedfiles": "<=2.0.3",
"symfont/process": ">=0
,<4
",
"symfont/process": ">=0",
"symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
"symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
"symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4",
...
...
@@ -5985,7 +6122,7 @@
"type": "tidelift"
}
],
"time": "2023-01-2
5T23:04:1
6+00:00"
"time": "2023-01-2
6T20:04:0
6+00:00"
},
{
"name": "schmunk42/retry",
...
...
@@ -7486,35 +7623,43 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v
2.6.9
",
"version": "v
5.5.0
",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "
2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141
"
"reference": "
1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/
2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141
",
"reference": "
2e93cc98e2e8e869f8d9cfa61bb3a99ba4fc4141
",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/
1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7
",
"reference": "
1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7
",
"shasum": ""
},
"require": {
"php": "^5.3.9 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.17"
"ext-pcre": "*",
"graham-campbell/result-type": "^1.0.2",
"php": "^7.1.3 || ^8.0",
"phpoption/phpoption": "^1.8",
"symfony/polyfill-ctype": "^1.23",
"symfony/polyfill-mbstring": "^1.23.1",
"symfony/polyfill-php80": "^1.23.1"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21"
"phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25"
},
"suggest": {
"ext-filter": "Required to use the boolean validator.",
"ext-pcre": "Required to use most of the library."
"ext-filter": "Required to use the boolean validator."
},
"type": "library",
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": true
},
"branch-alias": {
"dev-master": "
2.6
-dev"
"dev-master": "
5.5
-dev"
}
},
"autoload": {
...
...
@@ -7546,7 +7691,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
"source": "https://github.com/vlucas/phpdotenv/tree/v
2.6.9
"
"source": "https://github.com/vlucas/phpdotenv/tree/v
5.5.0
"
},
"funding": [
{
...
...
@@ -7558,7 +7703,7 @@
"type": "tidelift"
}
],
"time": "202
1-12-12T22:59:22
+00:00"
"time": "202
2-10-16T01:01:54
+00:00"
},
{
"name": "wikimedia/composer-merge-plugin",
...
...
src/composer.phd5.json
View file @
aec783ee
...
...
@@ -15,8 +15,8 @@
"dmstr/yii2-redirect-module"
:
"^0.3.1"
,
"dmstr/yii2-filefly-module"
:
"^1.6.0"
,
"dmstr/yii2-filemanager-widgets"
:
"^1.2.0"
,
"dmstr/yii2-pages-module"
:
"^2.
2.0
"
,
"dmstr/yii2-prototype-module"
:
"^2.
0.0
"
,
"dmstr/yii2-pages-module"
:
"^2.
5.3
"
,
"dmstr/yii2-prototype-module"
:
"^2.
2.4
"
,
"dmstr/yii2-publication-module"
:
"^1.2.3"
,
"dmstr/yii2-resque-module"
:
"^2.0.0-alpha2"
,
"dmstr/yii2-widgets2-module"
:
"^2.7.0-beta1"
,
...
...
@@ -28,7 +28,7 @@
"pheme/yii2-settings"
:
"^0.7.0"
,
"roave/security-advisories"
:
"dev-master"
,
"schmunk42/yii2-markdocs-module"
:
"^1.0.0"
,
"vlucas/phpdotenv"
:
"
2.*
"
,
"vlucas/phpdotenv"
:
"
^5.5
"
,
"yiisoft/yii2-dev"
:
"~2.0.11"
,
"yiisoft/yii2-bootstrap"
:
"2.*"
,
"yiisoft/yii2-redis"
:
"^2.0.5"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment