From bb91938fedd6a9cb320e451c8ef68f8ca80fd691 Mon Sep 17 00:00:00 2001 From: Chris Kankiewicz Date: Tue, 16 Jun 2020 13:04:16 -0700 Subject: [PATCH] Updated vulcas/phpdotenv to v5 --- composer.json | 2 +- composer.lock | 92 +++++++++++++++++++++++++++++++++++++++------- index.php | 2 +- tests/TestCase.php | 2 +- 4 files changed, 81 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index e93b946..7ecf42e 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "symfony/translation": "^5.0", "symfony/yaml": "^5.0", "tightenco/collect": "^7.0", - "vlucas/phpdotenv": "^4.0" + "vlucas/phpdotenv": "^5.0" }, "require-dev": { "php": ">=7.4", diff --git a/composer.lock b/composer.lock index 6a2a236..b2737fd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e4419a29963c9f2076710469140600a5", + "content-hash": "9163312f9a39f41ae99a67a4a8acdca5", "packages": [ { "name": "erusev/parsedown", @@ -212,6 +212,68 @@ ], "time": "2020-06-14T09:00:00+00:00" }, + { + "name": "graham-campbell/result-type", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/GrahamCampbell/Result-Type.git", + "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/7e279d2cd5d7fbb156ce46daada972355cea27bb", + "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb", + "shasum": "" + }, + "require": { + "php": "^7.0|^8.0", + "phpoption/phpoption": "^1.7.3" + }, + "require-dev": { + "phpunit/phpunit": "^6.5|^7.5|^8.5|^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GrahamCampbell\\ResultType\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" + } + ], + "description": "An Implementation Of The Result Type", + "keywords": [ + "Graham Campbell", + "GrahamCampbell", + "Result Type", + "Result-Type", + "result" + ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", + "type": "tidelift" + } + ], + "time": "2020-04-13T13:17:36+00:00" + }, { "name": "micheh/psr7-cache", "version": "0.5", @@ -2499,37 +2561,39 @@ }, { "name": "vlucas/phpdotenv", - "version": "v4.1.7", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "db63b2ea280fdcf13c4ca392121b0b2450b51193" + "reference": "fbb6a5f65512f21d0db9e21bd49e67f70a9bbd5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/db63b2ea280fdcf13c4ca392121b0b2450b51193", - "reference": "db63b2ea280fdcf13c4ca392121b0b2450b51193", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/fbb6a5f65512f21d0db9e21bd49e67f70a9bbd5e", + "reference": "fbb6a5f65512f21d0db9e21bd49e67f70a9bbd5e", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", - "phpoption/phpoption": "^1.7.3", - "symfony/polyfill-ctype": "^1.16" + "ext-pcre": "*", + "graham-campbell/result-type": "^1.0.1", + "php": "^7.1.3 || ^8.0", + "phpoption/phpoption": "^1.7.4", + "symfony/polyfill-ctype": "^1.17", + "symfony/polyfill-mbstring": "^1.17", + "symfony/polyfill-php80": "^1.17" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "ext-pcre": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0" + "phpunit/phpunit": "^7.5.20 || ^8.5.2 || ^9.0" }, "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": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -2569,7 +2633,7 @@ "type": "tidelift" } ], - "time": "2020-06-07T18:25:35+00:00" + "time": "2020-06-07T19:04:14+00:00" } ], "packages-dev": [ diff --git a/index.php b/index.php index 79d46a2..efffa15 100644 --- a/index.php +++ b/index.php @@ -10,7 +10,7 @@ require __DIR__ . '/app/vendor/autoload.php'; ini_set('open_basedir', __DIR__); // Initialize environment variable handler -Dotenv::createImmutable(__DIR__)->safeLoad(); +Dotenv::createUnsafeImmutable(__DIR__)->safeLoad(); // Initialize the application $app = (new ContainerBuilder)->addDefinitions( diff --git a/tests/TestCase.php b/tests/TestCase.php index bc50814..3d95858 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -27,7 +27,7 @@ class TestCase extends PHPUnitTestCase */ public function setUp(): void { - Dotenv::createImmutable(__DIR__)->safeLoad(); + Dotenv::createUnsafeImmutable(__DIR__)->safeLoad(); $this->container = (new ContainerBuilder)->addDefinitions( dirname(__DIR__) . '/app/config/cache.php',