From e1cfba72ce7ed911d1ba78b10f82780307ee2e12 Mon Sep 17 00:00:00 2001 From: Alexander Pankratov Date: Wed, 1 Jan 2020 01:44:44 +0300 Subject: [PATCH] Dotenv upgrade to v4 --- bootstrap.php | 2 +- composer.json | 3 +- composer.lock | 94 ++++++++++++++++++++++++++------------------------- 3 files changed, 51 insertions(+), 48 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index 7cd26be..d938aa4 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -9,5 +9,5 @@ chdir($root); //Check if root env file hash been loaded (in case plugin installed in existing project) if (!getenv('SERVER_ADDRESS')) { - Dotenv\Dotenv::create($root, '.env')->load(); + Dotenv\Dotenv::createImmutable($root)->load(); } diff --git a/composer.json b/composer.json index fef843f..4542f5b 100644 --- a/composer.json +++ b/composer.json @@ -9,10 +9,11 @@ "php": ">=7.3.0", "ext-json": "*", "amphp/http-server": "^2", - "vlucas/phpdotenv": "^3", + "vlucas/phpdotenv": "^4", "danog/madelineproto":"^5" }, "minimum-stability": "dev", + "prefer-stable": true, "authors": [ { "name": "Alexander Pankratov", diff --git a/composer.lock b/composer.lock index fe12e56..f771c3c 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": "e6402b29093e8463dff6bf8559aafc84", + "content-hash": "75ba1bc8d195a8a0bee6e46757f5aa25", "packages": [ { "name": "amphp/amp", @@ -902,33 +902,34 @@ }, { "name": "amphp/sync", - "version": "v1.x-dev", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/amphp/sync.git", - "reference": "eafe96a8f25fc01e08666dbddeb2e60d60488f7f" + "reference": "512d62e83c8b8d5c848183005c70e70df2bcca55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/sync/zipball/eafe96a8f25fc01e08666dbddeb2e60d60488f7f", - "reference": "eafe96a8f25fc01e08666dbddeb2e60d60488f7f", + "url": "https://api.github.com/repos/amphp/sync/zipball/512d62e83c8b8d5c848183005c70e70df2bcca55", + "reference": "512d62e83c8b8d5c848183005c70e70df2bcca55", "shasum": "" }, "require": { - "amphp/amp": "^2" + "amphp/amp": "^2.2", + "php": ">=7.1" }, "require-dev": { - "amphp/phpunit-util": "^1", - "friendsofphp/php-cs-fixer": "^2.3", - "phpunit/phpunit": "^6" + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.1", + "phpunit/phpunit": "^8 || ^7" }, "type": "library", "autoload": { "psr-4": { - "Amp\\Sync\\": "lib" + "Amp\\Sync\\": "src" }, "files": [ - "lib/functions.php" + "src/functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -954,7 +955,7 @@ "semaphore", "synchronization" ], - "time": "2019-09-20T03:24:36+00:00" + "time": "2019-11-08T18:42:56+00:00" }, { "name": "amphp/uri", @@ -1627,7 +1628,7 @@ }, { "name": "daverandom/libdns", - "version": "2.x-dev", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/DaveRandom/LibDNS.git", @@ -1667,16 +1668,16 @@ }, { "name": "erusev/parsedown", - "version": "1.8.0-beta-7", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955" + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955", - "reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", "shasum": "" }, "require": { @@ -1709,7 +1710,7 @@ "markdown", "parser" ], - "time": "2019-03-17T18:47:21+00:00" + "time": "2019-12-30T22:54:17+00:00" }, { "name": "kelunik/certificate", @@ -1843,7 +1844,7 @@ }, { "name": "league/uri-interfaces", - "version": "dev-master", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", @@ -1900,16 +1901,16 @@ }, { "name": "league/uri-parser", - "version": "1.x-dev", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-parser.git", - "reference": "917b60f69f7e2960b5026d3920e8066545139dcb" + "reference": "671548427e4c932352d9b9279fdfa345bf63fa00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-parser/zipball/917b60f69f7e2960b5026d3920e8066545139dcb", - "reference": "917b60f69f7e2960b5026d3920e8066545139dcb", + "url": "https://api.github.com/repos/thephpleague/uri-parser/zipball/671548427e4c932352d9b9279fdfa345bf63fa00", + "reference": "671548427e4c932352d9b9279fdfa345bf63fa00", "shasum": "" }, "require": { @@ -1961,11 +1962,11 @@ "uri", "url" ], - "time": "2019-09-20T22:27:10+00:00" + "time": "2018-11-22T07:55:51+00:00" }, { "name": "paragonie/constant_time_encoding", - "version": "v1.x-dev", + "version": "v1.0.4", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", @@ -2077,7 +2078,7 @@ }, { "name": "phpoption/phpoption", - "version": "dev-master", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", @@ -2132,16 +2133,16 @@ }, { "name": "psr/http-message", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4" + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", - "reference": "efd67d1dc14a7ef4fc4e518e7dee91c271d524e4", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { @@ -2178,20 +2179,20 @@ "request", "response" ], - "time": "2019-08-29T13:16:46+00:00" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", - "version": "dev-master", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/5628725d0e4d687e29575eb41f9d5ee7de33a84c", - "reference": "5628725d0e4d687e29575eb41f9d5ee7de33a84c", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -2225,11 +2226,11 @@ "psr", "psr-3" ], - "time": "2019-11-12T16:45:05+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "dev-master", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -2287,30 +2288,31 @@ }, { "name": "vlucas/phpdotenv", - "version": "3.6.x-dev", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" + "reference": "0176075a1b7ee9cf86f70143ec79edf7072c975a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0176075a1b7ee9cf86f70143ec79edf7072c975a", + "reference": "0176075a1b7ee9cf86f70143ec79edf7072c975a", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0", - "phpoption/phpoption": "^1.5", + "php": "^5.5.9 || ^7.0", + "phpoption/phpoption": "^1.7.1", "symfony/polyfill-ctype": "^1.9" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.3", "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2340,14 +2342,14 @@ "env", "environment" ], - "time": "2019-09-10T21:37:39+00:00" + "time": "2019-12-14T13:59:29+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": [], - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, "platform": { "php": ">=7.3.0",