Merge d6b8e63 into 1e9cc03

spira · Dec 18, 2015 · 970b22c · 970b22c
2 parents 1e9cc03 + d6b8e63
commit 970b22c
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 71 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 php:
- - 5.6
+ - 7.0
 
 addons:
   postgresql: "9.3"

diff --git a/api/app/Console/Commands/GenerateKeysCommand.php b/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;
     }

diff --git a/forum/composer.json b/forum/composer.json
@@ -1,7 +1,7 @@
 {
     "type": "project",
     "require": {
-        "vanilla/vanilla": "2.2-b1",
+        "vanilla/vanilla": "dev-master",
         "vanilla/addons": "1.4.5",
         "kasperisager/vanilla-api": "0.4.0"
     },
@@ -14,9 +14,9 @@
             "type": "package",
             "package": {
                 "name": "vanilla/vanilla",
-                "version": "2.2-b1",
+                "version": "dev-master",
                 "dist": {
-                    "url": "https://github.com/vanilla/vanilla/archive/Vanilla_2.2b1.zip",
+                    "url": "https://github.com/vanilla/vanilla/archive/b8b3bc7a64850389bd57ee770a199d5874775686.zip",
                     "type": "zip"
                 }
             }
@@ -84,7 +84,11 @@
     },
     "scripts": {
         "build-forum": "Spira\\Build::buildForum",
-        "post-install-cmd": "Spira\\Build::postInstall",
+        "post-install-cmd": [
+            "Spira\\Build::postInstall",
+            "composer install --working-dir public",
+            "Spira\\Build::buildForum"
+        ],
         "post-update-cmd": ""
     }
 }