Merge 7590e60 into 1e9cc03

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
- - 5.6
+ - 7.0
 
 addons:
   postgresql: "9.3"
@@ -64,7 +64,7 @@ before_script:
 
 script:
   - gulp test:app
-  - php ./api/vendor/bin/phpunit --colors --configuration ./api/phpunit.xml --coverage-clover=./reports/coverage/api/clover.xml
+  - ./api/vendor/bin/phpunit --colors --configuration ./api/phpunit.xml --coverage-clover=./reports/coverage/api/clover.xml
   - ./node_modules/.bin/cucumber.js --tags ~@ignore #skip @ignored features
 
 after_script:

api/app/Console/Commands/GenerateKeysCommand.php

@@ -55,15 +55,21 @@ public function __construct(Filesystem $file)
      */
     public function handle()
     {
-        $rsa = new \Crypt_RSA();
-        $keys = $rsa->createKey();
+        $res = openssl_pkey_new();
+
+        // Get private key
+        openssl_pkey_export($res, $privateKey);
+
+        // Get public key
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
 
         if (! $this->file->exists(storage_path('app/keys'))) {
             $this->file->makeDirectory(storage_path('app/keys'));
         }
 
-        $this->file->put(storage_path('app/keys/private.pem'), $keys['privatekey']);
-        $this->file->put(storage_path('app/keys/public.pem'), $keys['publickey']);
+        $this->file->put(storage_path('app/keys/private.pem'), $privateKey);
+        $this->file->put(storage_path('app/keys/public.pem'), $publicKey);
 
         return 0;
     }

api/composer.json

@@ -36,7 +36,7 @@
         "namshi/jose": "^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~5.1",
         "mockery/mockery": "^0.9.4",
         "fzaninotto/faker": "^1.4",
         "barryvdh/laravel-ide-helper": "dev-master"

api/phpunit.xml

@@ -15,6 +15,9 @@
         </testsuite>
     </testsuites>
     <filter>
+        <whitelist>
+            <directory suffix=".php">./app</directory>
+        </whitelist>
         <blacklist>
             <directory>./vendor</directory>
             <directory>./storage</directory>