Merge pull request #12 from elliotchance/feature/redis

Feature/redis
elliotchance · May 19, 2014 · e385814 · e385814
2 parents 785af6b + 221c83e
commit e385814
Show file tree

Hide file tree

Showing 12 changed files with 304 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,5 @@ install:
   - composer install
 services:
   - memcached
-before_script: phpenv config-add config/memcached.ini
+  - redis-server
+before_script: phpenv config-add config/php.ini
diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
     "require": {
         "php": ">=5.3.0",
         "psr/log": "1.0.*@dev",
-        "monolog/monolog": "~1.9"
+        "monolog/monolog": "~1.9",
+        "predis/predis": "~0.8"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*"

diff --git a/composer.lock b/composer.lock
diff --git a/config/memcached.ini → config/php.ini b/config/memcached.ini → config/php.ini
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="./vendor/autoload.php">
+<phpunit
+	bootstrap="./vendor/autoload.php"
+	colors="true"
+	>
 
     <testsuites>
         <testsuite name="Main">