Update dependencies

Also update php-cs from fabpot to friendsofphp.
Update dependencies
2016-08-04 16:13:04 +02:00 · 2016-08-04 16:10:17 +02:00 · 2016-07-29 09:09:15 +02:00 · 2016-07-27 22:28:42 +02:00 · 2016-07-11 09:19:18 +02:00 · 2016-06-28 22:05:36 +02:00
5 changed files with 114 additions and 88 deletions
--- a/bin/acme
+++ b/bin/acme
@@ -80,6 +80,11 @@ if (!in_array(PHP_SAPI, ["cli", "phpdbg"], true)) {
    exit(1);
 }

+if (PHP_VERSION_ID < 50600) {
+    $climate->yellow("You're using an older version of PHP which is no longer supported and will not even receive security fixes anymore. Have a look at http://php.net/supported-versions.php and upgrade now!");
+    $climate->br(2);
+}
+
 if (count($argv) === 1 || in_array($argv[1], ["-h", "help", "--help"], true)) {
    $climate->out($logo . $help);
    exit(0);
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
    },
    "require-dev": {
        "phpunit/phpunit": "^5",
-        "fabpot/php-cs-fixer": "^1.9",
+        "friendsofphp/php-cs-fixer": "^1.9",
        "macfja/phar-builder": "dev-events-dev-files"
    },
    "license": "MIT",
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "f645228f022f95d362e3cfa543321bd7",
-    "content-hash": "af2e73ef42c235311d53fcf4eb5aa5ab",
+    "hash": "8aca843d1d25555d3bb10078455f8020",
+    "content-hash": "8398b7b6f2a3198c911b9a1161fd1dfa",
    "packages": [
        {
            "name": "amphp/amp",
@@ -66,16 +66,16 @@
        },
        {
            "name": "amphp/artax",
-            "version": "v2.0.3",
+            "version": "v2.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/amphp/artax.git",
-                "reference": "cc665ac890322188bad8b80722d64af6207b770d"
+                "reference": "b60cf493c9e577a3678865f620b1eb61ab3d7ca9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/artax/zipball/cc665ac890322188bad8b80722d64af6207b770d",
-                "reference": "cc665ac890322188bad8b80722d64af6207b770d",
+                "url": "https://api.github.com/repos/amphp/artax/zipball/b60cf493c9e577a3678865f620b1eb61ab3d7ca9",
+                "reference": "b60cf493c9e577a3678865f620b1eb61ab3d7ca9",
                "shasum": ""
            },
            "require": {
@@ -120,7 +120,7 @@
                "parallel",
                "rest"
            ],
-            "time": "2016-03-09 11:33:42"
+            "time": "2016-07-18 16:44:41"
        },
        {
            "name": "amphp/cache",
@@ -342,16 +342,16 @@
        },
        {
            "name": "amphp/socket",
-            "version": "v0.9.8",
+            "version": "v0.9.9",
            "source": {
                "type": "git",
                "url": "https://github.com/amphp/socket.git",
-                "reference": "bdc72fc545e6dcee444419d98eea80875bffc806"
+                "reference": "722614608c1de7099661187fad4e15c876816db1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/socket/zipball/bdc72fc545e6dcee444419d98eea80875bffc806",
-                "reference": "bdc72fc545e6dcee444419d98eea80875bffc806",
+                "url": "https://api.github.com/repos/amphp/socket/zipball/722614608c1de7099661187fad4e15c876816db1",
+                "reference": "722614608c1de7099661187fad4e15c876816db1",
                "shasum": ""
            },
            "require": {
@@ -393,7 +393,7 @@
                "tcp",
                "tls"
            ],
-            "time": "2016-06-19 20:16:19"
+            "time": "2016-07-18 22:03:24"
        },
        {
            "name": "daverandom/libdns",
@@ -1007,16 +1007,16 @@
        },
        {
            "name": "symfony/yaml",
-            "version": "v3.1.1",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/yaml.git",
-                "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623"
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/c5a7e7fc273c758b92b85dcb9c46149ccda89623",
-                "reference": "c5a7e7fc273c758b92b85dcb9c46149ccda89623",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac",
+                "reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
                "shasum": ""
            },
            "require": {
@@ -1052,7 +1052,7 @@
            ],
            "description": "Symfony Yaml Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-14 11:18:07"
