Merge branch 'develop'

DzikuVx · Jun 25, 2015 · 8d2d4cc · 8d2d4cc
2 parents 54a0aba + 57737e0
commit 8d2d4cc
Show file tree

Hide file tree

Showing 12 changed files with 1,297 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ userData/phpCache\\File.sca
 
 .idea/*
 .vagrant
-
+vendor
+cache
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -181,3 +181,9 @@ sudo service apache2 restart
 
 # Create the database
 mysql -uroot -proot < /var/www/webapp/sql/setup.sql
+
+# Setup Redis
+apt-get -y install redis-server
+
+# setup memcached
+sudo apt-get -y install memcached php5-memcache
diff --git a/composer.json b/composer.json
@@ -3,7 +3,11 @@
   "license": "MIT",
   "description": "phpCache is object PHP >=5 cache wrapper that offers similar way of handling various caching mechanisms",
   "require": {
-    "php": ">=5.3.0"
+    "php": ">=5.3.0",
+    "predis/predis": "1.0.1"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "*"
   },
   "authors": [
         {