From 2da11490bf2eee5b2e5844a9209fcc38da9c4816 Mon Sep 17 00:00:00 2001 From: Iris System Date: Thu, 2 Sep 2021 13:21:20 +1200 Subject: [PATCH] Update deps & make work in production --- composer.lock | 77 ++++++++++++++++++++----------------------- lib/Configuration.php | 1 + 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 9ec9789..fb7e8ba 100644 --- a/composer.lock +++ b/composer.lock @@ -113,31 +113,26 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb" + "reference": "84afea85c6841deeea872f36249a206e878a5de0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/7e279d2cd5d7fbb156ce46daada972355cea27bb", - "reference": "7e279d2cd5d7fbb156ce46daada972355cea27bb", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/84afea85c6841deeea872f36249a206e878a5de0", + "reference": "84afea85c6841deeea872f36249a206e878a5de0", "shasum": "" }, "require": { - "php": "^7.0|^8.0", - "phpoption/phpoption": "^1.7.3" + "php": "^7.0 || ^8.0", + "phpoption/phpoption": "^1.8" }, "require-dev": { - "phpunit/phpunit": "^6.5|^7.5|^8.5|^9.0" + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "GrahamCampbell\\ResultType\\": "src/" @@ -150,7 +145,7 @@ "authors": [ { "name": "Graham Campbell", - "email": "graham@alt-three.com" + "email": "hello@gjcampbell.co.uk" } ], "description": "An Implementation Of The Result Type", @@ -163,7 +158,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.1" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.2" }, "funding": [ { @@ -175,7 +170,7 @@ "type": "tidelift" } ], - "time": "2020-04-13T13:17:36+00:00" + "time": "2021-08-28T21:34:50+00:00" }, { "name": "nikic/fast-route", @@ -508,29 +503,29 @@ }, { "name": "phpoption/phpoption", - "version": "1.7.5", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525" + "reference": "5455cb38aed4523f99977c4a12ef19da4bfe2a28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525", - "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28", + "reference": "5455cb38aed4523f99977c4a12ef19da4bfe2a28", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0" + "php": "^7.0 || ^8.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^6.5.14 || ^7.0.20 || ^8.5.19 || ^9.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -549,7 +544,7 @@ }, { "name": "Graham Campbell", - "email": "graham@alt-three.com" + "email": "hello@gjcampbell.co.uk" } ], "description": "Option Type for PHP", @@ -561,7 +556,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.7.5" + "source": "https://github.com/schmittjoh/php-option/tree/1.8.0" }, "funding": [ { @@ -573,7 +568,7 @@ "type": "tidelift" } ], - "time": "2020-07-20T17:29:33+00:00" + "time": "2021-08-28T21:27:29+00:00" }, { "name": "psr/container", @@ -1652,12 +1647,12 @@ "source": { "type": "git", "url": "https://github.com/u1f408/ix-framework.git", - "reference": "1f9c077bef1724dd3faec58c33a5c540df371187" + "reference": "7200a81580f48ec2b97c3c0d6aa1f1f94e983df8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/u1f408/ix-framework/zipball/1f9c077bef1724dd3faec58c33a5c540df371187", - "reference": "1f9c077bef1724dd3faec58c33a5c540df371187", + "url": "https://api.github.com/repos/u1f408/ix-framework/zipball/7200a81580f48ec2b97c3c0d6aa1f1f94e983df8", + "reference": "7200a81580f48ec2b97c3c0d6aa1f1f94e983df8", "shasum": "" }, "require": { @@ -1699,7 +1694,7 @@ "source": "https://github.com/u1f408/ix-framework/tree/main", "issues": "https://github.com/u1f408/ix-framework/issues" }, - "time": "2021-08-18T16:37:35+00:00" + "time": "2021-09-02T02:27:34+00:00" }, { "name": "u1f408/phphelpers", @@ -2349,16 +2344,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.96", + "version": "0.12.97", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "a98bdc51318f20fcae8c953d266f81a70254917f" + "reference": "a8867e63a00e606589faf8d3613164f20722c4ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a98bdc51318f20fcae8c953d266f81a70254917f", - "reference": "a98bdc51318f20fcae8c953d266f81a70254917f", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a8867e63a00e606589faf8d3613164f20722c4ee", + "reference": "a8867e63a00e606589faf8d3613164f20722c4ee", "shasum": "" }, "require": { @@ -2389,7 +2384,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.96" + "source": "https://github.com/phpstan/phpstan/tree/0.12.97" }, "funding": [ { @@ -2409,7 +2404,7 @@ "type": "tidelift" } ], - "time": "2021-08-21T11:55:13+00:00" + "time": "2021-09-01T10:51:52+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2731,16 +2726,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.8", + "version": "9.5.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb" + "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb", - "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b", + "reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b", "shasum": "" }, "require": { @@ -2818,7 +2813,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9" }, "funding": [ { @@ -2830,7 +2825,7 @@ "type": "github" } ], - "time": "2021-07-31T15:17:34+00:00" + "time": "2021-08-31T06:47:40+00:00" }, { "name": "sebastian/cli-parser", diff --git a/lib/Configuration.php b/lib/Configuration.php index 364c34f..55fb755 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -38,6 +38,7 @@ class Configuration { // Require an environment $dotenv->required('APP_ENV')->allowedValues(['development', 'test', 'production']); + $dotenv->ifPresent('APP_BASE_PATH')->notEmpty(); // Require a session cookie $dotenv->required(IX_ENVBASE . '_SESSIONCOOKIE')->notEmpty();