Fix composer deps, add php 5.6 and hhvm to build matrix

.travis.yml

@@ -1,30 +1,29 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - hhvm
 
 services:
-  - riak
-  - mongodb
-  - memcached
-  - redis-server
+    - riak
+    - mongodb
+    - memcached
+    - redis-server
 
 before_script: 
-  - pecl install riak
-  - composer self-update
-  - composer --prefer-source --dev install
-  - phpenv config-add ./Tests/travis/php.ini
+    - ./Tests/travis/install-deps.sh
+    - composer self-update
+    - composer --prefer-source --dev install
 
 script:
-  - ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
-  - ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml .
+    - ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
+    - ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml .
 
 after_script:
-  - php ./vendor/bin/coveralls -v
+    - php ./vendor/bin/coveralls -v
 
 matrix:
   allow_failures:

Tests/travis/install-deps.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+IS_HHVM=`php -r "var_export(defined('HHVM_VERSION'));"`;
+BASEDIR=$(dirname $0);
+
+if [ $IS_HHVM ] ; then
+    exit 0;
+fi
+
+pecl install riak
+phpenv config-add $BASEDIR/php.ini

composer.json

@@ -38,7 +38,8 @@
         "symfony/security":         "~2.2",
         "symfony/framework-bundle": "~2.2",
         "symfony/doctrine-bridge":  "~2.2",
-        "doctrine/cache":           "~1.3.0"
+        "doctrine/inflector":       "~1.0",
+        "doctrine/cache":           "~1.3"
     },
     "require-dev": {
         "phpunit/phpunit":                       "~3.7",
@@ -57,15 +58,5 @@
         "branch-alias": {
             "dev-master": "1.0.x-dev"
         }
-    },
-    "repositories": [
-        {
-            "type": "git",
-            "url": "https://github.com/instaclick/ObjectCalisthenicsSniffs.git"
-        },
-        {
-            "type": "git",
-            "url": "https://github.com/instaclick/CodingStandard.git"
-        }
-    ]
+    }
 }