+            "time": "2016-07-17 14:02:08"
        },
        {
            "name": "webmozart/assert",
@@ -1160,17 +1160,17 @@
            "time": "2015-06-14 21:17:01"
        },
        {
-            "name": "fabpot/php-cs-fixer",
-            "version": "v1.11.4",
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v1.11.6",
            "source": {
                "type": "git",
                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "eeb280e909834603ffe03524dbe0066e77c83084"
+                "reference": "41dc93abd2937a85a3889e28765231d574d2bac8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/eeb280e909834603ffe03524dbe0066e77c83084",
-                "reference": "eeb280e909834603ffe03524dbe0066e77c83084",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/41dc93abd2937a85a3889e28765231d574d2bac8",
+                "reference": "41dc93abd2937a85a3889e28765231d574d2bac8",
                "shasum": ""
            },
            "require": {
@@ -1184,8 +1184,12 @@
                "symfony/process": "~2.3|~3.0",
                "symfony/stopwatch": "~2.5|~3.0"
            },
+            "conflict": {
+                "hhvm": "<3.9"
+            },
            "require-dev": {
-                "satooshi/php-coveralls": "0.7.*@dev"
+                "phpunit/phpunit": "^4.5|^5",
+                "satooshi/php-coveralls": "^0.7.1"
            },
            "bin": [
                "php-cs-fixer"
@@ -1211,8 +1215,7 @@
                }
            ],
            "description": "A tool to automatically fix PHP code style",
-            "abandoned": "friendsofphp/php-cs-fixer",
-            "time": "2016-06-07 07:51:27"
+            "time": "2016-07-22 06:46:28"
        },
        {
            "name": "league/event",
@@ -1677,16 +1680,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "4.0.0",
+            "version": "4.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9"
+                "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9",
-                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5f3f7e736d6319d5f1fc402aff8b026da26709a3",
+                "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3",
                "shasum": ""
            },
            "require": {
@@ -1695,7 +1698,7 @@
                "phpunit/php-text-template": "~1.2",
                "phpunit/php-token-stream": "^1.4.2",
                "sebastian/code-unit-reverse-lookup": "~1.0",
-                "sebastian/environment": "^1.3.2",
+                "sebastian/environment": "^1.3.2 || ^2.0",
                "sebastian/version": "~1.0|~2.0"
            },
            "require-dev": {
@@ -1736,7 +1739,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2016-06-03 05:03:56"
+            "time": "2016-07-26 14:39:29"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -1921,16 +1924,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "5.4.6",
+            "version": "5.4.8",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59"
+                "reference": "3132365e1430c091f208e120b8845d39c25f20e6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2f1fc94b77ea6418bd6a06c64a1dac0645fbce59",
-                "reference": "2f1fc94b77ea6418bd6a06c64a1dac0645fbce59",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3132365e1430c091f208e120b8845d39c25f20e6",
+                "reference": "3132365e1430c091f208e120b8845d39c25f20e6",
                "shasum": ""
            },
            "require": {
@@ -1942,7 +1945,7 @@
                "myclabs/deep-copy": "~1.3",
                "php": "^5.6 || ^7.0",
                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0",
+                "phpunit/php-code-coverage": "^4.0.1",
                "phpunit/php-file-iterator": "~1.4",
                "phpunit/php-text-template": "~1.2",
                "phpunit/php-timer": "^1.0.6",
@@ -1995,7 +1998,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2016-06-16 06:01:15"
+            "time": "2016-07-26 14:48:00"
        },
        {
            "name": "phpunit/phpunit-mock-objects",
@@ -2616,16 +2619,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v2.8.7",
+            "version": "v2.8.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3"
+                "reference": "36e62335caca8a6e909c5c5bac4a8128149911c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
-                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/36e62335caca8a6e909c5c5bac4a8128149911c9",
+                "reference": "36e62335caca8a6e909c5c5bac4a8128149911c9",
                "shasum": ""
            },
            "require": {
@@ -2672,20 +2675,20 @@
            ],
            "description": "Symfony Console Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-06 15:06:25"
