Merge branch 'etienneroudeix-master' into dev

Author: danielmewes

.gitignore

@@ -0,0 +1,9 @@
+composer.lock
+vendor/
+_builds/
+_cache/
+_projects/
+_steps/
+rethinkdb_data/
+wercker
+

README.md

@@ -5,6 +5,12 @@ A PHP client driver for the RethinkDB query language (ReQL).
 
 PHP-RQL is licensed under the terms of the Apache License 2.0 http://www.apache.org/licenses/LICENSE-2.0
 
+Continuous Integration
+-----------------------
+[![wercker status](https://app.wercker.com/status/931a7097f0ad9c272bd489f4dd16ab3e/m "wercker status")](https://app.wercker.com/project/bykey/931a7097f0ad9c272bd489f4dd16ab3e)
+
+To run the tests at the command line, issue `composer install` and then `composer test` at the package root. This requires `composer` to be available in `$PATH`.
+
 Documentation
 ----------------
 
@@ -62,4 +68,3 @@ Attributions
 * PHP-RQL uses pb4php http://code.google.com/p/pb4php/ by Nikolai Kordulla.
 * The API documentation is based on the official RethinkDB API documentation.
 * The API documentation is built using jTokenizer by Tim Whitlock (http://timwhitlock.info) and PHP Markdown by Michel Fortin (https://michelf.ca/).
-

composer.json

@@ -16,8 +16,23 @@
     "require": {
         "php": ">=5.3.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.8",
+        "jakub-onderka/php-parallel-lint": "dev-master"
+    },
     "autoload": {
-        "files": ["src/rdb/rdb.php"]
+        "files": ["rdb/rdb.php"],
+        "psr-4": {
+            "r\\": "rdb/",
+            "r\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": "tests/phpunit.sh"
     },
-    "include-path": ["src/"]
+    "config": {
+        "preferred-install": "dist",
+        "optimize-autoloader": true,
+        "process-timeout": 300
+    }
 }