Remove BlockingDriver usage, as parallel has been fixed

.travis.yml

@@ -20,7 +20,7 @@ install:
 script:
   - find -name "*.php" -not -path "./vendor/*" -print0 | xargs -n 1 -0 php -l
   - phpdbg -qrr vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml
-  - php vendor/bin/php-cs-fixer --diff --dry-run -v fix
+  - PHP_CS_FIXER_IGNORE_ENV=1 php vendor/bin/php-cs-fixer --diff --dry-run -v fix
 
 after_script:
   - php vendor/bin/coveralls -v

bin/acme

@@ -1,12 +1,10 @@
 #!/usr/bin/env php
 <?php
 
-use Amp\File\BlockingDriver;
 use Amp\Loop;
 use Auryn\Injector;
 use Kelunik\AcmeClient\AcmeFactory;
 use League\CLImate\CLImate;
-use function Amp\File\filesystem;
 
 $logo = <<<LOGO
     ____ __________ ___  ___
@@ -107,9 +105,6 @@ if (!array_key_exists($argv[1], $commands)) {
     exit(1);
 }
 
-// Use blocking driver for now, as amphp/parallel doesn't work inside PHARs
-filesystem(new BlockingDriver);
-
 /** @var \Kelunik\AcmeClient\Commands\Command $class */
 $class = "Kelunik\\AcmeClient\\Commands\\" . ucfirst($argv[1]);
 $definition = $class::getDefinition();
@@ -144,8 +139,9 @@ $injector->share(new AcmeFactory);
 $injector->share(new Amp\Artax\DefaultClient);
 
 $command = $injector->make($class);
+$exitCode = 1;
 