+            "time": "2016-07-30 07:20:35"
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v3.1.1",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "f5b7563f67779c6d3d5370e23448e707c858df3e"
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f5b7563f67779c6d3d5370e23448e707c858df3e",
-                "reference": "f5b7563f67779c6d3d5370e23448e707c858df3e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
+                "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5",
                "shasum": ""
            },
            "require": {
@@ -2732,20 +2735,20 @@
            ],
            "description": "Symfony EventDispatcher Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:42:41"
+            "time": "2016-07-19 10:45:57"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v3.1.1",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "5751e80d6f94b7c018f338a4a7be0b700d6f3058"
+                "reference": "bb29adceb552d202b6416ede373529338136e84f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/5751e80d6f94b7c018f338a4a7be0b700d6f3058",
-                "reference": "5751e80d6f94b7c018f338a4a7be0b700d6f3058",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/bb29adceb552d202b6416ede373529338136e84f",
+                "reference": "bb29adceb552d202b6416ede373529338136e84f",
                "shasum": ""
            },
            "require": {
@@ -2781,20 +2784,20 @@
            ],
            "description": "Symfony Filesystem Component",
            "homepage": "https://symfony.com",
-            "time": "2016-04-12 18:27:47"
+            "time": "2016-07-20 05:44:26"
        },
        {
            "name": "symfony/finder",
-            "version": "v2.8.7",
+            "version": "v2.8.9",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b"
+                "reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b",
-                "reference": "3ec095fab1800222732ca522a95dce8fa124007b",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
+                "reference": "60804d88691e4a73bbbb3035eb1d9f075c5c2c10",
                "shasum": ""
            },
            "require": {
@@ -2830,7 +2833,7 @@
            ],
            "description": "Symfony Finder Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:11:27"
+            "time": "2016-07-26 08:02:44"
        },
        {
            "name": "symfony/polyfill-mbstring",
@@ -2893,16 +2896,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v3.1.1",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "6350e63ed9c232da50e00f00a7e0330f066387a2"
+                "reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/6350e63ed9c232da50e00f00a7e0330f066387a2",
-                "reference": "6350e63ed9c232da50e00f00a7e0330f066387a2",
+                "url": "https://api.github.com/repos/symfony/process/zipball/04c2dfaae4ec56a5c677b0c69fac34637d815758",
+                "reference": "04c2dfaae4ec56a5c677b0c69fac34637d815758",
                "shasum": ""
            },
            "require": {
@@ -2938,20 +2941,20 @@
            ],
            "description": "Symfony Process Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:42:41"
+            "time": "2016-07-28 11:13:48"
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v3.1.1",
+            "version": "v3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "e7238f98c90b99e9b53f3674a91757228663b04d"
+                "reference": "bb42806b12c5f89db4ebf64af6741afe6d8457e1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e7238f98c90b99e9b53f3674a91757228663b04d",
-                "reference": "e7238f98c90b99e9b53f3674a91757228663b04d",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/bb42806b12c5f89db4ebf64af6741afe6d8457e1",
+                "reference": "bb42806b12c5f89db4ebf64af6741afe6d8457e1",
                "shasum": ""
            },
            "require": {
@@ -2987,7 +2990,7 @@
            ],
            "description": "Symfony Stopwatch Component",
            "homepage": "https://symfony.com",
