daxi20/acmeclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update deps, use email in setup from config if present

Browse Source
This commit is contained in:
Niklas Keller
2016-06-03 23:46:38 +02:00
parent 583318fa0b
commit 0722e104d4
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "c27b6e29c15798ac2cf219d7993e5771", "hash": "f645228f022f95d362e3cfa543321bd7",
"content-hash": "a0b266ee9280981bcacbfac39d0969eb", "content-hash": "af2e73ef42c235311d53fcf4eb5aa5ab",
"packages": [ "packages": [
{ {
"name": "amphp/amp", "name": "amphp/amp",
@@ -1577,16 +1577,16 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "3.3.3", "version": "4.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5" "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/44cd8e3930e431658d1a5de7d282d5cb37837fd5", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9",
"reference": "44cd8e3930e431658d1a5de7d282d5cb37837fd5", "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1600,7 +1600,7 @@
}, },
"require-dev": { "require-dev": {
"ext-xdebug": ">=2.1.4", "ext-xdebug": ">=2.1.4",
"phpunit/phpunit": "~5" "phpunit/phpunit": "^5.4"
}, },
"suggest": { "suggest": {
"ext-dom": "*", "ext-dom": "*",
@@ -1610,7 +1610,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3.x-dev" "dev-master": "4.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1636,7 +1636,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-05-27 16:24:29" "time": "2016-06-03 05:03:56"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@@ -1821,16 +1821,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "5.3.4", "version": "5.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "00dd95ffb48805503817ced06399017df315fe5c" "reference": "f5726a0262e5f74f8e9cf03128798b64160c441d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00dd95ffb48805503817ced06399017df315fe5c", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5726a0262e5f74f8e9cf03128798b64160c441d",
"reference": "00dd95ffb48805503817ced06399017df315fe5c", "reference": "f5726a0262e5f74f8e9cf03128798b64160c441d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1842,11 +1842,11 @@
"myclabs/deep-copy": "~1.3", "myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0", "php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1", "phpspec/prophecy": "^1.3.1",
"phpunit/php-code-coverage": "^3.3.0", "phpunit/php-code-coverage": "^4.0",
"phpunit/php-file-iterator": "~1.4", "phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6", "phpunit/php-timer": "^1.0.6",
"phpunit/phpunit-mock-objects": "^3.1", "phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.1", "sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2", "sebastian/diff": "~1.2",
"sebastian/environment": "~1.3", "sebastian/environment": "~1.3",
@@ -1866,7 +1866,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.3.x-dev" "dev-master": "5.4.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1892,30 +1892,30 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-05-11 13:28:45" "time": "2016-06-03 09:59:50"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "3.1.3", "version": "3.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "151c96874bff6fe61a25039df60e776613a61489" "reference": "314f8c44019b4dfece2571b98938574e6342be59"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/151c96874bff6fe61a25039df60e776613a61489", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/314f8c44019b4dfece2571b98938574e6342be59",
"reference": "151c96874bff6fe61a25039df60e776613a61489", "reference": "314f8c44019b4dfece2571b98938574e6342be59",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/instantiator": "^1.0.2", "doctrine/instantiator": "^1.0.2",
"php": ">=5.6", "php": "^5.6 || ^7.0",
"phpunit/php-text-template": "~1.2", "phpunit/php-text-template": "^1.2",
"sebastian/exporter": "~1.2" "sebastian/exporter": "^1.2"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5" "phpunit/phpunit": "^5.4"
}, },
"suggest": { "suggest": {
"ext-soap": "*" "ext-soap": "*"
@@ -1923,7 +1923,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.1.x-dev" "dev-master": "3.2.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1948,7 +1948,7 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2016-04-20 14:39:26" "time": "2016-06-03 05:01:30"
}, },
{ {
"name": "rych/bytesize", "name": "rych/bytesize",

4
src/Commands/Auto.php
View File

@@ -85,10 +85,10 @@ class Auto implements Command {
$errors = []; $errors = [];
foreach ($certificateChunks as $chunk) { foreach ($certificateChunks as $certificateChunk) {
$promises = []; $promises = [];
foreach ($chunk as $certificate) { foreach ($certificateChunk as $certificate) {
$promises[] = \Amp\resolve($this->checkAndIssue($certificate, $server, $storage)); $promises[] = \Amp\resolve($this->checkAndIssue($certificate, $server, $storage));
} }

16
src/Commands/Setup.php
View File

@@ -14,6 +14,7 @@ use Kelunik\AcmeClient\Stores\KeyStore;
use Kelunik\AcmeClient\Stores\KeyStoreException; use Kelunik\AcmeClient\Stores\KeyStoreException;
use League\CLImate\Argument\Manager; use League\CLImate\Argument\Manager;
use League\CLImate\CLImate; use League\CLImate\CLImate;
use Symfony\Component\Yaml\Yaml;
class Setup implements Command { class Setup implements Command {
private $climate; private $climate;
@@ -85,7 +86,7 @@ class Setup implements Command {
} }
public static function getDefinition() { public static function getDefinition() {
return [ $args = [
"server" => \Kelunik\AcmeClient\getArgumentDescription("server"), "server" => \Kelunik\AcmeClient\getArgumentDescription("server"),
"storage" => \Kelunik\AcmeClient\getArgumentDescription("storage"), "storage" => \Kelunik\AcmeClient\getArgumentDescription("storage"),
"email" => [ "email" => [
@@ -94,5 +95,18 @@ class Setup implements Command {
"required" => true, "required" => true,
], ],
]; ];
$configPath = \Kelunik\AcmeClient\getConfigPath();
if ($configPath) {
$config = Yaml::parse(file_get_contents($configPath));
if (isset($config["email"]) && is_string($config["email"])) {
$args["email"]["required"] = false;
$args["email"]["defaultValue"] = $config["email"];
}
}
return $args;
} }
} }