Update to Laravel 5.5

.env.example

@@ -2,16 +2,17 @@ APP_ENV=local
 APP_DEBUG=true
 APP_KEY=SomeRandomString
 
-DB_HOST=127.0.0.1
-DB_DATABASE=homestead
-DB_USERNAME=homestead
+DB_CONNECTION=mysql
+DB_HOST=db
+DB_DATABASE=mwl
+DB_USERNAME=mwl
 DB_PASSWORD=secret
 
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-REDIS_HOST=127.0.0.1
+REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

README.md

@@ -17,6 +17,16 @@ $ git remote add upstream [email protected]:laravel/laravel.git
 $ git pull upstream master
 ```
 
-## Setting up the vagrant
+## Setting up Docker
 
-Edit the config file at `Homestead.yaml`, after that just do 'vagrant up'to get started.
+### Installation
+Make sure you have installed Docker (>=1.13) and Docker Compose (>=1.9) 
+- Run `brew cask install docker`
+
+### Instantiation 
+- Run `./dev up -d.` This will pull the images and run the containers (db and app) as detached (not holding your terminal). After this, you can check the containers running using docker ps or `./dev ps`. The difference here between `./dev ps` and `docker ps` is that `docker ps` will show ALL containers running, while `./dev ps` forwards the call to `docker-compose ps` which only shows containers running for this application (services defined in the docker-compose.yml)
+- That's it!
+
+If you are running into permission issues when executing `./dev` commands, try: `chmod +x ./dev`
+If you can't run `./dev` script directly, try `sh ./dev` instead
+If you have port conflicts, "export" that port to an unused one i.e.: `export APP_PORT=9000` or `export DB_PORT=31`

circle.yml

@@ -2,7 +2,7 @@ machine:
   node:
     version: stable
   php:
-    version: 5.6.14
+    version: 7.0.22
   environment:
     APP_ENV: testing
 

composer.json

@@ -5,13 +5,13 @@
     "license": "proprietary",
     "type": "project",
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.0",
         "arrounded/core": "^2.0",
         "bugsnag/bugsnag-laravel": "^1.6",
-        "laravel/framework": "5.4.*",
+        "laravel/framework": "5.5.*@dev",
         "laravel/tinker": "~1.0",
         "lord/laroute": "2.4.*",
-        "rcrowe/twigbridge": "^0.9.2"
+        "rcrowe/twigbridge": "0.10.x@dev"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^2.2",