Merge af1057a into 956b216

spira · Jan 7, 2016 · dbfcbcd · dbfcbcd
2 parents 956b216 + af1057a
commit dbfcbcd
Show file tree

Hide file tree

Showing 8 changed files with 330 additions and 99 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,12 @@ php:
 
 addons:
   postgresql: "9.3"
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
 
 services:
   - redis-server
@@ -12,6 +18,7 @@ services:
 
 env:
   global:
+    - CXX="g++-4.8" CC="gcc-4.8"
     - FORUM_DB_DATABASE=vanilla
     - FORUM_DB_HOST=127.0.0.1
     - FORUM_DB_USERNAME=travis
@@ -27,7 +34,7 @@ env:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y libnotify-bin beanstalkd
-  - nvm install 0.12 && nvm use 0.12
+  - nvm install 5.4.0 && nvm use 5.4.0 && npm install -g npm
   - mysql -e 'create database vanilla;'
 
 install:

diff --git a/api/app/Console/Commands/ApiaryValidateCommand.php b/api/app/Console/Commands/ApiaryValidateCommand.php
@@ -57,7 +57,7 @@ public function handle()
 
         $validator = base_path().'/node_modules/.bin/api-blueprint-validator';
 
-        exec("$validator $fileLocation", $output, $exitCode);
+        exec("$validator $fileLocation --fail-on-warning", $output, $exitCode);
 
         if ($exitCode == 0) {
             $this->info('Apiary Documentation validation passed');

diff --git a/api/app/Extensions/Faker/Provider/Markdown.php b/api/app/Extensions/Faker/Provider/Markdown.php
@@ -63,7 +63,7 @@ private function para($length = 500)
      * @param null $right
      * @return string
      */
-    private function wrapText($text, $probability = 0.1, $left, $right = null)
+    private function wrapText($text, $probability = 0.1, $left = null, $right = null)
     {
         if (! $right) {
             $right = $left;

diff --git a/api/package.json b/api/package.json
@@ -16,7 +16,7 @@
   "author": "Zak Henry",
   "license": "MIT",
   "devDependencies": {
-    "api-blueprint-validator": "^0.1.3",
-    "protagonist": "^0.19.3"
+    "api-blueprint-validator": "xiphiaz/api-blueprint-validator",
+    "protagonist": "^1.2.3"
   }
 }
diff --git a/forum/composer.json b/forum/composer.json
@@ -1,57 +1,22 @@
 {
     "type": "project",
     "require": {
-        "vanilla/vanilla": "dev-master",
+        "vanilla/vanilla": "dev-master#17a7e59d89fd930f23c56f71d65d387513338169.zip",
         "vanilla/addons": "1.4.5",
         "kasperisager/vanilla-api": "0.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "~5.1",
         "guzzlehttp/guzzle": "5.3.*"
     },
     "repositories": [
         {
-            "type": "package",
-            "package": {
-                "name": "vanilla/vanilla",
-                "version": "dev-master",
-                "dist": {
-                    "url": "https://github.com/vanilla/vanilla/archive/b8b3bc7a64850389bd57ee770a199d5874775686.zip",
-                    "type": "zip"
-                }
-            }
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "kasperisager/vanilla-api",
-                "version": "0.4.0",
-                "source": {
-                    "url": "https://github.com/kasperisager/vanilla-api.git",
-                    "type": "git",
-                    "reference": "v0.4.0"
-                },
-                "dist": {
-                    "url": "https://github.com/kasperisager/vanilla-api/archive/v0.4.0.zip",
-                    "type": "zip"
-                }
-            }
+            "url": "https://github.com/vanilla/vanilla",
+            "type": "vcs"
         },
         {
-            "type": "package",
-            "package": {
-                "name": "vanilla/addons",
-                "version": "1.4.4",
-                "source": {
-                    "url": "https://github.com/vanilla/addons.git",
-                    "type": "git",
-                    "reference": "release/1507"
-                },
-                "dist": {
-                    "url": "https://github.com/vanilla/addons/archive/release/1506.zip",
-                    "type": "zip"
-                }
-            }
+            "url": "https://github.com/kasperisager/vanilla-api",
+            "type": "vcs"
         },
         {
             "type": "package",