-            "time": "2016-06-06 11:42:41"
+            "time": "2016-06-29 05:41:56"
        },
        {
            "name": "webignition/readable-duration",
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -41,8 +41,10 @@ certificates:
    # Required: paths
    # Optional: bits, user
    #
-    # paths: Map of document roots to domains.
-    #        /tmp is used here for domains without a real document root.
+    # paths: Map of document roots to domains. Maps each path to one or multiple
+    #        domains. If one domain is given, it's automatically converted to an
+    #        array. The first domain will be the common name.
+    #
    #        The client will place a file into $path/.well-known/acme-challenge/
    #        to verify ownership to the CA
    #
@@ -53,9 +55,9 @@ certificates:
    #
    - bits: 4096
      paths:
-        /tmp:
-            - docs.example.org
-            - git.example.org
+        /var/www/example:
+            - example.org
+            - www.example.org
    # You can have multiple certificate with different users and key options.
    - user: www-data
      paths:
--- a/src/Commands/Issue.php
+++ b/src/Commands/Issue.php
@@ -80,14 +80,22 @@ class Issue implements Command {
        $this->climate->br();

        $acme = $this->acmeFactory->build($server, $keyPair);
-        $promises = [];
+        $errors = [];

-        foreach ($domains as $i => $domain) {
-            $promises[] = \Amp\resolve($this->solveChallenge($acme, $keyPair, $domain, $docRoots[$i]));
+        $domainChunks = array_chunk($domains, 10, true);
+
+        foreach ($domainChunks as $domainChunk) {
+            $promises = [];
+
+            foreach ($domainChunk as $i => $domain) {
+                $promises[] = \Amp\resolve($this->solveChallenge($acme, $keyPair, $domain, $docRoots[$i]));
+            }
+
+            list($chunkErrors) = (yield \Amp\any($promises));
+
+            $errors += $chunkErrors;
        }

-        list($errors) = (yield \Amp\any($promises));
-
        if (!empty($errors)) {
            foreach ($errors as $error) {
                $this->climate->error($error->getMessage());
@@ -166,19 +174,27 @@ class Issue implements Command {
    }

    private function checkDnsRecords($domains) {
-        $promises = [];
+        $errors = [];

-        foreach ($domains as $domain) {
-            $promises[$domain] = \Amp\Dns\resolve($domain, [
-                "types" => [Record::A],
-                "hosts" => false,
-            ]);
+        $domainChunks = array_chunk($domains, 10, true);
+
+        foreach ($domainChunks as $domainChunk) {
+            $promises = [];
+
+            foreach ($domainChunk as $domain) {
+                $promises[$domain] = \Amp\Dns\resolve($domain, [
+                    "types" => [Record::A, Record::AAAA],
+                    "hosts" => false,
+                ]);
+            }
+
+            list($chunkErrors) = (yield \Amp\any($promises));
+
+            $errors += $chunkErrors;
        }

-        list($errors) = (yield \Amp\any($promises));
-
        if (!empty($errors)) {
-            throw new AcmeException("Couldn't resolve the following domains to an IPv4 record: " . implode(", ", array_keys($errors)));
+            throw new AcmeException("Couldn't resolve the following domains to an IPv4 nor IPv6 record: " . implode(", ", array_keys($errors)));
        }
    }

@@ -231,4 +247,4 @@ class Issue implements Command {
            ],
        ];
    }
-}
+}
Author	SHA1	Message	Date
Niklas Keller	b4a722c0a9	Update dependencies Also update php-cs from fabpot to friendsofphp.	2016-08-04 16:13:04 +02:00
Niklas Keller	2f73c15287	Update dependencies	2016-08-04 16:10:17 +02:00
Niklas Keller	05a6f6d861	Merge pull request #36 from izzlazz/master Add support for IPv6-only host names	2016-07-29 09:09:15 +02:00
René Højbjerg Larsen	d5fdc1a3c0	Add support for IPv6-only host names	2016-07-27 22:28:42 +02:00
Niklas Keller	cc76a6f52c	Warn if PHP 5.5 is used as it's EOL	2016-07-11 09:19:18 +02:00
Niklas Keller	74b275cf07	Chunk DNS lookups as well	2016-06-28 22:05:36 +02:00
Niklas Keller	e9d2a59eca	Chunk authorization requests into groups of 10	2016-06-28 10:27:46 +02:00
Niklas Keller	b9d79bbbe7	Improve documentation for the auto command, closes #31	2016-06-20 15:55:23 +02:00