-Loop::run(function () use ($command, $climate) {
+Loop::run(function () use ($command, $climate, &$exitCode) {
     $handler = function ($e) use ($climate) {
         $error = (string) $e;
         $lines = explode("\n", $error);
@@ -164,13 +160,13 @@ Loop::run(function () use ($command, $climate) {
         $exitCode = yield $command->execute($climate->arguments);
 
         if ($exitCode === null) {
-            exit(0);
+            $exitCode = 0;
         }
-
-        exit($exitCode);
     } catch (Throwable $e) {
         $handler($e);
     }
 
     Loop::stop();
 });
+
+exit($exitCode);

composer.json

@@ -41,6 +41,11 @@
             "src/functions.php"
         ]
     },
+    "config": {
+        "platform": {
+            "php": "7.0.0"
+        }
+    },
     "extra": {
         "phar-builder": {
             "compression": "GZip",

src/Commands/Issue.php

@@ -2,6 +2,7 @@
 
 namespace Kelunik\AcmeClient\Commands;
 
+use Amp\Dns;
 use Amp\Promise;
 use Kelunik\Acme\AcmeException;
 use Kelunik\Acme\AcmeService;
@@ -109,7 +110,7 @@ class Issue implements Command {
             $this->climate->br();
             $this->climate->whisper('    Requesting certificate ...');
 
-            $csr = (new OpensslCsrGenerator)->generateCsr($key, $domains);
+            $csr = yield (new OpensslCsrGenerator)->generateCsr($key, $domains);
 
             $location = yield $acme->requestCertificate($csr);
             $certificates = yield $acme->pollForCertificate($location);
@@ -161,7 +162,10 @@ class Issue implements Command {
     }
 
     private function checkDnsRecords(array $domains): \Generator {
-        $promises = AcmeClient\concurrentMap(10, \array_combine($domains, $domains), 'Amp\Dns\resolve');
+        $promises = AcmeClient\concurrentMap(10, $domains, function (string $domain): Promise {
+            return Dns\resolve($domain);
+        });
+
         list($errors) = yield Promise\any($promises);
 
         if ($errors) {

src/Stores/CertificateStore.php

@@ -47,8 +47,12 @@ class CertificateStore {
                 $chain = \array_slice($certificates, 1);
                 $path = $this->root . '/' . $commonName;
 
-                if (!yield File\isdir($path) && !yield File\mkdir($path, 0644, true) && !yield File\isdir($path)) {
-                    throw new FilesystemException("Couldn't create certificate directory: '{$path}'");
+                if (!yield File\isdir($path)) {
+                    yield File\mkdir($path, 0755, true);
+
+                    if (!yield File\isdir($path)) {
+                        throw new FilesystemException("Couldn't create certificate directory: '{$path}'");
+                    }
                 }
 
                 yield File\put($path . '/cert.pem', $certificates[0]);

src/Stores/ChallengeStore.php

@@ -22,8 +22,12 @@ class ChallengeStore {
                 throw new ChallengeStoreException("Document root doesn't exist: '{$this->docroot}'");
             }
 
-            if (!yield File\isdir($path) && !yield File\mkdir($path, 0644, true) && !yield File\isdir($path)) {
-                throw new ChallengeStoreException("Couldn't create key directory: '{$path}'");
+            if (!yield File\isdir($path)) {
+                yield File\mkdir($path, 0755, true);
+
+                if (!yield File\isdir($path)) {
+                    throw new ChallengeStoreException("Couldn't create key directory: '{$path}'");
+                }
             }
 
             if ($user && !$userInfo = \posix_getpwnam($user)) {
@@ -35,13 +39,13 @@ class ChallengeStore {
                 yield File\chown($this->docroot . '/.well-known/acme-challenge', $userInfo['uid'], -1);
             }
 
-            yield \Amp\File\put("{$path}/{$token}", $payload);
+            yield File\put("{$path}/{$token}", $payload);
 
             if ($userInfo !== null) {
-                yield \Amp\File\chown("{$path}/{$token}", $userInfo['uid'], -1);
+                yield File\chown("{$path}/{$token}", $userInfo['uid'], -1);
             }
 
-            yield \Amp\File\chmod("{$path}/{$token}", 0644);
+            yield File\chmod("{$path}/{$token}", 0644);
         });
     }
 
@@ -50,7 +54,7 @@ class ChallengeStore {
             $path = $this->docroot . "/.well-known/acme-challenge/{$token}";
 
             if (yield File\exists($path)) {
-                yield \Amp\File\unlink($path);
+                yield File\unlink($path);
             }
         });
     }

src/Stores/KeyStore.php

@@ -18,16 +18,21 @@ class KeyStore {
     public function get(string $path): Promise {
         return call(function () use ($path) {
             $file = $this->root . '/' . $path;
-            $privateKey = yield File\get($file);
 
-            // Check key here to be valid, PrivateKey doesn't do that, we fail early here
-            $res = \openssl_pkey_get_private($privateKey);
+            try {
+                $privateKey = yield File\get($file);
 
-            if ($res === false) {
-                throw new KeyStoreException("Invalid private key: '{$file}'");
+                // Check key here to be valid, PrivateKey doesn't do that, we fail early here
+                $res = \openssl_pkey_get_private($privateKey);
+
+                if ($res === false) {
+                    throw new KeyStoreException("Invalid private key: '{$file}'");
+                }
+
+                return new PrivateKey($privateKey);
+            } catch (FilesystemException $e) {
+                throw new KeyStoreException("Key not found: '{$file}'");
             }
-
-            return new PrivateKey($privateKey);
         });
     }
 
@@ -38,8 +43,12 @@ class KeyStore {
             try {
                 $dir = \dirname($file);
 
-                if (!yield File\isdir($dir) && !yield File\mkdir($dir, 0644, true) && !yield File\isdir($dir)) {
-                    throw new FilesystemException("Couldn't create key directory: '{$path}'");
+                if (!yield File\isdir($dir)) {
+                    yield File\mkdir($dir, 0755, true);
+
+                    if (!yield File\isdir($dir)) {
+                        throw new FilesystemException("Couldn't create key directory: '{$dir}'");
+                    }
                 }
 
                 yield File\put($file, $key->toPem());