Merge 7680164 into 1e9cc03

spira · Dec 18, 2015 · b7767ab · b7767ab
2 parents 1e9cc03 + 7680164
commit b7767ab
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 79 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/api/tests/integration/ArticleTest.php b/api/tests/integration/ArticleTest.php
@@ -311,7 +311,7 @@ public function testPatchOne()
         $entity = $this->getFactory($this->factoryClass)->create();
 
         $this->withAuthorization()->patchJson($this->baseRoute.'/'.$entity->post_id, ['title' => 'foo']);
-        $this->shouldReturnJson();
+        $this->assertResponseHasNoContent();
         $this->assertResponseStatus(204);
         $class = $this->factoryClass;
         $checkEntity = $class::find($entity->post_id);
@@ -333,7 +333,7 @@ public function testPatchOneNewPermalink()
         $linksCount = $entity->permalinks->count();
 
         $this->withAuthorization()->patchJson($this->baseRoute.'/'.$entity->post_id, $data);
-        $this->shouldReturnJson();
+        $this->assertResponseHasNoContent();
         $this->assertResponseStatus(204);
         $class = $this->factoryClass;
         $checkEntity = $class::find($entity->post_id);
@@ -405,7 +405,7 @@ public function testPatchOneRemovePermalink()
             ->transformed();
 
         $this->withAuthorization()->patchJson($this->baseRoute.'/'.$entity->post_id, $data);
-        $this->shouldReturnJson();
+        $this->assertResponseHasNoContent();
         $this->assertResponseStatus(204);
         $class = $this->factoryClass;
         $checkEntity = $class::find($entity->post_id);

diff --git a/api/tests/integration/ImageTest.php b/api/tests/integration/ImageTest.php
@@ -125,7 +125,7 @@ public function testPatchOne()
         $entity->alt = 'foo';
         $preparedEntity = $this->prepareEntity($entity);
         $this->withAuthorization()->patchJson('/images/'.$id, $preparedEntity);
-        $this->shouldReturnJson();
+        $this->assertResponseHasNoContent();
         $this->assertResponseStatus(204);
         $checkEntity = Image::find($id);
         $this->assertEquals($checkEntity->alt, $entity->alt);

diff --git a/api/tests/integration/TagTest.php b/api/tests/integration/TagTest.php
@@ -135,7 +135,7 @@ public function testPatchTag()
 
         $this->withAuthorization()->patchJson('/tags/'.$tag['tagId'], $tag);
 
-        $this->shouldReturnJson();
+        $this->assertResponseHasNoContent();
         $this->assertResponseStatus(204);
         $checkEntity = Tag::find($tag['tagId']);
         $this->assertEquals($checkEntity->tag, $tag['tag']);

diff --git a/docker/common-services.yml b/docker/common-services.yml
@@ -56,9 +56,7 @@ web:
   privileged: true
 
 devtools:
-#  image: spira/docker-dev-tools:latest #built version of latest phantomjs (build often fails)
-  image: spira/docker-dev-tools:phantomjs-2.0.0 #static binary of phantomjs 2.0.0
-#  image: spira/docker-dev-tools:phantomjs-1.9.8 #static bindary of phantomjs 1.9.8
+  image: spira/docker-dev-tools:php-7.0
   working_dir: /data
   privileged: true
   env_file:

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": ""
     }
 }