From cf82aca23ec1b52174dc7aa74bb5049e1f1f3259 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Fri, 1 May 2015 15:44:37 -0400
Subject: [PATCH 1/4] test(composer): Introduce "composer test" script

---
 .travis.yml   | 6 +-----
 composer.json | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca41392..7700946 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,4 @@ install:
     - if [ "$DEPENDENCIES" == "lowest" ]; then composer update --prefer-lowest; fi;
 
 script:
-    - bin/behat -f progress
-    - bin/phpunit
-    - bin/phpspec run -f progress
-    - bin/phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
-    - bin/phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/
+    - composer test
diff --git a/composer.json b/composer.json
index 5c15490..6883d73 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,10 @@
         "phpzone/phpzone":  "0.1.*"
     },
 
+    "scripts": {
+        "test": "phpzone tests"
+    },
+
     "extra": {
         "branch-alias": {
             "dev-master": "0.2.x-dev"

From 8ee116f119ddeee636714b527cd6b1f95924ce91 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 4 May 2015 19:31:09 -0400
Subject: [PATCH 2/4] fix(scripts): Remove changing of bin-dir

---
 README.md     |  8 ++++++++
 composer.json |  4 ----
 phpzone.yml   | 10 +++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 121d2ee..78770e6 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,14 @@ $ vendor/bin/phpzone db
 This will compose a proper Docker Compose command `docker-compose -f docker-compose.yml -p myproject up` and
 execute it.
 
+## Development
+
+To run tests, run:
+
+```bash
+$ composer test
+```
+
 ## Documentation
 
 For more details visit [PhpZone Docker documentation].
diff --git a/composer.json b/composer.json
index 6883d73..f731581 100644
--- a/composer.json
+++ b/composer.json
@@ -40,10 +40,6 @@
         }
     },
 
-    "config": {
-        "bin-dir": "bin/"
-    },
-
     "conflict": {
         "phpzone/phpzone":  "0.1.*"
     },
diff --git a/phpzone.yml b/phpzone.yml
index 5e6d0aa..98c1441 100644
--- a/phpzone.yml
+++ b/phpzone.yml
@@ -3,8 +3,8 @@ extensions:
         tests:
             description: Run all tests
             script:
-                - bin/behat -f progress
-                - bin/phpunit
-                - bin/phpspec run -f progress
-                - bin/phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
-                - bin/phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/
+                - behat -f progress
+                - phpunit
+                - phpspec run -f progress
+                - phpcs -p --colors --standard=PSR2 src/ features/bootstrap/
+                - phpcs -p --colors --standard=vendor/jakubzapletal/php_codesniffer-rules/psr2-without-camel-case-method-name.xml spec/ integrations/

From 536422ec85f5c0dba6ef1b87991fa1e23a59ed2c Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 4 May 2015 19:49:20 -0400
Subject: [PATCH 3/4] chore(gitignore): Remove bin/ from .gitignore

It is no longer needed to gitignore since it never created. It's now in vendor/bin.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 018f0f0..2bc9dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 composer.lock
 vendor/
-bin/
 docs/build

From 02b3ae7b7f1c0e51c788c29ae7acb1e8ebbd5ac1 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 4 May 2015 19:50:19 -0400
Subject: [PATCH 4/4] style(composer): Move scripts up above conflicts

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index f731581..faae728 100644
--- a/composer.json
+++ b/composer.json
@@ -40,14 +40,14 @@
         }
     },
 
-    "conflict": {
-        "phpzone/phpzone":  "0.1.*"
-    },
-
     "scripts": {
         "test": "phpzone tests"
     },
 
+    "conflict": {
+        "phpzone/phpzone":  "0.1.*"
+    },
+
     "extra": {
         "branch-alias": {
             "dev-master": "0.2.x-dev"